Skip to content

Commit e7df36b

Browse files
authored
fix: Compilation errors Undefined symbol and SystemConfiguration not found on watchOS (#1748)
1 parent 9fda428 commit e7df36b

File tree

15 files changed

+37
-224
lines changed

15 files changed

+37
-224
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- test:parseui:all
2525
- test:parse_live_query:all
2626
- build:starters
27-
fail-fast: false
27+
fail-fast: true
2828
runs-on: macos-12
2929
steps:
3030
- uses: actions/checkout@v3
@@ -76,17 +76,20 @@ jobs:
7676
run: |
7777
ARTIFACT_NAME=${{ env.ARTIFACT_NAME }}
7878
TEST_RESULTS=$(find ~/Library/Developer/Xcode/DerivedData -name "*.xcresult")
79+
BUILD_RESULTS=$(find ~/Library/Developer/Xcode/DerivedData -name "*.xcactivitylog")
7980
echo ARTIFACT_NAME=${ARTIFACT_NAME//:/-} >> $GITHUB_ENV # replace colon with dashes
8081
echo TEST_RESULTS=${TEST_RESULTS} >> $GITHUB_ENV
8182
echo "Artifact Name: $ARTIFACT_NAME"
8283
echo "Test Result Location: $TEST_RESULTS"
84+
echo "Build Result Location: $BUILD_RESULTS"
8385
- name: Upload Artifact Logs
8486
if: ${{ failure() }}
8587
uses: actions/upload-artifact@v3
8688
with:
8789
name: ${{ env.ARTIFACT_NAME }}
8890
path: |
8991
~/Library/Developer/Xcode/DerivedData/Parse-*/Logs/Test
92+
~/Library/Developer/Xcode/DerivedData/**/Logs/Build
9093
- name: Upload Coverage
9194
uses: codecov/[email protected]
9295
with:

Parse/Parse/Internal/Installation/Controller/PFInstallationController.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
#import "PFInstallationController.h"
1111

12+
#if !TARGET_OS_WATCH
13+
1214
#import "BFTask+Private.h"
1315
#import "PFAssert.h"
1416
#import "PFCurrentInstallationController.h"
@@ -105,3 +107,5 @@ - (PFCurrentInstallationController *)currentInstallationController {
105107
}
106108

107109
@end
110+
111+
#endif

Parse/Parse/Internal/Installation/CurrentInstallationController/PFCurrentInstallationController.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
#import "PFCurrentInstallationController.h"
1111

12+
#if !TARGET_OS_WATCH
13+
1214
#import "BFTask+Private.h"
1315
#import "PFAsyncTaskQueue.h"
1416
#import "PFInstallationIdentifierStore.h"
@@ -280,3 +282,5 @@ - (void)setCurrentInstallationMatchesDisk:(BOOL)currentInstallationMatchesDisk {
280282
}
281283

282284
@end
285+
286+
#endif

Parse/Parse/Internal/PFReachability.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
#import "PFReachability.h"
1111

12+
#if !TARGET_OS_WATCH
1213
#import <SystemConfiguration/SystemConfiguration.h>
1314

1415
#import "PFAssert.h"
@@ -209,3 +210,5 @@ - (void)_startMonitoringReachabilityWithURL:(NSURL *)url {
209210
}
210211

211212
@end
213+
214+
#endif

Parse/Parse/Internal/Push/Utilites/PFPushUtilities.m

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@
1717
#import "PFAlertView.h"
1818
#endif
1919

20+
#if !TARGET_OS_WATCH
2021
#import "PFInstallationPrivate.h"
22+
#endif
23+
2124
#import "PFKeychainStore.h"
2225
#import "PFLogging.h"
2326
#import "PFMacros.h"
@@ -49,11 +52,13 @@ + (NSString *)getDeviceTokenFromKeychain {
4952
return store[@"ParsePush"];
5053
}
5154

55+
#if !TARGET_OS_WATCH
5256
+ (void)clearDeviceToken {
5357
// Used in test case setup.
5458
[[PFInstallation currentInstallation] _clearDeviceToken];
5559
[[[PFKeychainStore alloc] initWithService:@"ParsePush"] removeObjectForKey:@"ParsePush"];
5660
}
61+
#endif
5762

5863
#if TARGET_OS_IOS
5964

ParseStarterProject/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
*.framework
2+
Package.resolved

ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 0 additions & 43 deletions
This file was deleted.

ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 0 additions & 43 deletions
This file was deleted.

ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject-Swift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 0 additions & 43 deletions
This file was deleted.

ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)