Merge remote-tracking branch 'upstream/master' into livequery-fix

parse-community · Oct 5, 2023 · 746dbe5 · 746dbe5
2 parents cf96b53 + 79a92ac
commit 746dbe5
Show file tree

Hide file tree

Showing 38 changed files with 88 additions and 264 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -76,17 +76,20 @@ jobs:
         run: |
           ARTIFACT_NAME=${{ env.ARTIFACT_NAME }}
           TEST_RESULTS=$(find ~/Library/Developer/Xcode/DerivedData -name "*.xcresult")
+          BUILD_RESULTS=$(find ~/Library/Developer/Xcode/DerivedData -name "*.xcactivitylog")
           echo ARTIFACT_NAME=${ARTIFACT_NAME//:/-} >> $GITHUB_ENV # replace colon with dashes
           echo TEST_RESULTS=${TEST_RESULTS} >> $GITHUB_ENV
           echo "Artifact Name: $ARTIFACT_NAME"
           echo "Test Result Location: $TEST_RESULTS"
+          echo "Build Result Location: $BUILD_RESULTS"
       - name: Upload Artifact Logs
         if: ${{ failure() }}
         uses: actions/upload-artifact@v3
         with:
           name: ${{ env.ARTIFACT_NAME }}
           path: |
             ~/Library/Developer/Xcode/DerivedData/Parse-*/Logs/Test
+            ~/Library/Developer/Xcode/DerivedData/**/Logs/Build
       - name: Upload Coverage
         uses: codecov/[email protected]
         with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## [2.7.2](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/2.7.1...2.7.2) (2023-10-05)
+
+
+### Bug Fixes
+
+* Compilation errors `Undefined symbol` and `SystemConfiguration not found` on watchOS ([#1748](https://github.com/parse-community/Parse-SDK-iOS-OSX/issues/1748)) ([e7df36b](https://github.com/parse-community/Parse-SDK-iOS-OSX/commit/e7df36beb735fd7dc4b86127bf86b34fb30b009d))
+
+### Notes
+
+- The compiled frameworks of the Parse SDK will not be provided anymore as part of a release. Instead use Swift Package Manager to add the Parse SDK to your Xcode project.
+
 ## [2.7.1](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/2.7.0...2.7.1) (2023-09-30)
 
 

diff --git a/Parse/Parse/Internal/Installation/Controller/PFInstallationController.m b/Parse/Parse/Internal/Installation/Controller/PFInstallationController.m
@@ -9,6 +9,8 @@
 
 #import "PFInstallationController.h"
 
+#if !TARGET_OS_WATCH
+
 #import "BFTask+Private.h"
 #import "PFAssert.h"
 #import "PFCurrentInstallationController.h"
@@ -105,3 +107,5 @@ - (PFCurrentInstallationController *)currentInstallationController {
 }
 
 @end
+
+#endif
diff --git a/...rse/Internal/Installation/CurrentInstallationController/PFCurrentInstallationController.m b/...rse/Internal/Installation/CurrentInstallationController/PFCurrentInstallationController.m
@@ -9,6 +9,8 @@
 
 #import "PFCurrentInstallationController.h"
 
+#if !TARGET_OS_WATCH
+
 #import "BFTask+Private.h"
 #import "PFAsyncTaskQueue.h"
 #import "PFInstallationIdentifierStore.h"
@@ -280,3 +282,5 @@ - (void)setCurrentInstallationMatchesDisk:(BOOL)currentInstallationMatchesDisk {
 }
 
 @end
+
+#endif
diff --git a/Parse/Parse/Internal/PFReachability.m b/Parse/Parse/Internal/PFReachability.m
@@ -9,6 +9,7 @@
 
 #import "PFReachability.h"
 
+#if !TARGET_OS_WATCH
 #import <SystemConfiguration/SystemConfiguration.h>
 
 #import "PFAssert.h"
@@ -209,3 +210,5 @@ - (void)_startMonitoringReachabilityWithURL:(NSURL *)url {
 }
 
 @end
+
+#endif
diff --git a/Parse/Parse/Internal/Push/Utilites/PFPushUtilities.m b/Parse/Parse/Internal/Push/Utilites/PFPushUtilities.m
@@ -17,7 +17,10 @@
 #import "PFAlertView.h"
 #endif
 
+#if !TARGET_OS_WATCH
 #import "PFInstallationPrivate.h"
+#endif
+
 #import "PFKeychainStore.h"
 #import "PFLogging.h"
 #import "PFMacros.h"
@@ -49,11 +52,13 @@ + (NSString *)getDeviceTokenFromKeychain {
     return store[@"ParsePush"];
 }
 
+#if !TARGET_OS_WATCH
 + (void)clearDeviceToken {
     // Used in test case setup.
     [[PFInstallation currentInstallation] _clearDeviceToken];
     [[[PFKeychainStore alloc] initWithService:@"ParsePush"] removeObjectForKey:@"ParsePush"];
 }
+#endif
 
 #if TARGET_OS_IOS
 

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>2.7.1</string>
+	<string>2.7.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.7.1</string>
+	<string>2.7.2</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>2.7.1</string>
+	<string>2.7.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>iPhoneOS</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.7.1</string>
+	<string>2.7.2</string>
 	<key>MinimumOSVersion</key>
 	<string>9.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>2.7.1</string>
+	<string>2.7.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.7.1</string>
+	<string>2.7.2</string>
 	<key>NSPrincipalClass</key>
 	<string></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>2.7.1</string>
+	<string>2.7.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.7.1</string>
+	<string>2.7.2</string>
 	<key>NSPrincipalClass</key>
 	<string></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 @"2.7.1"
+#define PARSE_VERSION @"2.7.2"
 
 ///--------------------------------------
 #pragma mark - Platform

diff --git a/ParseFacebookUtils/ParseFacebookUtils/Resources/Info-iOS.plist b/ParseFacebookUtils/ParseFacebookUtils/Resources/Info-iOS.plist
@@ -13,15 +13,15 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.7.1</string>
+	<string>2.7.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>iPhoneOS</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.7.1</string>
+	<string>2.7.2</string>
 	<key>MinimumOSVersion</key>
 	<string>9.0</string>
 </dict>

diff --git a/ParseFacebookUtils/ParseFacebookUtils/Resources/Info-tvOS.plist b/ParseFacebookUtils/ParseFacebookUtils/Resources/Info-tvOS.plist
@@ -13,10 +13,10 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.7.1</string>
+	<string>2.7.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.7.1</string>
+	<string>2.7.2</string>
 </dict>
 </plist>
diff --git a/ParseLiveQuery/ParseLiveQuery-tvOS/Info.plist b/ParseLiveQuery/ParseLiveQuery-tvOS/Info.plist
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.7.1</string>
+	<string>2.7.2</string>
 	<key>CFBundleVersion</key>
-	<string>2.7.1</string>
+	<string>2.7.2</string>
 </dict>
 </plist>
diff --git a/ParseLiveQuery/ParseLiveQuery-watchOS/Info.plist b/ParseLiveQuery/ParseLiveQuery-watchOS/Info.plist
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.7.1</string>
+	<string>2.7.2</string>
 	<key>CFBundleVersion</key>
-	<string>2.7.1</string>
+	<string>2.7.2</string>
 </dict>
 </plist>
diff --git a/ParseLiveQuery/ParseLiveQuery/Resources/Info.plist b/ParseLiveQuery/ParseLiveQuery/Resources/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.7.1</string>
+	<string>2.7.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.7.1</string>
+	<string>2.7.2</string>
 </dict>
 </plist>
diff --git a/ParseStarterProject/.gitignore b/ParseStarterProject/.gitignore
@@ -1 +1,2 @@
 *.framework
+Package.resolved
diff --git a/...XStarterProject-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/...XStarterProject-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/Resources/Info.plist b/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/Resources/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.7.1</string>
+	<string>2.7.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.7.1</string>
+	<string>2.7.2</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSMainNibFile</key>

diff --git a/...arseOSXStarterProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/...arseOSXStarterProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject/Resources/Info.plist b/ParseStarterProject/OSX/ParseOSXStarterProject/Resources/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.7.1</string>
+	<string>2.7.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.7.1</string>
+	<string>2.7.2</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSMainNibFile</key>