mill: Try fix issues found in CI

VirtusLab · Feb 2, 2024 · 1a4c1a2 · 1a4c1a2
1 parent cb8c38e
commit 1a4c1a2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/project-builder/mill/prepare-project.sh b/project-builder/mill/prepare-project.sh
@@ -99,7 +99,7 @@ fi
 
 # Rename build.sc to build.scala - Scalafix does ignore .sc files
 # Use scala 3 dialect to allow for top level defs
-adaptedFiles=(build.sc )
+adaptedFiles=($PWD/build.sc )
 if [[ -d ./project ]]; then
   adaptedFiles+=(`find ./project -type f -name "*.sc"`)
 fi

diff --git a/project-builder/mill/scalafix/rules/src/main/scala/fix/Scala3CommunityBuildMillAdapter.scala b/project-builder/mill/scalafix/rules/src/main/scala/fix/Scala3CommunityBuildMillAdapter.scala
@@ -221,14 +221,13 @@ class Scala3CommunityBuildMillAdapter(
     |
     |implicit class MillCommunityBuildScalacOptionsOps(asSeq: Seq[String]){
     |  def mapScalacOptions(scalaVersion: mill.define.Target[String])(implicit ctx: mill.api.Ctx): Seq[String] = {
-    |    scalaVersion.evaluate(ctx).asSuccess.map(_.value)
-    |    .map{ scalaVersion => 
-    |      MillCommunityBuild.mapScalacOptions(scalaVersion, asSeq)
-    |    }.getOrElse{
-    |      println("Failed to resolve scalaVersion, assume it's Scala 3 project")
-    |      MillCommunityBuild.mapScalacOptions(sys.props.getOrElse("communitybuild.scala", "3.3.1"), asSeq)
-    |    }
-    |  }
+    |      try scalaVersion.evaluate(ctx).asSuccess.map(_.value)
+    |      catch {ex: Throwable => None }
+    |    }.map(MillCommunityBuild.mapScalacOptions(_, asSeq))
+    |     .getOrElse {
+    |        println("Failed to resolve scalaVersion, assume it's Scala 3 project")
+    |        MillCommunityBuild.mapScalacOptions(sys.props.getOrElse("communitybuild.scala", "3.3.1"), asSeq)
+    |     }
     |  def mapScalacOptions(scalaVersion: String) = MillCommunityBuild.mapScalacOptions(scalaVersion, asSeq)
     |}
     |