Merge branch 'master' into feature/privacy_manifest

mxcl · May 9, 2024 · 5a8e32d · 5a8e32d
2 parents 951d4f8 + a3b4668
commit 5a8e32d
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 33 deletions.
diff --git a/.github/workflows/ci-podspec.yml b/.github/workflows/ci-podspec.yml
@@ -5,8 +5,14 @@ on:
       - PromiseKit.podspec
 jobs:
   lint:
-    runs-on: macos-latest
+    runs-on: macos-14
     steps:
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: 15.2
+    - uses: maxim-lobanov/setup-cocoapods@v1
+      with:
+        version: 1.15.0
     - uses: actions/checkout@v2
       with:
         submodules: true

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -75,17 +75,17 @@ jobs:
     - run: git diff --exit-code
 
   test:
-    runs-on: macos-latest
+    runs-on: macos-14
     strategy:
       matrix:
         dst:
-        - platform=macOS
-        - platform=tvOS Simulator,OS=15.0,name=Apple TV
-        - platform=iOS Simulator,OS=15.0,name=iPhone 12
+        - "platform=macOS,arch=arm64,id=0000FE00-392BB8A41C01F642"
+        - "platform=iOS Simulator,OS=17.0.1,name=iPhone 14"
+        - "platform=tvOS Simulator,OS=17.2,name=Apple TV"
     steps:
     - uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: 13.1
+        xcode-version: 15.2
     - uses: actions/checkout@v2
     - uses: sersoft-gmbh/xcodebuild-action@v1
       with:
@@ -95,27 +95,3 @@ jobs:
         action: test
         enable-code-coverage: true
     - uses: codecov/codecov-action@v1
-
-  carthage:
-    runs-on: ${{ matrix.macos }}
-    strategy:
-      matrix:
-        xcode: [^11, ^12, ^13]
-        macos: [macos-11]
-    steps:
-    - uses: maxim-lobanov/setup-xcode@v1
-      with:
-        xcode-version: ${{ matrix.xcode }}
-    - uses: actions/checkout@v2
-
-    - uses: mingjun97/file-regex-replace@v1
-      with:
-        regex: SWIFT_TREAT_WARNINGS_AS_ERRORS = NO
-        replacement: SWIFT_TREAT_WARNINGS_AS_ERRORS = YES
-        include: project.pbxproj
-
-    - run: |
-        if [ ${{ matrix.xcode }} != ^11 ]; then
-          echo "CARTHAGE_ARGS=--use-xcframeworks" >> $GITHUB_ENV
-        fi
-    - run: carthage build --no-skip-current --no-use-binaries $CARTHAGE_ARGS
diff --git a/PromiseKit.podspec b/PromiseKit.podspec
@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
   s.default_subspecs = 'CorePromise', 'UIKit', 'Foundation'
   s.requires_arc = true
 
-  s.swift_versions = ['3.2', '3.3', '3.4', '4.0', '4.1', '4.2', '4.3', '4.4', '5.0', '5.1', '5.2', '5.3', '5.4', '5.5']
+  s.swift_version = '3.2', '3.3', '3.4', '4.0', '4.1', '4.2', '4.3', '4.4', '5.0', '5.1', '5.2', '5.3', '5.4', '5.5'
 
   # CocoaPods requires us to specify the root deployment targets
   # even though for us it is nonsense. Our root spec has no
@@ -28,6 +28,7 @@ Pod::Spec.new do |s|
   s.osx.deployment_target = '10.13'
   s.watchos.deployment_target = '4.0'
   s.tvos.deployment_target = '10.0'
+  s.visionos.deployment_target = '1.0'
 
   s.pod_target_xcconfig = {
     'OTHER_SWIFT_FLAGS' => '-DPMKCocoaPods',

diff --git a/PromiseKit.xcodeproj/project.pbxproj b/PromiseKit.xcodeproj/project.pbxproj
@@ -987,6 +987,7 @@
 				TVOS_DEPLOYMENT_TARGET = 11.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				WATCHOS_DEPLOYMENT_TARGET = 4.0;
+				XROS_DEPLOYMENT_TARGET = 1.0;
 			};
 			name = Debug;
 		};
@@ -1045,6 +1046,7 @@
 				TVOS_DEPLOYMENT_TARGET = 11.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				WATCHOS_DEPLOYMENT_TARGET = 4.0;
+				XROS_DEPLOYMENT_TARGET = 1.0;
 			};
 			name = Release;
 		};
@@ -1098,8 +1100,11 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_PACKAGE_TYPE = FMWK;
 				SKIP_INSTALL = YES;
+				SUPPORTED_PLATFORMS = "$(AVAILABLE_PLATFORMS)";
+				SUPPORTS_MACCATALYST = YES;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
-				TARGETED_DEVICE_FAMILY = "1,2,3,4";
+				TARGETED_DEVICE_FAMILY = "1,2,3,4,6,7";
 			};
 			name = Debug;
 		};
@@ -1153,8 +1158,11 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_PACKAGE_TYPE = FMWK;
 				SKIP_INSTALL = YES;
+				SUPPORTED_PLATFORMS = "$(AVAILABLE_PLATFORMS)";
+				SUPPORTS_MACCATALYST = YES;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
-				TARGETED_DEVICE_FAMILY = "1,2,3,4";
+				TARGETED_DEVICE_FAMILY = "1,2,3,4,6,7";
 			};
 			name = Release;
 		};