Merge pull request #8256 from realm/tg/xcode-15

Fix a few more Xcode 15 problems
realm · Jun 6, 2023 · 45ea4a0 · 45ea4a0
2 parents f2d2a06 + 7c95267
commit 45ea4a0
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,24 +1,22 @@
-x.y.z Release notes (yyyy-MM-dd)
+10.40.1 Release notes (2023-06-06)
 =============================================================
-### Enhancements
-* Fix compilation with Xcode 15.
-* Switch to building the Carthage release with Xcode 14.3.1.
 
-### Fixed
-* <How to hit and notice issue? what was the impact?> ([#????](https://github.com/realm/realm-swift/issues/????), since v?.?.?)
-* None.
+### Enhancements
 
-<!-- ### Breaking Changes - ONLY INCLUDE FOR NEW MAJOR version -->
+* Fix compilation with Xcode 15. Note that iOS 12 is the minimum supported
+  deployment target when using Xcode 15.
+* Switch to building the Carthage release with Xcode 14.3.1.
 
 ### 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 14.3.1.
 * CocoaPods: 1.10 or later.
 * Xcode: 14.1-15 beta 1.
 
 ### Internal
-* Upgraded realm-core from ? to ?
+
 * Overhauled SDK metrics collection to better drive future development efforts.
 
 10.40.0 Release notes (2023-05-26)

diff --git a/Configuration/Base.xcconfig b/Configuration/Base.xcconfig
@@ -48,8 +48,6 @@ GCC_WARN_UNKNOWN_PRAGMAS = YES;
 GCC_WARN_UNUSED_FUNCTION = YES;
 GCC_WARN_UNUSED_PARAMETER = YES;
 GCC_WARN_UNUSED_VARIABLE = YES;
-MERGEABLE_LIBRARY = YES;
-MERGED_BINARY_TYPE = automatic;
 OTHER_CFLAGS = -fvisibility-inlines-hidden;
 SWIFT_COMPILATION_MODE = wholemodule;
 SWIFT_OPTIMIZATION_LEVEL = -Owholemodule;
@@ -61,10 +59,18 @@ HEADER_SEARCH_PATHS = $(inherited) core/include;
 CODE_SIGN_IDENTITY[sdk=iphone*] = iPhone Developer;
 CODE_SIGNING_REQUIRED[sdk=macosx] = NO;
 
-IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-MACOSX_DEPLOYMENT_TARGET = 10.13;
-WATCHOS_DEPLOYMENT_TARGET = 4.0;
-TVOS_DEPLOYMENT_TARGET = 11.0;
+IPHONEOS_DEPLOYMENT_TARGET_1400 = 11.0;
+IPHONEOS_DEPLOYMENT_TARGET_1500 = 12.0;
+IPHONEOS_DEPLOYMENT_TARGET = $(IPHONEOS_DEPLOYMENT_TARGET_$(XCODE_VERSION_MAJOR));
+MACOSX_DEPLOYMENT_TARGET_1400 = 10.13;
+MACOSX_DEPLOYMENT_TARGET_1500 = 10.14;
+MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(XCODE_VERSION_MAJOR));
+WATCHOS_DEPLOYMENT_TARGET_1400 = 4.0;
+WATCHOS_DEPLOYMENT_TARGET_1500 = 5.0;
+WATCHOS_DEPLOYMENT_TARGET = $(WATCHOS_DEPLOYMENT_TARGET_$(XCODE_VERSION_MAJOR));
+TVOS_DEPLOYMENT_TARGET_1400 = 11.0;
+TVOS_DEPLOYMENT_TARGET_1500 = 12.0;
+TVOS_DEPLOYMENT_TARGET = $(TVOS_DEPLOYMENT_TARGET_$(XCODE_VERSION_MAJOR));
 
 // Disable building the arm64 simulators for some types of Carthage builds
 REALM_ARM_ARCHS_YES = arm64 arm64e;

diff --git a/Configuration/Debug.xcconfig b/Configuration/Debug.xcconfig
@@ -1,6 +1,5 @@
 #include "Base.xcconfig"
 
-BITCODE_GENERATION_MODE = marker;
 COPY_PHASE_STRIP = NO;
 ENABLE_TESTABILITY = YES;
 GCC_OPTIMIZATION_LEVEL = 0;

diff --git a/Configuration/Release.xcconfig b/Configuration/Release.xcconfig
@@ -1,7 +1,11 @@
 #include "Base.xcconfig"
 
-BITCODE_GENERATION_MODE = bitcode;
-DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
+// As of beta 1 dSYM generation fails with the unhelpful error "warning: could
+// not find referenced DIE" (which seems to not actually be just a warning?)
+DEBUG_INFORMATION_FORMAT_1400 = dwarf-with-dsym;
+DEBUG_INFORMATION_FORMAT_1500 = dwarf;
+DEBUG_INFORMATION_FORMAT = $(DEBUG_INFORMATION_FORMAT_$(XCODE_VERSION_MAJOR));
+
 ENABLE_NS_ASSERTIONS = NO;
 GCC_PREPROCESSOR_DEFINITIONS = REALM_HAVE_CONFIG REALM_ENABLE_SYNC __ASSERTMACROS__;
 VALIDATE_PRODUCT = YES;
diff --git a/Package.swift b/Package.swift
@@ -4,7 +4,7 @@ import PackageDescription
 import Foundation
 
 let coreVersionStr = "13.13.0"
-let cocoaVersionStr = "10.40.0"
+let cocoaVersionStr = "10.40.1"
 
 let coreVersionPieces = coreVersionStr.split(separator: ".")
 let coreVersionExtra = coreVersionPieces[2].split(separator: "-")

diff --git a/Realm.podspec b/Realm.podspec
@@ -125,7 +125,20 @@ Pod::Spec.new do |s|
                                 'CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF' => 'NO',
                                 'OTHER_CPLUSPLUSFLAGS' => '-isystem "${PODS_ROOT}/Realm/include/core" -fvisibility-inlines-hidden',
                                 'OTHER_CPLUSPLUSFLAGS[arch=armv7]' => '-isystem "${PODS_ROOT}/Realm/include/core" -fvisibility-inlines-hidden -fno-aligned-new',
-                                'USER_HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/Realm/include" "${PODS_ROOT}/Realm/include/Realm"'
+                                'USER_HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/Realm/include" "${PODS_ROOT}/Realm/include/Realm"',
+
+                                'IPHONEOS_DEPLOYMENT_TARGET_1400' => '11.0',
+                                'IPHONEOS_DEPLOYMENT_TARGET_1500' => '12.0',
+                                'IPHONEOS_DEPLOYMENT_TARGET' => '$(IPHONEOS_DEPLOYMENT_TARGET_$(XCODE_VERSION_MAJOR))',
+                                'MACOSX_DEPLOYMENT_TARGET_1400' => '10.13',
+                                'MACOSX_DEPLOYMENT_TARGET_1500' => '10.14',
+                                'MACOSX_DEPLOYMENT_TARGET' => '$(MACOSX_DEPLOYMENT_TARGET_$(XCODE_VERSION_MAJOR))',
+                                'WATCHOS_DEPLOYMENT_TARGET_1400' => '4.0',
+                                'WATCHOS_DEPLOYMENT_TARGET_1500' => '5.0',
+                                'WATCHOS_DEPLOYMENT_TARGET' => '$(WATCHOS_DEPLOYMENT_TARGET_$(XCODE_VERSION_MAJOR))',
+                                'TVOS_DEPLOYMENT_TARGET_1400' => '11.0',
+                                'TVOS_DEPLOYMENT_TARGET_1500' => '12.0',
+                                'TVOS_DEPLOYMENT_TARGET' => '$(TVOS_DEPLOYMENT_TARGET_$(XCODE_VERSION_MAJOR))',
                               }
   s.preserve_paths          = %w(include scripts)
 

