build: get rid of toolchains
ci/woodpecker/push/woodpecker Pipeline failed Details
ci/woodpecker/push/docs Pipeline was successful Details

This commit is contained in:
Johannes Frohnmeyer 2023-08-19 16:05:07 +02:00
parent e19d7cfb3b
commit 32a01547c0
Signed by: Johannes
GPG Key ID: E76429612C2929F4
2 changed files with 4 additions and 11 deletions

View File

@ -3,7 +3,7 @@
pipeline:
export_metadata:
image: gradle:jdk19-jammy
image: gradle:jdk20-jammy
pull: true
commands:
- mkdir public
@ -15,20 +15,20 @@ pipeline:
commands:
- ./platform_jars.sh
build_wrapper:
image: gradle:jdk19-jammy
image: gradle:jdk20-jammy
commands:
- gradle --build-cache :wrapper:build -Pflavor=windows -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED}
- cp wrapper/build/libs/*.exe public/wrapper.exe
- cp wrapper/build/libs/*-all.jar public/wrapper.jar
publish_debug:
image: gradle:jdk19-jammy
image: gradle:jdk20-jammy
commands:
- gradle --build-cache build publish -Pflavor=maven -Ppublic -Ptimestamp=${CI_PIPELINE_STARTED}
secrets: [ maven_token, maven_name ]
when:
- branch: master
publish_release:
image: gradle:jdk19-jammy
image: gradle:jdk20-jammy
commands:
- gradle --build-cache build publish -Pflavor=maven -Ppublic -Prelease
secrets: [ maven_token, maven_name ]

View File

@ -3,12 +3,6 @@ plugins {
`maven-publish`
}
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(20))
}
}
repositories {
mavenCentral()
maven("https://maven.frohnmeyer-wds.de/artifacts")
@ -42,7 +36,6 @@ afterEvaluate {
if (hasProperty("offline")) {
tasks.withType(JavaExec::class) {
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 field = org.gradle.api.internal.provider.AbstractProperty::class.java.getDeclaredField("value")
field.isAccessible = true