upgrade to sbt 1.6.1 (#110)

agilelab-tmnd1991 · web-flow · commit f5663a63331e · 2021-12-29T15:03:36.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,9 @@ jobs:
             ~/.ivy2/cache
             ~/.sbt
           key: ${{ runner.os }}-sbt
-      - uses: olafurpg/setup-scala@v10
+      - uses: olafurpg/setup-scala@v13
+        with:
+          java-version: graalvm-ce-java8@21.1.0
       - uses: olafurpg/setup-gpg@v3
       - run: ./make.sh
       - run: ./publish.sh
diff --git a/common/src/main/scala/it/agilelab/darwin/common/JavaVersion.scala b/common/src/main/scala/it/agilelab/darwin/common/JavaVersion.scala
@@ -16,9 +16,13 @@ object JavaVersion {
   def parseJavaVersion(propertyValue: String): Int = {
     val splits = propertyValue.split("\\.")
     if (propertyValue.startsWith("1.")) {
-      splits(1).toInt
+      splits(1).takeWhile(isDigit).toInt
     } else {
-      splits(0).toInt
+      splits(0).takeWhile(isDigit).toInt
     }
   }
+  private val digits = ('0' to '9').toSet
+  private def isDigit(c: Char): Boolean = {
+    digits.contains(c)
+  }
 }
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.5.5
+sbt.version = 1.6.1

Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,13 @@ object JavaVersion {`
`16`	`16`	`def parseJavaVersion(propertyValue: String): Int = {`
`17`	`17`	`val splits = propertyValue.split("\\.")`
`18`	`18`	`if (propertyValue.startsWith("1.")) {`
`19`		`- splits(1).toInt`
	`19`	`+ splits(1).takeWhile(isDigit).toInt`
`20`	`20`	`} else {`
`21`		`- splits(0).toInt`
	`21`	`+ splits(0).takeWhile(isDigit).toInt`
`22`	`22`	`}`
`23`	`23`	`}`
	`24`	`+ private val digits = ('0' to '9').toSet`
	`25`	`+ private def isDigit(c: Char): Boolean = {`
	`26`	`+ digits.contains(c)`
	`27`	`+ }`
`24`	`28`	`}`