back to old version deps logic with file

raw-labs · Mar 19, 2024 · e4c748a · e4c748a
1 parent 3545093
commit e4c748a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 357 deletions.
diff --git a/snapi-frontend/project/Dependencies.scala b/snapi-frontend/project/Dependencies.scala
@@ -1,5 +1,4 @@
 import sbt._
-import scala.xml.XML
 
 object Dependencies {
 
@@ -9,7 +8,7 @@ object Dependencies {
   val rawClientVersion = IO.read(new File("../client/version")).trim
   val rawClient = "com.raw-labs" %% "raw-client" % rawClientVersion
 
-  val rawSnapiParserVersion = (XML.loadFile(new File("../snapi-parser/pom.xml")) \ "properties" \ "revision").text.trim
+  val rawSnapiParserVersion = IO.read(new File("../snapi-parser/version")).trim
   val rawSnapiParser = "com.raw-labs" % "raw-snapi-parser" % rawSnapiParserVersion
 
   val kiamaVersion = IO.read(new File("../deps/kiama/version")).trim

diff --git a/snapi-parser/.scalafmt.conf b/snapi-parser/.scalafmt.conf
diff --git a/snapi-parser/build.sbt b/snapi-parser/build.sbt
diff --git a/snapi-parser/build.sh b/snapi-parser/build.sh
@@ -8,12 +8,6 @@ sdk use java 21-graalce
 
 cd "$SCRIPT_HOME"
 
-# when running on CI we don't care about this intermediate component versioning
-if [ "$CI" == "true" ] && [ "$GITHUB_WORKFLOW" == "CI" ]; then
-  mvn clean install
-# when running on publish workflow it is important to version it properly
-# even if we don't publish it to maven central, it is a dependency for snapi-frontend and sql-client
-else
-  VERSION=$(git describe --tags | sed 's/^v//;s/-\([0-9]*\)-g/+\1-/')
-  mvn clean install -Drevision=$VERSION
-fi
+VERSION=$(git describe --tags | sed 's/^v//;s/-\([0-9]*\)-g/+\1-/')
+mvn clean install -Drevision=$VERSION
+echo "${VERSION}" > version
diff --git a/sql-client/project/Dependencies.scala b/sql-client/project/Dependencies.scala
@@ -1,12 +1,11 @@
 import sbt._
-import scala.xml.XML
 
 object Dependencies {
 
   val rawClientVersion = IO.read(new File("../client/version")).trim
   val rawClient = "com.raw-labs" %% "raw-client" % rawClientVersion
 
-  val rawSnapiParserVersion = (XML.loadFile(new File("../snapi-parser/pom.xml")) \ "properties" \ "revision").text.trim
+  val rawSnapiParserVersion = IO.read(new File("../snapi-parser/version")).trim
   val rawSnapiParser = "com.raw-labs" % "raw-snapi-parser" % rawSnapiParserVersion
 
   val kiamaVersion = IO.read(new File("../deps/kiama/version")).trim