JeremyStarTM/Engine
1
0
Fork 0
forked from StarOpenSource/Engine
Code Pull requests Activity Actions

Add 'java.skipToolchainSpecification' option

Browse source
This commit is contained in:
JeremyStar™ 2024-12-13 03:13:38 +01:00
parent f6238067fd
commit b56164f545
Signed by: JeremyStarTM
GPG key ID: E366BAEF67E4704D
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.forgejo/workflows/commit.yml
View file

@ -22,7 +22,7 @@ jobs:
restore-keys: |
gradle-${{ runner.os }}-
- name: Compile
run: ./gradlew --no-daemon jar
run: ./gradlew --no-daemon -Pjava.skipToolchainSpecification=true jar
- name: Save Gradle cache
uses: actions/cache/save@v4
with:
@ -56,7 +56,7 @@ jobs:
restore-keys: |
gradle-${{ runner.os }}-
- name: Compile
run: ./gradlew --no-daemon dokkaHtml dokkaHtmlMultiModule dokkaHtmlJar dokkaJavadocJar
run: ./gradlew --no-daemon -Pjava.skipToolchainSpecification=true dokkaHtml dokkaHtmlMultiModule dokkaHtmlJar dokkaJavadocJar
- name: Save Gradle cache
uses: actions/cache/save@v4
with:

7
build.gradle.kts
View file

@ -90,9 +90,10 @@ allprojects {
sourceCompatibility = JavaVersion.valueOf("VERSION_${property("java") as String}")
targetCompatibility = JavaVersion.valueOf("VERSION_${property("java") as String}")
toolchain {
languageVersion = JavaLanguageVersion.of(property("java") as String)
}
if (!(hasProperty("java.skipToolchainSpecification") && property("java.skipToolchainSpecification") as String == "true"))
toolchain {
languageVersion = JavaLanguageVersion.of(property("java") as String)
}
}
// Kotlin