From 3e70e9e4e1e57494d61d64ef99d23b021c0a05b8 Mon Sep 17 00:00:00 2001 From: JFronny Date: Fri, 1 Dec 2023 08:01:02 +0100 Subject: [PATCH] chore: bump to JDK 21 (gava-gi seems to segfault again, figure that out later) --- .woodpecker.yml | 8 ++++---- build.gradle.kts | 2 +- packaging/arch-linux | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 138b08a..2891c35 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -3,7 +3,7 @@ pipeline: export_metadata: - image: gradle:jdk20-jammy + image: gradle:jdk21-jammy pull: true commands: - mkdir public @@ -15,20 +15,20 @@ pipeline: commands: - ./platform_jars.sh build_wrapper: - image: gradle:jdk20-jammy + image: gradle:jdk21-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:jdk20-jammy + image: gradle:jdk21-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:jdk20-jammy + image: gradle:jdk21-jammy commands: - gradle --build-cache build publish -Pflavor=maven -Ppublic -Prelease secrets: [ maven_token, maven_name ] diff --git a/build.gradle.kts b/build.gradle.kts index 796040e..59ce42b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,7 +17,7 @@ val jbAnnotationsVersion by extra("24.0.1") val lwjglVersion by extra("3.3.2") val imguiVersion by extra("1.86.10") // launcher-gtk -val javagiVersion by extra("0.7.2") +val javagiVersion by extra("0.8.1") val flavorProp: String by extra(prop("flavor", "custom")) if (!setOf("custom", "maven", "fat", "windows", "linux", "macos").contains(flavorProp)) throw IllegalStateException("Unsupported flavor: $flavorProp") diff --git a/packaging/arch-linux b/packaging/arch-linux index c56562e..c3fde69 160000 --- a/packaging/arch-linux +++ b/packaging/arch-linux @@ -1 +1 @@ -Subproject commit c56562e50426559bd6c9552fa118c5e80160285b +Subproject commit c3fde69ba3b2e00201d134b4edfba5189e2390f2