Skip to content

Commit

Permalink
workflow: use jdk 11
Browse files Browse the repository at this point in the history
  • Loading branch information
danielratiu committed Jul 26, 2023
1 parent ecd37ed commit d0a53dd
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ plugins {
id("download-jbr") version "1.11.+"
}

val jbrVers = "17.0.3-b469.32"
val jbrVers = "11_0_12-b1504.28"

downloadJbr {
jbrVersion = jbrVers
Expand All @@ -33,10 +33,10 @@ downloadJbr {
val ciBuild = (System.getenv("CI") != null && System.getenv("CI").toBoolean()) || project.hasProperty("forceCI") || project.hasProperty("teamcity")

// Detect jdk location, required to start ant with tools.jar on classpath otherwise javac and tests will fail
val jdk_home: String = if (project.hasProperty("java17_home")) {
project.findProperty("java17_home") as String
} else if (System.getenv("JB_JAVA17_HOME") != null) {
System.getenv("JB_JAVA17_HOME")!!
val jdk_home: String = if (project.hasProperty("java11_home")) {
project.findProperty("java11_home") as String
} else if (System.getenv("JB_JAVA11_HOME") != null) {
System.getenv("JB_JAVA11_HOME")!!
} else {
val expected = JavaVersion.VERSION_11
if (JavaVersion.current() != expected) {
Expand Down Expand Up @@ -174,9 +174,7 @@ val defaultScriptArgs = mapOf(
"version" to version,
"build.date" to Date(),
//incremental build support
"mps.generator.skipUnmodifiedModels" to true,
"jdk.nio.zipfs.allowDotZipEntry" to true,
"jdk.util.zip.disableZip64ExtraFieldValidation" to true
"mps.generator.skipUnmodifiedModels" to true
)

// enables https://github.com/mbeddr/mps-gradle-plugin#providing-global-defaults
Expand Down

0 comments on commit d0a53dd

Please sign in to comment.