build: get rid of toolchains
This commit is contained in:
parent
e19d7cfb3b
commit
32a01547c0
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
pipeline:
|
pipeline:
|
||||||
export_metadata:
|
export_metadata:
|
||||||
image: gradle:jdk19-jammy
|
image: gradle:jdk20-jammy
|
||||||
pull: true
|
pull: true
|
||||||
commands:
|
commands:
|
||||||
- mkdir public
|
- mkdir public
|
||||||
|
@ -15,20 +15,20 @@ pipeline:
|
||||||
commands:
|
commands:
|
||||||
- ./platform_jars.sh
|
- ./platform_jars.sh
|
||||||
build_wrapper:
|
build_wrapper:
|
||||||
image: gradle:jdk19-jammy
|
image: gradle:jdk20-jammy
|
||||||
commands:
|
commands:
|
||||||
- gradle --build-cache :wrapper:build -Pflavor=windows -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED}
|
- gradle --build-cache :wrapper:build -Pflavor=windows -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED}
|
||||||
- cp wrapper/build/libs/*.exe public/wrapper.exe
|
- cp wrapper/build/libs/*.exe public/wrapper.exe
|
||||||
- cp wrapper/build/libs/*-all.jar public/wrapper.jar
|
- cp wrapper/build/libs/*-all.jar public/wrapper.jar
|
||||||
publish_debug:
|
publish_debug:
|
||||||
image: gradle:jdk19-jammy
|
image: gradle:jdk20-jammy
|
||||||
commands:
|
commands:
|
||||||
- gradle --build-cache build publish -Pflavor=maven -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED}
|
- gradle --build-cache build publish -Pflavor=maven -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED}
|
||||||
secrets: [ maven_token, maven_name ]
|
secrets: [ maven_token, maven_name ]
|
||||||
when:
|
when:
|
||||||
- branch: master
|
- branch: master
|
||||||
publish_release:
|
publish_release:
|
||||||
image: gradle:jdk19-jammy
|
image: gradle:jdk20-jammy
|
||||||
commands:
|
commands:
|
||||||
- gradle --build-cache build publish -Pflavor=maven -Ppublic -Prelease
|
- gradle --build-cache build publish -Pflavor=maven -Ppublic -Prelease
|
||||||
secrets: [ maven_token, maven_name ]
|
secrets: [ maven_token, maven_name ]
|
||||||
|
|
|
@ -3,12 +3,6 @@ plugins {
|
||||||
`maven-publish`
|
`maven-publish`
|
||||||
}
|
}
|
||||||
|
|
||||||
java {
|
|
||||||
toolchain {
|
|
||||||
languageVersion.set(JavaLanguageVersion.of(20))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven("https://maven.frohnmeyer-wds.de/artifacts")
|
maven("https://maven.frohnmeyer-wds.de/artifacts")
|
||||||
|
@ -42,7 +36,6 @@ afterEvaluate {
|
||||||
if (hasProperty("offline")) {
|
if (hasProperty("offline")) {
|
||||||
tasks.withType(JavaExec::class) {
|
tasks.withType(JavaExec::class) {
|
||||||
environment("G_ORIGINAL_EXECUTABLE", executable ?: "java")
|
environment("G_ORIGINAL_EXECUTABLE", executable ?: "java")
|
||||||
//TODO once we are not using a toolchain, just do executable(rootDir.resolve("buildSrc/java-offline"))
|
|
||||||
val originalMetadata = javaLauncher.get().metadata
|
val originalMetadata = javaLauncher.get().metadata
|
||||||
val field = org.gradle.api.internal.provider.AbstractProperty::class.java.getDeclaredField("value")
|
val field = org.gradle.api.internal.provider.AbstractProperty::class.java.getDeclaredField("value")
|
||||||
field.isAccessible = true
|
field.isAccessible = true
|
||||||
|
|
Loading…
Reference in New Issue