Safe parts of #13790

Author: yairm210

.github/workflows/buildAndDeploy.yml

@@ -50,7 +50,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3
@@ -111,7 +111,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3
@@ -180,7 +180,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3

.github/workflows/buildAndTest.yml

@@ -20,7 +20,7 @@ jobs:
         with:
           cache: 'gradle'
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3

.github/workflows/buildMultiplatform.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         java_version:
-          - 17
+          - 21
     runs-on: ubuntu-latest
     name: Build Android (Java ${{ matrix.java_version }})
     steps:

.github/workflows/detektAnalysis.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v4
       with:
-        java-version: 17
+        java-version: 21
         distribution: 'adopt'
 
     - name: Setup Detekt

.github/workflows/dockerPublish.yml

@@ -36,7 +36,7 @@ jobs:
       # https://github.com/sigstore/cosign-installer
       - name: Install cosign
         if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@v3.4.0
+        uses: sigstore/cosign-installer@v3.9.2
 
 
       - name: Set up Docker Buildx
@@ -64,7 +64,7 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}

Dockerfile

@@ -1,6 +1,6 @@
 ARG ARG_COMPILE_BASE_IMAGE=accetto/ubuntu-vnc-xfce-opengl-g3
 
-FROM $ARG_COMPILE_BASE_IMAGE as build
+FROM $ARG_COMPILE_BASE_IMAGE AS build
 
 USER root 
 RUN  apt update && \
@@ -34,7 +34,7 @@ RUN chmod +x ./gradlew && ./gradlew desktop:classes && \
  ./gradlew desktop:packrLinux64 --stacktrace --info --daemon --scan && \
  cd /src/deploy && unzip Unciv-Linux64.zip
 
-FROM accetto/ubuntu-vnc-xfce-opengl-g3 as run
+FROM accetto/ubuntu-vnc-xfce-opengl-g3 AS run
 WORKDIR /home/headless/Desktop/
 COPY --chown=1001:1001 --from=build /src/deploy/* /usr/
 COPY --chown=1001:1001 --from=build /src/desktop/build/libs/Unciv.jar /usr/share/Unciv/Unciv.jar

android/build.gradle.kts

@@ -10,7 +10,7 @@ plugins {
 }
 
 android {
-    compileSdk = 35
+    compileSdk = 36
     sourceSets {
         getByName("main").apply {
             manifest.srcFile("AndroidManifest.xml")

build.gradle.kts

@@ -21,7 +21,7 @@ buildscript {
     }
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${com.unciv.build.BuildConfig.kotlinVersion}")
-        classpath("com.android.tools.build:gradle:8.9.1")
+        classpath("com.android.tools.build:gradle:8.9.3")
     }
 }
 
@@ -33,7 +33,7 @@ kotlin {
 
 // Plugins used for serialization of JSON for networking
 plugins {
-    id("io.gitlab.arturbosch.detekt").version("1.23.0-RC3")
+    id("io.gitlab.arturbosch.detekt").version("1.23.8")
     // For some weird reason, the *docker build* fails to recognize linking to the shared kotlinVersion in plugins
     // This is *with* gradle 8.2 downloaded according the project specs, no idea what that's about
     kotlin("multiplatform") version "1.9.24"

desktop/build.gradle.kts

@@ -139,12 +139,11 @@ for (platform in Platform.values()) {
 
             // Requires that both packr and the jre are downloaded, as per buildAndDeploy.yml, "Upload to itch.io"
 
-            val jdkFile =
-                    when (platform) {
-                        Platform.Linux64 -> "jre-linux-64.tar.gz"
-                        Platform.Windows64 -> "jdk-windows-64.zip"
-                        else -> "jre-macOS.tar.gz"
-                    }
+            val jdkFile = when (platform) {
+                Platform.Linux64 -> "jre-linux-64.tar.gz"
+                Platform.Windows64 -> "jdk-windows-64.zip"
+                else -> "jre-macOS.tar.gz"
+            }
 
             val platformNameForPackrCmd =
                     if (platform == Platform.MacOS) "mac"