Merge remote-tracking branch 'upstream/master' into objectFromDictionary

parse-community · Jan 28, 2025 · 660748c · 660748c
2 parents 9446df6 + 4d83377
commit 660748c
Show file tree

Hide file tree

Showing 28 changed files with 251 additions and 78 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,25 +8,106 @@ on:
     branches:
       - "**"
 env:
-  CI_XCODE_14: /Applications/Xcode_14.2.app/Contents/Developer
   CI_XCODE_15: /Applications/Xcode_15.4.0.app/Contents/Developer
-  CI_XCODE_16: /Applications/Xcode_16.0.app/Contents/Developer
+  CI_XCODE_16: /Applications/Xcode_16.1.0.app/Contents/Developer
 jobs:
-  tests:
+  test-xcode:
     env:
       GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     timeout-minutes: 45
     strategy:
       matrix:
-        script:
-          - test:ios
-          - test:macos
-          - test:parse_live_query:all
-          - xcode14 # runs build:starters on Xcode 14
-          - xcode15 # runs build:starters on Xcode 15
-          - xcode16 # runs build:starters on Xcode 16
+        include:
+          # Xcode
+          - name: Xcode 15
+            script: build:starters
+            iosVersion: '18.1'
+            iosDeviceModel: iPhone 16
+            watchOsVersion: '11.1'
+            watchDeviceModel: Apple Watch Series 10 (46mm)
+            tvOsVersion: '18.1'
+            tvDeviceModel: Apple TV
+            macosVersion: 14
+            developerDir: CI_XCODE_15
+          - name: Xcode 16
+            script: build:starters
+            iosVersion: '18.1'
+            iosDeviceModel: iPhone 16
+            watchOsVersion: '11.1'
+            watchDeviceModel: Apple Watch Series 10 (46mm)
+            tvOsVersion: '18.1'
+            tvDeviceModel: Apple TV
+            macosVersion: 14
+            developerDir: CI_XCODE_16
+          # Core Module
+          - name: Core Module, iOS 17
+            script: test:ios
+            iosVersion: '17.5'
+            iosDeviceModel: iPhone 15
+            macosVersion: 15
+            developerDir: CI_XCODE_16
+          - name: Core Module, iOS 18
+            script: test:ios
+            iosVersion: '18.1'
+            iosDeviceModel: iPhone 16
+            macosVersion: 15
+            developerDir: CI_XCODE_16
+          - name: Core Module, macOS 14
+            script: test:macos
+            macosVersion: 14
+            developerDir: CI_XCODE_16
+          - name: Core Module, macOS 15
+            script: test:macos
+            macosVersion: 15
+            developerDir: CI_XCODE_16
+          # LiveQuery Module
+          - name: LiveQuery Module, iOS 17
+            script: test:parse_live_query:ios
+            iosVersion: '17.5'
+            iosDeviceModel: iPhone 15
+            macosVersion: 15
+            developerDir: CI_XCODE_16
+          - name: LiveQuery Module, iOS 18
+            script: test:parse_live_query:ios
+            iosVersion: '18.1'
+            iosDeviceModel: iPhone 16
+            macosVersion: 15
+            developerDir: CI_XCODE_16
+          - name: LiveQuery Module, macOS 14
+            script: test:parse_live_query:osx
+            macosVersion: 14
+            developerDir: CI_XCODE_15
+          - name: LiveQuery Module, macOS 15
+            script: test:parse_live_query:osx
+            macosVersion: 15
+            developerDir: CI_XCODE_16
+          - name: LiveQuery Module, watchOS 10
+            script: test:parse_live_query:watchos
+            watchOsVersion: '10.5'
+            watchDeviceModel: Apple Watch Series 9 (45mm)
+            macosVersion: 15
+            developerDir: CI_XCODE_15
+          - name: LiveQuery Module, watchOS 11
+            script: test:parse_live_query:watchos
+            watchOsVersion: '11.1'
+            watchDeviceModel: Apple Watch Series 10 (46mm)
+            macosVersion: 15
+            developerDir: CI_XCODE_16
+          - name: LiveQuery Module, tvOS 17
+            script: test:parse_live_query:tvos
+            tvOsVersion: '17.5'
+            tvDeviceModel: Apple TV
+            macosVersion: 15
+            developerDir: CI_XCODE_16
+          - name: LiveQuery Module, tvOS 18
+            script: test:parse_live_query:tvos
+            tvOsVersion: '18.1'
+            tvDeviceModel: Apple TV
+            macosVersion: 15
+            developerDir: CI_XCODE_16
       fail-fast: false
-    runs-on: ${{ ((matrix.script == 'xcode15' || matrix.script == 'xcode16') && 'macos-14') || 'macos-13' }}
+    runs-on: macos-${{ matrix.macosVersion }}
+    name: ${{ matrix.name }}
     steps:
       - uses: actions/checkout@v4
       - name: Cache SPM
@@ -49,9 +130,9 @@ jobs:
       - name: Submodules
         run: git submodule update --init --recursive
       - name: Build-Test
