Merge pull request scalacenter#1657 from tgodzik/fix-i1656

tgodzik · web-flow · commit b38916d253d7 · 2022-01-13T17:17:04.000+01:00
Allow Java versions with a suffix
diff --git a/frontend/src/main/scala/bloop/data/Project.scala b/frontend/src/main/scala/bloop/data/Project.scala
@@ -251,8 +251,15 @@ final case class Project(
           getJavaVersionFromJavaHome(f.javaHome)
       )
       .getOrElse(Properties.javaVersion)
-
-    compareVersions(compileVersion, version) >= 0
+      .split("-")
+      .head // needed for versions like 17-ea
+    try {
+      compareVersions(compileVersion, version) >= 0
+    } catch {
+      case NonFatal(_) =>
+        logger.error(s"Invalid Java number $compileVersion")
+        false
+    }
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -251,8 +251,15 @@ final case class Project(`
`251`	`251`	`getJavaVersionFromJavaHome(f.javaHome)`
`252`	`252`	`)`
`253`	`253`	`.getOrElse(Properties.javaVersion)`
`254`		`-`
`255`		`- compareVersions(compileVersion, version) >= 0`
	`254`	`+ .split("-")`
	`255`	`+ .head // needed for versions like 17-ea`
	`256`	`+ try {`
	`257`	`+ compareVersions(compileVersion, version) >= 0`
	`258`	`+ } catch {`
	`259`	`+ case NonFatal(_) =>`
	`260`	`+ logger.error(s"Invalid Java number $compileVersion")`
	`261`	`+ false`
	`262`	`+ }`
`256`	`263`	`}`
`257`	`264`	`}`
`258`	`265`