Skip to content
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

Try to see if 2.12.14 just works with graalvm #737

Merged
merged 6 commits into from
Jun 5, 2021
Merged
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: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- '8'
- '11'
scala:
- '2.12.11'
- '2.12.14'
timeout-minutes: 30
testPY:
runs-on: ubuntu-latest
Expand All @@ -44,7 +44,7 @@ jobs:
java:
- '11'
scala:
- '2.12.11'
- '2.12.14'
python:
- '3.5'
timeout-minutes: 30
Expand All @@ -64,7 +64,7 @@ jobs:
java:
- '11'
scala:
- '2.12.11'
- '2.12.14'
timeout-minutes: 30
testWithCoverageReport:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
strategy:
matrix:
scala:
- '2.12.11'
- '2.12.14'
name: ci
on:
pull_request: {}
Expand Down
31 changes: 20 additions & 11 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ lazy val commonSettings = Seq(
version := "0.0.7",
addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.13.0" cross CrossVersion.full),
addCompilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1"),
scalaVersion := "2.12.11",
crossScalaVersions := Seq("2.12.11"),
scalaVersion := "2.12.14",
crossScalaVersions := Seq("2.12.14"),
// from: https://tpolecat.github.io/2017/04/25/scalac-flags.html
scalacOptions ++= Seq(
"-deprecation", // Emit warning and location for usages of deprecated APIs.
Expand Down Expand Up @@ -59,9 +59,9 @@ lazy val commonSettings = Seq(
"-Ywarn-value-discard" // Warn when non-Unit expression results are unused.
),

scalacOptions in (Compile, console) --= Seq("-Ywarn-unused:imports", "-Xfatal-warnings"),
Compile / console / scalacOptions --= Seq("-Ywarn-unused:imports", "-Xfatal-warnings"),

testOptions in Test += Tests.Argument("-oDF"),
Test / testOptions += Tests.Argument("-oDF"),
)

lazy val commonJsSettings = Seq(
Expand All @@ -87,7 +87,7 @@ lazy val docs = (project in file("docs"))
.settings(
name := "paradox docs",
paradoxTheme := Some(builtinParadoxTheme("generic")),
paradoxProperties in Compile ++= Map(
Compile / paradoxProperties ++= Map(
"empty" -> "",
"version" -> version.value
),
Expand Down Expand Up @@ -119,7 +119,15 @@ lazy val cli = (project in file("cli")).
settings(
commonSettings,
name := "bosatsu-cli",
test in assembly := {},
assembly / test := {},
assembly / assemblyMergeStrategy := {
case PathList("scala", "annotation", "nowarn$.class" | "nowarn.class") =>
// this is duplicated in scala-collection-compat
MergeStrategy.last
case x =>
val oldStrategy = (assembly / assemblyMergeStrategy).value
oldStrategy(x)
},
assembly / mainClass := Some("org.bykn.bosatsu.Main"),
Compile / mainClass := Some("org.bykn.bosatsu.Main"),
libraryDependencies ++=
Expand All @@ -129,10 +137,11 @@ lazy val cli = (project in file("cli")).
jawnAst.value % Test,
jython.value % Test,
),
PB.targets in Compile := Seq(
scalapb.gen() -> (sourceManaged in Compile).value
Compile / PB.targets := Seq(
scalapb.gen() -> (Compile / sourceManaged).value
),
nativeImageOptions ++= Seq("--static", "--no-fallback", "--verbose", "--initialize-at-build-time")
nativeImageOptions ++= Seq("--static", "--no-fallback", "--verbose", "--initialize-at-build-time"),
nativeImageVersion := "21.1.0"
)
.dependsOn(coreJVM % "compile->compile;test->test")
.enablePlugins(NativeImagePlugin)
Expand All @@ -141,7 +150,7 @@ lazy val core = (crossProject(JSPlatform, JVMPlatform).crossType(CrossType.Pure)
settings(
commonSettings,
name := "bosatsu-core",
test in assembly := {},
assembly / test := {},
libraryDependencies ++=
Seq(
cats.value,
Expand Down Expand Up @@ -175,7 +184,7 @@ lazy val jsapi = (crossProject(JSPlatform).crossType(CrossType.Pure) in file("js
commonSettings,
commonJsSettings,
name := "bosatsu-jsapi",
test in assembly := {},
assembly / test := {},
libraryDependencies ++=
Seq(
cats.value,
Expand Down