-        run: set -o pipefail && env NSUnbufferedIO=YES bundle exec rake ${{ ((matrix.script == 'xcode14' || matrix.script == 'xcode15' || matrix.script == 'xcode16') && 'build:starters') || matrix.script }}
+        run: set -o pipefail && env NSUnbufferedIO=YES IOS_VERSION="${{ matrix.iosVersion }}" IOS_DEVICE_MODEL="${{ matrix.iosDeviceModel }}" WATCH_DEVICE_MODEL="${{ matrix.watchDeviceModel }}" WATCH_OS_VERSION="${{ matrix.watchOsVersion }}" TV_DEVICE_MODEL="${{ matrix.tvDeviceModel }}" TV_OS_VERSION="${{ matrix.tvOsVersion }}" bundle exec rake ${{ matrix.script }}
         env:
-          DEVELOPER_DIR: ${{ (matrix.script == 'xcode15' && env.CI_XCODE_15) || (matrix.script == 'xcode16' && env.CI_XCODE_16) || env.CI_XCODE_14 }}
+          DEVELOPER_DIR: ${{ env[matrix.developerDir] }}
       - name: Generate Environment Variables
         if: ${{ always() }}
         env:
@@ -68,7 +149,7 @@ jobs:
           echo "Build Result Location: $BUILD_RESULTS"
       - name: Upload Artifact Logs
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.ARTIFACT_NAME }}
           path: |
@@ -103,7 +184,7 @@ jobs:
           plugin: xcode
           file: ${{ env.COVERAGE_PATH }}
   docs:
-    runs-on: macos-13
+    runs-on: macos-14
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v4
@@ -117,7 +198,7 @@ jobs:
         run: |
           ./Scripts/jazzy.sh
         env:
-          DEVELOPER_DIR: ${{ env.CI_XCODE_14 }}
+          DEVELOPER_DIR: ${{ env.CI_XCODE_16 }}
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
diff --git a/.github/workflows/release-automated.yml b/.github/workflows/release-automated.yml
@@ -3,11 +3,11 @@ on:
   push:
     branches: [ master, release, alpha, beta ]
 env:
-  CI_XCODE_14: '/Applications/Xcode_14.2.app/Contents/Developer'
+  CI_XCODE_16: /Applications/Xcode_16.1.0.app/Contents/Developer
 
 jobs:
   release:
-    runs-on: macos-13
+    runs-on: macos-15
     outputs:
       current_tag: ${{ steps.tag.outputs.current_tag }}
     steps:
@@ -19,7 +19,10 @@ jobs:
           node-version: 22
           cache: npm
       - name: Setup Ruby
-        uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.1.0'
+          bundler-cache: true
       - name: Cache Gems
         id: cache-gems
         uses: actions/cache@v2
@@ -46,7 +49,7 @@ jobs:
   publish-docs:
     needs: release
     if: needs.release.outputs.current_tag != ''
-    runs-on: macos-13
+    runs-on: macos-15
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -62,7 +65,7 @@ jobs:
         run: |
           ./Scripts/jazzy.sh
         env:
-          DEVELOPER_DIR: ${{ env.CI_XCODE_14 }}
+          DEVELOPER_DIR: ${{ env.CI_XCODE_16 }}
       - name: Deploy Jazzy Docs
         uses: peaceiris/actions-gh-pages@v3
         with:

diff --git a/.github/workflows/release-manual-docs.yml b/.github/workflows/release-manual-docs.yml
@@ -6,12 +6,12 @@ on:
         default: ''
         description: 'Version tag:' 
 env:
-  CI_XCODE_14: '/Applications/Xcode_14.2.app/Contents/Developer'
+  CI_XCODE_16: /Applications/Xcode_16.1.0.app/Contents/Developer
 
 jobs:
   publish-docs:
     if: github.event.inputs.tag != ''
-    runs-on: macos-13
+    runs-on: macos-15
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -20,14 +20,15 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
+          ruby-version: '3.1.0'
           bundler-cache: true
       - name: Submodules
         run: git submodule update --init --recursive
       - name: Create Jazzy Docs
         run: |
           ./Scripts/jazzy.sh
         env:
-          DEVELOPER_DIR: ${{ env.CI_XCODE_14 }}
+          DEVELOPER_DIR: ${{ env.CI_XCODE_16 }}
       - name: Deploy Jazzy Docs
         uses: peaceiris/actions-gh-pages@v3
         with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# [5.0.0](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/4.2.0...5.0.0) (2025-01-28)
