Merge pull request #822 from defold/xcode-26_2_x

AGulev · web-flow · commit d18217a9662d · 2025-12-04T11:27:26.000+01:00
Update XCode to 26.2, MacOS SDK to 26.2, iOS SDK to 26.2
diff --git a/README.md b/README.md
@@ -18,10 +18,10 @@ Ensure that on host is installed:
 Before running Extender you need to have prepackaged toolchains and sdks. Full instruction how it can be done you can find [here](https://github.com/defold/defold/tree/dev/scripts/package).
 
 Ensure that you have the following tools packaged:
-* iPhoneOS18.2.sdk
-* iPhoneSimulator18.2.sdk
-* MacOSX15.2.sdk
-* XcodeDefault16.2.xctoolchain.darwin
+* iPhoneOS26.2.sdk
+* iPhoneSimulator26.2.sdk
+* MacOSX26.2.sdk
+* XcodeDefault26.2.xctoolchain.darwin
 
 NOTE: Complete list of needed packages see [link](./server/scripts/standalone/setup-standalone-env.sh)
 
diff --git a/build.gradle b/build.gradle
@@ -10,14 +10,14 @@ if (project.hasProperty('publishToGar')) {
     publishing {
         repositories {
             maven {
-              name "extenderRepo"
-              url "artifactregistry://europe-west1-maven.pkg.dev/extender-426409/extender-maven/"
+              name = "extenderRepo"
+              url = uri("artifactregistry://europe-west1-maven.pkg.dev/extender-426409/extender-maven/")
             }
         }
     }
 }
 
 wrapper {
-    gradleVersion = '8.9'
+    gradleVersion = '9.1'
     distributionType = Wrapper.DistributionType.ALL
 }
diff --git a/client/build.gradle b/client/build.gradle
@@ -2,7 +2,10 @@ plugins {
     id 'java'
 }
 
-sourceCompatibility = 1.8
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 repositories {
     mavenCentral()
@@ -18,9 +21,9 @@ if (project.hasProperty('publishToGar')) {
         publications {
             extenderClient(MavenPublication) {
             artifact jar
-            groupId 'com.defold.extender'
-            artifactId 'client'
-            version project.ext.clientVersion
+            groupId = 'com.defold.extender'
+            artifactId = 'client'
+            version = project.ext.clientVersion
             }
         }
     }
@@ -46,4 +49,4 @@ dependencies {
 
 test {
     useJUnitPlatform()
-}
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/server/build.gradle b/server/build.gradle
@@ -6,7 +6,6 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'io.spring.gradle:dependency-management-plugin:1.1.7'
         classpath 'org.springframework.boot:spring-boot-gradle-plugin:3.5.5'
     }
 }
@@ -29,25 +28,17 @@ ext {
 }
 
 configurations {
-    // A configuration meant for consumers that need the API of this component
-    implementation {
-        canBeResolved = true
-    }
     all*.exclude group: 'commons-logging', module: 'commons-logging'
 }
 
 repositories {
     mavenCentral()
 }
 
-dependencyManagement {
-    imports {
-        mavenBom 'com.google.cloud:spring-cloud-gcp-dependencies:7.4.0'
-        mavenBom 'org.junit:junit-bom:5.13.4'
-    }
-}
-
 dependencies {
+    implementation(platform("com.google.cloud:spring-cloud-gcp-dependencies:7.4.0"))
+    testImplementation(platform("org.junit:junit-bom:5.13.4"))
+
     implementation('org.springframework.boot:spring-boot-starter-web') {
         exclude module: 'spring-boot-starter-tomcat'
     }
@@ -175,9 +166,9 @@ if (project.hasProperty('publishToGar')) {
         publications {
             extender(MavenPublication) {
             artifact bootJar
-            groupId 'com.defold.extender'
-            artifactId 'server'
-            version project.ext.extenderVersion
+            groupId = 'com.defold.extender'
+            artifactId = 'server'
+            version = project.ext.extenderVersion
             }
         }
     }
@@ -224,4 +215,4 @@ jacocoTestReport {
         xml.required.set(true)
         html.required.set(true)
     }
-}
+}
diff --git a/server/envs/generate_user_env.sh b/server/envs/generate_user_env.sh
@@ -32,7 +32,7 @@ OUTPUT_FILE=$ENV_DIR/user.env
 if [[ -z $1 ]]; then
     echo "Load macos environment..."
     source ${ENV_DIR}/macos.env
-    APPENDED_PATH=${PLATFORMSDK_DIR}/XcodeDefault${XCODE_16_VERSION}.xctoolchain/usr/bin:/usr/local/bin:${PATH}
+    APPENDED_PATH=${PLATFORMSDK_DIR}/XcodeDefault${XCODE_26_VERSION}.xctoolchain/usr/bin:/usr/local/bin:${PATH}
 else
     echo "Load $1 environment..."
     source ${ENV_DIR}/$1.env
diff --git a/server/envs/macos.env b/server/envs/macos.env
@@ -5,3 +5,10 @@ XCODE_16_VERSION=16.2
 XCODE_16_CLANG_VERSION=16.0.0
 MACOS_15_VERSION=15.2
 IOS_18_VERSION=18.2
