chore: bump to JDK 21 (gava-gi seems to segfault again, figure that out later)
This commit is contained in:
parent
4629d5f68e
commit
3e70e9e4e1
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
pipeline:
|
pipeline:
|
||||||
export_metadata:
|
export_metadata:
|
||||||
image: gradle:jdk20-jammy
|
image: gradle:jdk21-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:jdk20-jammy
|
image: gradle:jdk21-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:jdk20-jammy
|
image: gradle:jdk21-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:jdk20-jammy
|
image: gradle:jdk21-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 ]
|
||||||
|
|
|
@ -17,7 +17,7 @@ val jbAnnotationsVersion by extra("24.0.1")
|
||||||
val lwjglVersion by extra("3.3.2")
|
val lwjglVersion by extra("3.3.2")
|
||||||
val imguiVersion by extra("1.86.10")
|
val imguiVersion by extra("1.86.10")
|
||||||
// launcher-gtk
|
// launcher-gtk
|
||||||
val javagiVersion by extra("0.7.2")
|
val javagiVersion by extra("0.8.1")
|
||||||
|
|
||||||
val flavorProp: String by extra(prop("flavor", "custom"))
|
val flavorProp: String by extra(prop("flavor", "custom"))
|
||||||
if (!setOf("custom", "maven", "fat", "windows", "linux", "macos").contains(flavorProp)) throw IllegalStateException("Unsupported flavor: $flavorProp")
|
if (!setOf("custom", "maven", "fat", "windows", "linux", "macos").contains(flavorProp)) throw IllegalStateException("Unsupported flavor: $flavorProp")
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit c56562e50426559bd6c9552fa118c5e80160285b
|
Subproject commit c3fde69ba3b2e00201d134b4edfba5189e2390f2
|
Loading…
Reference in New Issue