Update automated build configs

.woodpecker/android-build.yml

@@ -2,9 +2,16 @@ when:
   event: push
   branch: [ dockerBuild, master ]
 
+matrix:
+  GRADLE_VERSION:
+    - 8.11.1
+  JDK_VERSION:
+    - jdk17
+    - jdk21
+
 steps:
   - name: build
-    image: gradle:8.10.2-jdk17
+    image: gradle:${GRADLE_VERSION}-${JDK_VERSION}
     environment:
       ANDROID_HOME: /sdk
     commands:

.woodpecker/deb-build.yml

@@ -2,9 +2,16 @@ when:
   event: push
   branch: [ dockerBuild, master ]
 
+matrix:
+  GRADLE_VERSION:
+    - 8.11.1
+  JDK_VERSION:
+    - 17
+    - 21
+
 steps:
   - name: build
-    image: gradle:8.10.2-jdk17
+    image: gradle:${GRADLE_VERSION}-${JDK_VERSION}
     environment:
       ANDROID_HOME: /sdk
     commands:

.woodpecker/web-build.yml

@@ -2,8 +2,15 @@ when:
   event: push
   branch: [ dockerBuild, master ]
 
+matrix:
+  GRADLE_VERSION:
+    - 8.11.1
+  JDK_VERSION:
+    - 17
+    - 21
+
 steps:
   - name: build
-    image: gradle:8.10.2-jdk21
+    image: gradle:${GRADLE_VERSION}-${JDK_VERSION}
     commands:
       - gradle wasmJsBrowserDistribution

Dockerfile.dpkg-build

@@ -1,8 +1,11 @@
 # Original build used JVM 21.0.3
 # Gradle version 8.10.2
 
+ARG GRADLE_VERSION="8.11.1"
+ARG JDK_VERSION="jdk21"
+
 ### For RPM Builds, need to implement Nebula RPM plugin; see https://plugins.gradle.org/plugin/com.netflix.nebula.rpm
-FROM gradle:8.10.2-jdk21 AS cache
+FROM gradle:${GRADLE_VERSION}-${JDK_VERSION} AS menagerie_buildcache
 RUN apt update && apt install -y sdkmanager openjdk-11-jdk
 RUN sdkmanager "tools"
 RUN yes | sdkmanager --licenses
@@ -10,20 +13,12 @@ RUN mkdir -p /src
 ENV GRADLE_USER_HOME=/home/gradle/cache_home
 COPY gradle /src/gradle
 COPY build.gradle.kts gradle.properties settings.gradle.kts /src/.
-COPY androidApp/build.gradle.kts /src/androidApp/.
-COPY automotiveApp/build.gradle.kts /src/automotiveApp/.
-COPY desktopApp/build.gradle.kts /src/desktopApp/.
-COPY shared/build.gradle.kts /src/shared/.
-COPY tvApp/build.gradle.kts /src/tvApp/.
-COPY webApp/build.gradle.kts /src/webApp/.
+COPY composeApp/build.gradle.kts /src/webApp/.
 WORKDIR /src
-RUN ls -lahR
-RUN gradle -q javaToolchains 
 RUN gradle buildEnvironment --refresh-dependencies
 
-FROM gradle:8.10.2-jdk21 AS build
+FROM cache AS build
 WORKDIR /src
 COPY --from=cache /home/gradle/cache_home /home/gradle/.
 COPY --chown=gradle:gradle . /src/.
-RUN gradle clean
-RUN gradle packageReleaseDeb
+RUN gradle clean && gradle packageReleaseDeb

Dockerfile.web-serve

@@ -1,6 +1,10 @@
 # Original build used JVM 21.0.3
 # Gradle version 8.10.2
-FROM gradle:8.10.2-jdk21 AS cache
+
+ARG GRADLE_VERSION="8.11.1"
+ARG JDK_VERSION="jdk21"
+
+FROM gradle:${GRADLE_VERSION}-${JDK_VERSION} AS cache
 RUN apt update && apt install -y sdkmanager openjdk-11-jdk
 RUN sdkmanager "tools"
 RUN yes | sdkmanager --licenses
@@ -8,20 +12,15 @@ RUN mkdir -p /src
 ENV GRADLE_USER_HOME=/home/gradle/cache_home
 COPY gradle /src/gradle
 COPY build.gradle.kts gradle.properties settings.gradle.kts /src/.
-COPY androidApp/build.gradle.kts /src/androidApp/.
-COPY automotiveApp/build.gradle.kts /src/automotiveApp/.
-COPY desktopApp/build.gradle.kts /src/desktopApp/.
-COPY shared/build.gradle.kts /src/shared/.
-COPY tvApp/build.gradle.kts /src/tvApp/.
-COPY webApp/build.gradle.kts /src/webApp/.
+COPY composeApp/build.gradle.kts /src/webApp/.
 WORKDIR /src
 RUN gradle buildEnvironment --refresh-dependencies
 
-FROM gradle:8.10.2-jdk21 AS build
+FROM cache AS build
 WORKDIR /src
 COPY --from=cache /home/gradle/cache_home /home/gradle/.
 COPY --chown=gradle:gradle . /src/.
 RUN gradle clean && gradle wasmJsBrowserDistribution
 
 FROM nginx:latest
-COPY --from=build /src/webApp/build/dist/wasmJs/productionExecutable /usr/share/nginx/html
+COPY --from=build /src/composeApp/build/dist/wasmJs/productionExecutable /usr/share/nginx/html