diff --git a/Realm/Realm-Info.plist b/Realm/Realm-Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>10.40.0</string>
+	<string>10.40.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>10.40.0</string>
+	<string>10.40.1</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2014-2021 Realm. All rights reserved.</string>
 	<key>NSPrincipalClass</key>

diff --git a/RealmSwift.podspec b/RealmSwift.podspec
@@ -30,6 +30,19 @@ Pod::Spec.new do |s|
   s.exclude_files = 'RealmSwift/Nonsync.swift'
 
   s.pod_target_xcconfig = {
-    'APPLICATION_EXTENSION_API_ONLY' => 'YES'
+    'APPLICATION_EXTENSION_API_ONLY' => 'YES',
+
+    'IPHONEOS_DEPLOYMENT_TARGET_1400' => '11.0',
+    'IPHONEOS_DEPLOYMENT_TARGET_1500' => '12.0',
+    'IPHONEOS_DEPLOYMENT_TARGET' => '$(IPHONEOS_DEPLOYMENT_TARGET_$(XCODE_VERSION_MAJOR))',
+    'MACOSX_DEPLOYMENT_TARGET_1400' => '10.13',
+    'MACOSX_DEPLOYMENT_TARGET_1500' => '10.14',
+    'MACOSX_DEPLOYMENT_TARGET' => '$(MACOSX_DEPLOYMENT_TARGET_$(XCODE_VERSION_MAJOR))',
+    'WATCHOS_DEPLOYMENT_TARGET_1400' => '4.0',
+    'WATCHOS_DEPLOYMENT_TARGET_1500' => '5.0',
+    'WATCHOS_DEPLOYMENT_TARGET' => '$(WATCHOS_DEPLOYMENT_TARGET_$(XCODE_VERSION_MAJOR))',
+    'TVOS_DEPLOYMENT_TARGET_1400' => '11.0',
+    'TVOS_DEPLOYMENT_TARGET_1500' => '12.0',
+    'TVOS_DEPLOYMENT_TARGET' => '$(TVOS_DEPLOYMENT_TARGET_$(XCODE_VERSION_MAJOR))',
   }
 end
diff --git a/dependencies.list b/dependencies.list
@@ -1,3 +1,3 @@
-VERSION=10.40.0
+VERSION=10.40.1
 REALM_CORE_VERSION=13.13.0
 STITCH_VERSION=1eb31b87154cf7af6cbe50ab2732e2856ca499c7