Update dependencies

client/build.gradle

@@ -39,8 +39,8 @@ dependencies {
     }
     testImplementation('commons-io:commons-io:2.18.0')
     testImplementation("org.mockito:mockito-core:5.+")
-    testImplementation('org.junit.jupiter:junit-jupiter-engine:5.11.4')
-    testImplementation('org.junit.jupiter:junit-jupiter-params:5.11.4')
+    testImplementation('org.junit.jupiter:junit-jupiter-engine:5.13.4')
+    testImplementation('org.junit.jupiter:junit-jupiter-params:5.13.4')
     testImplementation('org.apache.james:apache-mime4j:0.8.13')
 }
 

server/README.md

@@ -195,3 +195,6 @@ Keys in `extender.remote-builder.platform` should be formed in the following way
 3. Frontend instance looks into `platform.sdks.json` for information according to requested platform. For example, user try to build engine for platform `js-web`. In that case frontend instance found `["emsdk", "3155"]`.
 4. Frontend instance search through `extender.remote-builder.platforms` using the keys: `<platform>-<sdk_version>` and `<platform>-latest`. If no mappings was found - frontend instance starts local build (which highly likely will fail because no appropriate environment was configured). For our example frontend instance search for `emsdk-3155` and `emsdk-latest`. 
 5. Frontend instance sends a build request to the found server url.
+
+# Testing notes
+When runs integration tests on Macos at arm chips - check docker engine configuration. It's better to use `Virtual Machine option` -> `Apple Virtualization framework` with checked `Use Rosetta for x86_64/amd64 emulation on Apple Silicon` checkbox.

server/build.gradle

@@ -7,14 +7,14 @@ buildscript {
     }
     dependencies {
         classpath 'io.spring.gradle:dependency-management-plugin:1.1.7'
-        classpath 'org.springframework.boot:spring-boot-gradle-plugin:3.4.1'
+        classpath 'org.springframework.boot:spring-boot-gradle-plugin:3.5.4'
     }
 }
 
 plugins {
     id 'java'
     id 'idea'
-    id 'org.springframework.boot' version '3.3.5'
+    id 'org.springframework.boot' version '3.5.4'
     id 'jacoco'
 }
 
