Add 'java.skipToolchainSpecification' option
This commit is contained in:
parent
f6238067fd
commit
b56164f545
2 changed files with 6 additions and 5 deletions
|
@ -22,7 +22,7 @@ jobs:
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
gradle-${{ runner.os }}-
|
gradle-${{ runner.os }}-
|
||||||
- name: Compile
|
- name: Compile
|
||||||
run: ./gradlew --no-daemon jar
|
run: ./gradlew --no-daemon -Pjava.skipToolchainSpecification=true jar
|
||||||
- name: Save Gradle cache
|
- name: Save Gradle cache
|
||||||
uses: actions/cache/save@v4
|
uses: actions/cache/save@v4
|
||||||
with:
|
with:
|
||||||
|
@ -56,7 +56,7 @@ jobs:
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
gradle-${{ runner.os }}-
|
gradle-${{ runner.os }}-
|
||||||
- name: Compile
|
- 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
|
- name: Save Gradle cache
|
||||||
uses: actions/cache/save@v4
|
uses: actions/cache/save@v4
|
||||||
with:
|
with:
|
||||||
|
|
|
@ -90,9 +90,10 @@ allprojects {
|
||||||
sourceCompatibility = JavaVersion.valueOf("VERSION_${property("java") as String}")
|
sourceCompatibility = JavaVersion.valueOf("VERSION_${property("java") as String}")
|
||||||
targetCompatibility = JavaVersion.valueOf("VERSION_${property("java") as String}")
|
targetCompatibility = JavaVersion.valueOf("VERSION_${property("java") as String}")
|
||||||
|
|
||||||
toolchain {
|
if (!(hasProperty("java.skipToolchainSpecification") && property("java.skipToolchainSpecification") as String == "true"))
|
||||||
languageVersion = JavaLanguageVersion.of(property("java") as String)
|
toolchain {
|
||||||
}
|
languageVersion = JavaLanguageVersion.of(property("java") as String)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Kotlin
|
// Kotlin
|
||||||
|
|
Loading…
Reference in a new issue