Skip to content

upgrade to jdk17 #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/scala.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 7 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name := "GenSym"

scalaVersion := "2.12.10"
scalaVersion := "2.12.15"

resolvers += Resolver.sonatypeRepo("releases")

Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.4.7
sbt.version=1.10.0
Loading