@@ -42,10 +42,8 @@ repositories {
 
 dependencyManagement {
     imports {
-        // DO NOT update higher 5.8.0 because transitive dependencies has opentelemtry version 1.45.0+
-        // which has breaking changes in comparison with 1.43.0
-        mavenBom 'com.google.cloud:spring-cloud-gcp-dependencies:5.8.0'
-        mavenBom 'org.junit:junit-bom:5.11.4'
+        mavenBom 'com.google.cloud:spring-cloud-gcp-dependencies:7.1.0'
+        mavenBom 'org.junit:junit-bom:5.13.4'
     }
 }
 
@@ -60,28 +58,29 @@ dependencies {
 
     implementation('com.google.cloud:spring-cloud-gcp-starter-storage')
     implementation('com.google.cloud:spring-cloud-gcp-starter-logging')
-    implementation('com.google.cloud:google-cloud-compute:1.67.0')
+    implementation('com.google.cloud:google-cloud-compute:1.82.0')
     implementation('com.samskivert:jmustache:1.16')
     implementation('commons-chain:commons-chain:1.2')
     implementation('org.apache.commons:commons-fileupload2-jakarta:2.0.0-M1')
-    implementation('org.apache.commons:commons-text:1.13.+')
-    implementation('org.apache.commons:commons-compress:1.27.+')
-    implementation('org.apache.commons:commons-lang3:3.17.0')
+    implementation('org.apache.commons:commons-fileupload2-core:2.0.0-M4')
+    implementation('org.apache.commons:commons-text:1.14.0')
+    implementation('org.apache.commons:commons-compress:1.28.0')
+    implementation('org.apache.commons:commons-lang3:3.18.0')
     implementation('org.apache.httpcomponents:httpclient:4.5.14')
     implementation('org.apache.httpcomponents:httpmime:4.5.14')
     implementation('org.springframework.boot:spring-boot-starter-actuator')
     implementation('org.springframework.boot:spring-boot-starter-jetty')
     implementation('org.springframework.boot:spring-boot-starter-security')
-    implementation('io.micrometer:micrometer-core:1.14.3')
-    implementation('io.micrometer:micrometer-tracing:1.4.1')
-    implementation('io.micrometer:micrometer-tracing-bridge-otel:1.4.1')
+    implementation('io.micrometer:micrometer-core:1.15.3')
+    implementation('io.micrometer:micrometer-tracing:1.5.3')
+    implementation('io.micrometer:micrometer-tracing-bridge-otel:1.5.3')
 
     implementation('org.projectlombok:lombok:1.18.36')
     annotationProcessor('org.projectlombok:lombok:1.18.36')
 
-    runtimeOnly('net.logstash.logback:logstash-logback-encoder:8.0')
-    runtimeOnly('io.micrometer:micrometer-registry-influx:1.14.3')
-    runtimeOnly('io.micrometer:micrometer-registry-prometheus:1.14.3') {
+    runtimeOnly('net.logstash.logback:logstash-logback-encoder:8.1')
+    runtimeOnly('io.micrometer:micrometer-registry-influx:1.15.3')
+    runtimeOnly('io.micrometer:micrometer-registry-prometheus:1.15.3') {
         exclude group: 'org.junit.jupiter'
     }
 

server/configs/application-test-app.yml

@@ -6,12 +6,12 @@ extender:
                 url: http://android-ndk25:9000
                 instanceId: android-ndk25
                 alwaysOn: true
-            emsdk-3155:
-                url: http://emsdk-3155:9000
-                instanceId: emsdk-3155
             emsdk-3165:
                 url: http://emsdk-3165:9000
                 instanceId: emsdk-3165
+            emsdk-406:
+                url: http://emsdk-406:9000
+                instanceId: emsdk-406
             linux-latest:
                 url: http://linux:9000
                 instanceId: linux

server/manifestmergetool/build.gradle

@@ -81,7 +81,7 @@ dependencies {
     implementation('commons-codec:commons-codec:1.18.0')
 
     testImplementation('commons-io:commons-io:2.18.0')
-    testImplementation('org.junit.jupiter:junit-jupiter-engine:5.11.4')
+    testImplementation('org.junit.jupiter:junit-jupiter-engine:5.13.4')
 }
 
 allprojects {

server/src/test/java/com/defold/extender/IntegrationTest.java

@@ -113,17 +113,17 @@ public static List<TestConfiguration> data() {
                 // "a" is a made up sdk where we can more easily test build.yml fixes
                 // new DefoldVersion("a", new Version(0, 0, 0), new String[] {"armv7-android", "x86_64-win32"} ),
 
-                // // 2024-12-05 https://github.com/defold/defold/releases/tag/1.9.5
-                new DefoldVersion("d01194cf0fb576b516a1dca6af6f643e9e590051", new Version(1, 9, 5), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}),
-                // // 2024-12-19 https://github.com/defold/defold/releases/tag/1.9.6
-                new DefoldVersion("11d2cd3a9be17b2fc5a2cb5cea59bbfb4af1ca96", new Version(1, 9, 6), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}),
-                // // 2025-02-12 https://github.com/defold/defold/releases/tag/1.9.7
-                new DefoldVersion("868769ba7a3458db12d149188bf3be80a339a85c", new Version(1, 9, 7), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}),
-                // // 2025-03-11 https://github.com/defold/defold/releases/tag/1.9.8
-                new DefoldVersion("67542769598a1b794877c96f740f3f527f63f491", new Version(1, 9, 8), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}),
                 // // 2025-04-14 https://github.com/defold/defold/releases/tag/1.10.0
                 new DefoldVersion("591eb496d52f4140bc2c7de547131f1b9408b9b4", new Version(1, 10, 0), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}),
 
+                // // 2024-05-14 https://github.com/defold/defold/releases/tag/1.10.1
+                new DefoldVersion("d8e6e73a8efac6b9a72783027867e547b6a363e4", new Version(1, 10, 1), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}),
+                // // 2024-06-11 https://github.com/defold/defold/releases/tag/1.10.2
+                new DefoldVersion("7a0e23b3fcab4c5db82f2b32f5d8ac5df9467c9d", new Version(1, 10, 2), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}),
+                // // 2025-07-07 https://github.com/defold/defold/releases/tag/1.10.3
+                new DefoldVersion("1c76521bb8b08c63ef619aa8a5ab563dddf7b3cf", new Version(1, 10, 3), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}),
+                // // 2025-08-04 https://github.com/defold/defold/releases/tag/1.10.4
+                new DefoldVersion("1aafd0a262ff40214ed7f51302d92fa587c607ef", new Version(1, 10, 4), new String[] {"armv7-android", "arm64-android", "x86_64-linux", "x86_64-win32", "js-web", "wasm-web"}),
                 // Use test-data/createdebugsdk.sh to package your preferred platform sdk and it ends up in the sdk/debugsdk folder
                 // Then you can write your tests without waiting for the next release
                 //new DefoldVersion("debugsdk", new Version(1, 2, 104), new String[] {"js-web"}),
@@ -455,8 +455,8 @@ public void buildAndroidJarWithMetaInf(TestConfiguration configuration) throws I
                 }
             }
         }
-        String[] expected = {"META-INF/inner.folder/com.inner", "META-INF/inner.folder/io.foo.service.HTTPClient"};
-        assertArrayEquals(expected, metaInfFiles.toArray());
+        List<String> expected = List.of("META-INF/inner.folder/com.inner", "META-INF/inner.folder/io.foo.service.HTTPClient");
+        assertTrue(expected.containsAll(metaInfFiles) &&  metaInfFiles.containsAll(expected));
     }
 
     @ParameterizedTest(name = "[{index}] {displayName} {arguments}")