Ensure we generate Java 8 compatible byte code (#2355)

coursier · Feb 6, 2022 · 476f765 · 476f765
1 parent 94680bf
commit 476f765
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/scripts/maybe-with-graalvm-home.sh b/.github/scripts/maybe-with-graalvm-home.sh
@@ -3,10 +3,8 @@ set -e
 
 if [[ "$OSTYPE" == "msys" ]]; then
   ./mill.bat -i ci.copyJvm --dest jvm
-  export JAVA_HOME="$(pwd -W | sed 's,/,\\,g')\\jvm"
-  export GRAALVM_HOME="$JAVA_HOME"
-  export PATH="$(pwd)/jvm/bin:$PATH"
-  echo "PATH=$PATH"
+  export GRAALVM_HOME="$(pwd -W | sed 's,/,\\,g')\\jvm"
+  echo "GRAALVM_HOME=$GRAALVM_HOME"
 
   ./mill.bat -i "$@"
 else

diff --git a/project/modules/shared.sc b/project/modules/shared.sc
@@ -32,7 +32,7 @@ lazy val buildVersion = {
   }
 }
 
-trait CoursierPublishModule extends PublishModule {
+trait CoursierPublishModule extends PublishModule with JavaModule {
   import mill.scalalib.publish._
   def pomSettings = PomSettings(
     description = artifactName(),
@@ -45,6 +45,9 @@ trait CoursierPublishModule extends PublishModule {
     )
   )
   def publishVersion = T(buildVersion)
+  def javacOptions = T {
+    super.javacOptions() ++ Seq("-source", "8", "-target", "8")
+  }
 }
 
 trait CsTests extends TestModule {