Update release packaging for Xcode 15.2

realm · Jan 9, 2024 · bc11efc · bc11efc
1 parent 72a0e6a
commit bc11efc
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,8 @@
 x.y.z Release notes (yyyy-MM-dd)
 =============================================================
 ### Enhancements
-* None.
+* Update release packaging for Xcode 15.2. Prebuilt binaries for 14.1 and 15.0
+  have now been dropped from the release package.
 
 ### Fixed
 * <How to hit and notice issue? what was the impact?> ([#????](https://github.com/realm/realm-swift/issues/????), since v?.?.?)
@@ -12,9 +13,9 @@ x.y.z Release notes (yyyy-MM-dd)
 ### Compatibility
 * Realm Studio: 14.0.1 or later.
 * APIs are backwards compatible with all previous releases in the 10.x.y series.
-* Carthage release for Swift is built with Xcode 15.1.0.
+* Carthage release for Swift is built with Xcode 15.2.0.
 * CocoaPods: 1.10 or later.
-* Xcode: 14.1-15.1.0.
+* Xcode: 14.2-15.2.0.
 
 ### Internal
 * Upgraded realm-core from ? to ?

diff --git a/Jenkinsfile.releasability b/Jenkinsfile.releasability
@@ -1,4 +1,4 @@
-xcodeVersions = ['14.1', '14.2', '14.3.1', '15.0', '15.1']
+xcodeVersions = ['14.2', '14.3.1', '15.1', '15.2']
 platforms = ['osx', 'ios', 'watchos', 'tvos', 'catalyst']
 platformNames = ['osx': 'macOS', 'ios': 'iOS', 'watchos': 'watchOS', 'tvos': 'tvOS', 'catalyst': 'Catalyst', 'visionos': 'visionOS']
 docsXcodeVersion = '14.3.1'
@@ -121,7 +121,7 @@ def doBuild() {
         parallelBuilds["${platformName} ${xcodeVersion}"] = buildPlatform(platform, xcodeVersion)
       }
     }
-    // parallelBuilds["visionOS 15.2"] = buildPlatform('visionos', '15.2')
+    parallelBuilds["visionOS 15.2"] = buildPlatform('visionos', '15.2')
 
     parallel parallelBuilds
   }
@@ -135,12 +135,12 @@ def doBuild() {
           unstash "${platform}-${xcodeVersion}"
         }
       }
-      // unstash 'visionos-15.2'
+      unstash 'visionos-15.2'
 
       unstash 'examples'
       unstash 'build-scripts'
 
-      withEnv(['DEVELOPER_DIR=/Applications/Xcode-15.1.app/Contents/Developer']) {
+      withEnv(['DEVELOPER_DIR=/Applications/Xcode-15.2.app/Contents/Developer']) {
         sh './build.sh package-release'
       }
 
@@ -181,11 +181,12 @@ def doBuild() {
       },
 
       'Test macOS': {
-        node('osx') {
+        node('macos_13') {
           deleteDir()
           unstash 'source'
           sh '''
             export REALM_DISABLE_METADATA_ENCRYPTION=1
+            export REALM_XCODE_VERSION=15.2
             sh build.sh test-osx
           '''
         }

diff --git a/build.sh b/build.sh
@@ -1138,9 +1138,9 @@ x.y.z Release notes (yyyy-MM-dd)
 ### Compatibility
 * Realm Studio: 14.0.1 or later.
 * APIs are backwards compatible with all previous releases in the 10.x.y series.
-* Carthage release for Swift is built with Xcode 15.1.0.
+* Carthage release for Swift is built with Xcode 15.2.0.
 * CocoaPods: 1.10 or later.
-* Xcode: 14.1-15.1.0.
+* Xcode: 14.2-15.2.0.
 
 ### Internal
 * Upgraded realm-core from ? to ?

diff --git a/scripts/create-release-package.rb b/scripts/create-release-package.rb
@@ -110,9 +110,6 @@ def zip(name, *files)
   end
 end
 
-# Our normal Xcode 15 xcframework includes visionOS slices build with a beta
-# version of Xcode, but Carthage doesn't like that so we have to build a
-# separate xcframework without visionOS
 puts 'Creating Carthage release zip'
 Dir.mktmpdir do |tmp|
   tmp = File.realpath tmp

diff --git a/scripts/package_examples.rb b/scripts/package_examples.rb
@@ -44,7 +44,7 @@ def replace_framework(example, framework, path)
   "examples/tvos/swift",
 ]
 
-xcode_versions = %w(14.1 14.2 14.3.1 15.0 15.1)
+xcode_versions = %w(14.2 14.3.1 15.1 15.2)
 
 # Remove reference to Realm.xcodeproj from all example workspaces.
 base_examples.each do |example|