Skip to content

Commit c320e78

Browse files
committed
Replace graalvm changes from #79 with a simpler one
1 parent b6b228f commit c320e78

3 files changed

Lines changed: 9 additions & 80 deletions

File tree

.github/workflows/scala.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@ jobs:
1313
runs-on: ubuntu-22.04
1414

1515
steps:
16-
- uses: actions/checkout@v2
17-
- name: Set up JDK 11
18-
uses: actions/setup-java@v2
16+
- uses: actions/checkout@v4
17+
- name: Set up GraalVM for JDK 17
18+
uses: graalvm/setup-graalvm@v1
1919
with:
20-
java-version: '11'
21-
distribution: 'adopt'
20+
java-version: '17.0.12'
21+
distribution: 'graalvm'
22+
github-token: ${{ secrets.GITHUB_TOKEN }}
23+
cache: 'sbt'
2224
- name: Set up sbt
2325
uses: sbt/setup-sbt@v1
2426
- name: Build

build.sbt

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -186,23 +186,14 @@ lazy val root = (project in file(".")).
186186
//
187187
resolvers += "uuverifiers" at "https://eldarica.org/maven/",
188188
libraryDependencies += "uuverifiers" %% "princess" % "nightly-SNAPSHOT",
189-
190-
// needed by flata for native-image
191-
resolvers += "XypronRelease" at "https://www.xypron.de/repository",
192-
libraryDependencies += "org.gnu.glpk" % "glpk-java" % "1.12.0",
193189
//
194-
// nativeImageInstalled := true,
190+
nativeImageInstalled := true,
195191
// point to your GraalVM (recommended via env var)
196192
//nativeImageGraalHome := file(sys.env("GRAALVM_HOME")).toPath,
197193

198194
nativeImageOptions ++= Seq(
199195
"--no-fallback",
200-
"-H:+ReportExceptionStackTraces",
201-
"--allow-incomplete-classpath",
202-
"--initialize-at-run-time=org.gnu.glpk.glp_prob",
203-
"--initialize-at-run-time=ap.basetypes.BigComplex$",
204-
"--initialize-at-build-time=verimag.flata.presburger.Relation",
205-
"--initialize-at-build-time=nts.parser.VarTable"
196+
"-H:+ReportExceptionStackTraces"
206197
),
207198

208199
nativeImageAgentMerge := true

src/main/resources/META-INF/native-image/uuverifiers/eldarica/reflect-config.json

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)