+SWIFT_6_2_VERSION=6.2
+IOS_26_VERSION_MIN=15.0
+MACOS_26_VERSION_MIN=11.5
+XCODE_26_VERSION=26.2
+XCODE_26_CLANG_VERSION=17.0.0
+MACOS_26_VERSION=26.2
+IOS_26_VERSION=26.2
diff --git a/server/manifestmergetool/build.gradle b/server/manifestmergetool/build.gradle
@@ -20,9 +20,11 @@ jar {
 
 
 configurations {
-    // A configuration meant for consumers that need the API of this component
-    implementation {
+    // Resolvable configuration for shading contents into the fat jar
+    implementationResolved {
         canBeResolved = true
+        canBeConsumed = false
+        extendsFrom implementation
     }
     all*.exclude group: 'com.android.tools', module: 'repository'
     all*.exclude group: 'com.android.tools', module: 'sdklib'
@@ -35,13 +37,13 @@ task mainJar(type: Jar) {
         attributes 'Main-Class': 'com.defold.manifestmergetool.ManifestMergeTool'
     }
     from {
-        configurations.implementation.collect { it.isDirectory() ? it : zipTree(it) }
+        configurations.implementationResolved.collect { it.isDirectory() ? it : zipTree(it) }
     } {
         exclude "META-INF/*.SF"
         exclude "META-INF/*.DSA"
         exclude "META-INF/*.RSA"
     }
-    duplicatesStrategy DuplicatesStrategy.WARN
+    duplicatesStrategy = DuplicatesStrategy.WARN
     with jar
         doLast {
         copy {
@@ -60,17 +62,17 @@ if (project.hasProperty('publishToGar')) {
         publications {
             manifestMergeTool(MavenPublication) {
             artifact mainJar
-            groupId 'com.defold.extender'
-            artifactId 'manifestmergetool'
-            version project.ext.manifestMergetoolVersion
+            groupId = 'com.defold.extender'
+            artifactId = 'manifestmergetool'
+            version = project.ext.manifestMergetoolVersion
             }
         }
     }
 }
 
 repositories {
     mavenCentral()
-    maven { url "https://maven.google.com" }
+    maven { url = uri("https://maven.google.com") }
 }
 
 dependencies {
diff --git a/server/scripts/standalone/setup-standalone-env.sh b/server/scripts/standalone/setup-standalone-env.sh
@@ -186,10 +186,10 @@ if [[ $(uname) == "Darwin" ]]; then
 
     # Keep Apple's naming convention to avoid bugs
     PACKAGES=(
-        iPhoneOS${IOS_18_VERSION}.sdk
-        iPhoneSimulator${IOS_18_VERSION}.sdk
-        MacOSX${MACOS_15_VERSION}.sdk
-        XcodeDefault${XCODE_16_VERSION}.xctoolchain.darwin
+        iPhoneOS${IOS_26_VERSION}.sdk
+        iPhoneSimulator${IOS_26_VERSION}.sdk
+        MacOSX${MACOS_26_VERSION}.sdk
+        XcodeDefault${XCODE_26_VERSION}.xctoolchain.darwin
     )
     function download_packages() {
         for package_name in ${PACKAGES[@]}; do
diff --git a/server/src/main/resources/template.build.gradle b/server/src/main/resources/template.build.gradle
@@ -21,8 +21,8 @@ android {
     compileSdkVersion {{compile-sdk-version}}
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     namespace = "com.defold.defold"
diff --git a/server/test-data/compile.sh b/server/test-data/compile.sh
@@ -20,15 +20,15 @@ ANDROID_64_NDK_API_VERSION='21'
 ANDROID_SYS_ROOT=${ANDROID_NDK}/toolchains/llvm/prebuilt/${HOST}-x86_64/sysroot
 ANDROID_INCLUDE_ARCH=${ANDROID_NDK}/sources/android/cpufeatures
 
-IOS_GCC=${DYNAMO_HOME}/ext/SDKs/XcodeDefault16.2.xctoolchain/usr/bin/clang++
-IOS_AR=${DYNAMO_HOME}/ext/SDKs/XcodeDefault16.2.xctoolchain/usr/bin/ar
-IOS_MIN_VERSION=11.0
-IOS_SYS_ROOT=${DYNAMO_HOME}/ext/SDKs/iPhoneOS18.2.sdk
-
-OSX_GCC=${DYNAMO_HOME}/ext/SDKs/XcodeDefault16.2.xctoolchain/usr/bin/clang++
-OSX_AR=${DYNAMO_HOME}/ext/SDKs/XcodeDefault16.2.xctoolchain/usr/bin/ar
-OSX_MIN_VERSION=10.13
-OSX_SYS_ROOT=${DYNAMO_HOME}/ext/SDKs/MacOSX15.2.sdk
+IOS_GCC=${DYNAMO_HOME}/ext/SDKs/XcodeDefault26.2.xctoolchain/usr/bin/clang++
+IOS_AR=${DYNAMO_HOME}/ext/SDKs/XcodeDefault26.2.xctoolchain/usr/bin/ar
+IOS_MIN_VERSION=15.0
+IOS_SYS_ROOT=${DYNAMO_HOME}/ext/SDKs/iPhoneOS26.2.sdk
+
+OSX_GCC=${DYNAMO_HOME}/ext/SDKs/XcodeDefault26.2.xctoolchain/usr/bin/clang++
+OSX_AR=${DYNAMO_HOME}/ext/SDKs/XcodeDefault26.2.xctoolchain/usr/bin/ar
+OSX_MIN_VERSION=11.5
+OSX_SYS_ROOT=${DYNAMO_HOME}/ext/SDKs/MacOSX25.2.sdk
 
 EMCC=$DYNAMO_HOME/ext/SDKs/emsdk-3.1.65/upstream/emscripten/em++
 EMAR=$DYNAMO_HOME/ext/SDKs/emsdk-3.1.65/upstream/emscripten/emar
diff --git a/settings.gradle b/settings.gradle
@@ -1,7 +1,7 @@
 buildscript {
   repositories {
     maven {
-      url "https://plugins.gradle.org/m2/"
+      url = uri("https://plugins.gradle.org/m2/")
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,14 +10,14 @@ if (project.hasProperty('publishToGar')) {`
`10`	`10`	`publishing {`
`11`	`11`	`repositories {`
`12`	`12`	`maven {`
`13`		`- name "extenderRepo"`
`14`		`- url "artifactregistry://europe-west1-maven.pkg.dev/extender-426409/extender-maven/"`
	`13`	`+ name = "extenderRepo"`
	`14`	`+ url = uri("artifactregistry://europe-west1-maven.pkg.dev/extender-426409/extender-maven/")`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`wrapper {`
`21`		`- gradleVersion = '8.9'`
	`21`	`+ gradleVersion = '9.1'`
`22`	`22`	`distributionType = Wrapper.DistributionType.ALL`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ buildscript {`
`6`	`6`	`mavenCentral()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath 'io.spring.gradle:dependency-management-plugin:1.1.7'`
`10`	`9`	`classpath 'org.springframework.boot:spring-boot-gradle-plugin:3.5.5'`
`11`	`10`	`}`
`12`	`11`	`}`
`@@ -29,25 +28,17 @@ ext {`
`29`	`28`	`}`
`30`	`29`
`31`	`30`	`configurations {`
`32`		`- // A configuration meant for consumers that need the API of this component`
`33`		`- implementation {`
`34`		`- canBeResolved = true`
`35`		`- }`
`36`	`31`	`all*.exclude group: 'commons-logging', module: 'commons-logging'`
`37`	`32`	`}`
`38`	`33`
`39`	`34`	`repositories {`
`40`	`35`	`mavenCentral()`
`41`	`36`	`}`
`42`	`37`
`43`		`-dependencyManagement {`
`44`		`- imports {`
`45`		`- mavenBom 'com.google.cloud:spring-cloud-gcp-dependencies:7.4.0'`
`46`		`- mavenBom 'org.junit:junit-bom:5.13.4'`
`47`		`- }`
`48`		`-}`
`49`		`-`
`50`	`38`	`dependencies {`
	`39`	`+ implementation(platform("com.google.cloud:spring-cloud-gcp-dependencies:7.4.0"))`
	`40`	`+ testImplementation(platform("org.junit:junit-bom:5.13.4"))`
	`41`	`+`
`51`	`42`	`implementation('org.springframework.boot:spring-boot-starter-web') {`
`52`	`43`	`exclude module: 'spring-boot-starter-tomcat'`
`53`	`44`	`}`
`@@ -175,9 +166,9 @@ if (project.hasProperty('publishToGar')) {`
`175`	`166`	`publications {`
`176`	`167`	`extender(MavenPublication) {`
`177`	`168`	`artifact bootJar`
`178`		`- groupId 'com.defold.extender'`
`179`		`- artifactId 'server'`
`180`		`- version project.ext.extenderVersion`
	`169`	`+ groupId = 'com.defold.extender'`
	`170`	`+ artifactId = 'server'`
	`171`	`+ version = project.ext.extenderVersion`
`181`	`172`	`}`
`182`	`173`	`}`
`183`	`174`	`}`
`@@ -224,4 +215,4 @@ jacocoTestReport {`
`224`	`215`	`xml.required.set(true)`
`225`	`216`	`html.required.set(true)`
`226`	`217`	`}`
`227`		`-}`
	`218`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ android {`
`21`	`21`	`compileSdkVersion {{compile-sdk-version}}`
`22`	`22`
`23`	`23`	`compileOptions {`
`24`		`- sourceCompatibility JavaVersion.VERSION_1_8`
`25`		`- targetCompatibility JavaVersion.VERSION_1_8`
	`24`	`+ sourceCompatibility = JavaVersion.VERSION_1_8`
	`25`	`+ targetCompatibility = JavaVersion.VERSION_1_8`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`namespace = "com.defold.defold"`