From adde2f3db320eec64dc25e05395a752a12c594e7 Mon Sep 17 00:00:00 2001 From: Guannan Wei Date: Fri, 25 Apr 2025 14:44:04 +0200 Subject: [PATCH 1/2] update version --- .github/workflows/scala.yml | 8 +++++--- build.sbt | 15 +++++++-------- project/build.properties | 2 +- third-party/lms-clean | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index 5610a96e6..cb230ee2a 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -19,11 +19,13 @@ jobs: uses: actions/checkout@v2 with: submodules: recursive - - name: Set up JDK 8 - uses: actions/setup-java@v2 + - name: Set up JDK 17 + uses: actions/setup-java@v4 with: - java-version: '8' + java-version: '17' distribution: 'adopt' + - name: Setup sbt launcher + uses: sbt/setup-sbt@v1 - name: Set up dependencies run: | sudo apt-get update diff --git a/build.sbt b/build.sbt index 0d22d5408..16d19ac3f 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ name := "GenSym" -scalaVersion := "2.12.10" +scalaVersion := "2.12.15" resolvers += Resolver.sonatypeRepo("releases") @@ -43,21 +43,20 @@ val commonJavaOptions = Seq( run / javaOptions ++= commonJavaOptions Test / javaOptions ++= commonJavaOptions -val paradiseVersion = "2.1.0" +val paradiseVersion = "2.1.1" addCompilerPlugin("org.scalamacros" % "paradise" % paradiseVersion cross CrossVersion.full) -addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.11.3" cross CrossVersion.full) +addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.13.2" cross CrossVersion.full) addCompilerPlugin("com.github.tomasmikula" %% "pascal" % "0.3.5") addCompilerPlugin("org.scala-lang.plugins" % "scala-continuations-plugin_2.12.0" % "1.0.3") addCompilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.0-M4") lazy val Bench = config("bench").extend(Test) -fork in Bench := false -parallelExecution in Test := false -parallelExecution in Bench := false +Bench / fork := false +Test / parallelExecution := false +Bench / parallelExecution := false -lazy val lms = ProjectRef(file("./third-party/lms-clean"), "lms-clean") - // .settings(fork := true) +lazy val lms = (project in file("./third-party/lms-clean")) lazy val gensym = (project in file(".")).dependsOn(lms % "test->test; compile->compile") .configs(Bench) diff --git a/project/build.properties b/project/build.properties index 0b2e09c5a..081fdbbc7 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.7 +sbt.version=1.10.0 diff --git a/third-party/lms-clean b/third-party/lms-clean index b6f019aef..068d75c31 160000 --- a/third-party/lms-clean +++ b/third-party/lms-clean @@ -1 +1 @@ -Subproject commit b6f019aef1df5f1f12bcd0b43a9136d7f9ce7704 +Subproject commit 068d75c31828a934174a6dd16135d2a235839f19 From 0fde5b82eeea1719e3a26ab4fe286b3b915e2db4 Mon Sep 17 00:00:00 2001 From: Guannan Wei Date: Fri, 25 Apr 2025 14:46:10 +0200 Subject: [PATCH 2/2] fix yml --- .github/workflows/scala.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index cb230ee2a..efbc4ab3d 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -25,7 +25,7 @@ jobs: java-version: '17' distribution: 'adopt' - name: Setup sbt launcher - uses: sbt/setup-sbt@v1 + uses: sbt/setup-sbt@v1 - name: Set up dependencies run: | sudo apt-get update