+
+
+### Features
+
+* Remove support for Xcode 14 ([#1835](https://github.com/parse-community/Parse-SDK-iOS-OSX/issues/1835)) ([e94c4d5](https://github.com/parse-community/Parse-SDK-iOS-OSX/commit/e94c4d5498e0f1241dba88a89e0547b8e6cccccb))
+
+
+### BREAKING CHANGES
+
+* This release removes support for Xcode 14. ([e94c4d5](e94c4d5))
+
 # [4.2.0](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/4.1.2...4.2.0) (2024-11-30)
 
 

diff --git a/Gemfile b/Gemfile
@@ -1,9 +1,9 @@
 source 'https://rubygems.org'
 
 # Docs
-gem 'jazzy', '~> 0.15.3'
+gem 'jazzy', '0.15.3'
 
 # Development
-gem 'xcpretty', '~> 0.4.0'
-gem 'rake', '~> 13.2.1'
-gem 'plist', '~> 3.7.1'
+gem 'xcpretty', '0.3.0'
+gem 'rake', '13.2.1'
+gem 'plist', '3.7.1'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -103,7 +103,7 @@ GEM
     rake (13.2.1)
     redcarpet (3.6.0)
     rexml (3.3.9)
-    rouge (3.28.0)
+    rouge (2.0.7)
     ruby-macho (2.5.1)
     sassc (2.4.0)
       ffi (~> 1.9)
@@ -123,18 +123,18 @@ GEM
       colored2 (~> 3.1)
       nanaimo (~> 0.4.0)
       rexml (>= 3.3.6, < 4.0)
-    xcpretty (0.4.0)
-      rouge (~> 3.28.0)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
 
 PLATFORMS
   arm64-darwin
   x86_64-darwin
 
 DEPENDENCIES
-  jazzy (~> 0.15.3)
-  plist (~> 3.7.1)
-  rake (~> 13.2.1)
-  xcpretty (~> 0.4.0)
+  jazzy (= 0.15.3)
+  plist (= 3.7.1)
+  rake (= 13.2.1)
+  xcpretty (= 0.3.0)
 
 BUNDLED WITH
    2.5.22
diff --git a/Parse/Parse.xcodeproj/xcshareddata/xcschemes/Parse-iOS.xcscheme b/Parse/Parse.xcodeproj/xcshareddata/xcschemes/Parse-iOS.xcscheme
@@ -81,6 +81,12 @@
                <Test
                   Identifier = "ExtensionDataSharingTests">
                </Test>
+               <Test
+                  Identifier = "InstallationUnitTests/testInstallationHasApplicationBadge">
+               </Test>
+               <Test
+                  Identifier = "InstallationUnitTests/testInstallationSetsApplicationBadge">
+               </Test>
                <Test
                   Identifier = "PFTestCase">
                </Test>
@@ -90,6 +96,9 @@
                <Test
                   Identifier = "ParseClientConfigurationTests/testExtensionDataSharing">
                </Test>
+               <Test
+                  Identifier = "ParseClientConfigurationTests/testServerValidation">
+               </Test>
             </SkippedTests>
          </TestableReference>
       </Testables>

diff --git a/Parse/Parse.xcodeproj/xcshareddata/xcschemes/Parse-macOS.xcscheme b/Parse/Parse.xcodeproj/xcshareddata/xcschemes/Parse-macOS.xcscheme
@@ -62,6 +62,11 @@
                BlueprintName = "ParseUnitTests-macOS"
                ReferencedContainer = "container:Parse.xcodeproj">
             </BuildableReference>
+            <SkippedTests>
+               <Test
+                  Identifier = "ParseClientConfigurationTests/testServerValidation">
+               </Test>
+            </SkippedTests>
          </TestableReference>
       </Testables>
    </TestAction>

diff --git a/Parse/Parse/Resources/Parse-OSX.Info.plist b/Parse/Parse/Resources/Parse-OSX.Info.plist
@@ -13,10 +13,10 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.2.0</string>
+	<string>5.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>4.2.0</string>
+	<string>5.0.0</string>
 </dict>
 </plist>
diff --git a/Parse/Parse/Resources/Parse-iOS.Info.plist b/Parse/Parse/Resources/Parse-iOS.Info.plist
@@ -13,15 +13,15 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.2.0</string>
+	<string>5.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>iPhoneOS</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>4.2.0</string>
+	<string>5.0.0</string>
 	<key>MinimumOSVersion</key>
 	<string>12.0</string>
 </dict>

diff --git a/Parse/Parse/Resources/Parse-tvOS.Info.plist b/Parse/Parse/Resources/Parse-tvOS.Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.2.0</string>
+	<string>5.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>4.2.0</string>
+	<string>5.0.0</string>
 	<key>NSPrincipalClass</key>
 	<string/>
 </dict>

diff --git a/Parse/Parse/Resources/Parse-watchOS.Info.plist b/Parse/Parse/Resources/Parse-watchOS.Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.2.0</string>
+	<string>5.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>4.2.0</string>
+	<string>5.0.0</string>
 	<key>NSPrincipalClass</key>
 	<string/>
 </dict>

diff --git a/Parse/Parse/Source/PFConstants.h b/Parse/Parse/Source/PFConstants.h
@@ -14,7 +14,7 @@
 #pragma mark - SDK Version
 ///--------------------------------------
 
-#define PARSE_VERSION @"4.2.0"
+#define PARSE_VERSION @"5.0.0"
 
 ///--------------------------------------
 #pragma mark - Platform