Skip to content

Commit c15efdd

Browse files
nlutsenkonlutsenko
committed
Merge pull request #649 from ParsePlatform/nlutsenko.starters
Improved and cleanup deployment for watchOS starter project.
2 parents 9b084d8 + 294463c commit c15efdd

File tree

6 files changed

+90
-81
lines changed

6 files changed

+90
-81
lines changed

‎ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj‎

Lines changed: 40 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,18 @@
2727
81411DDF1BC3658D0004BE84 /* InterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81411DDE1BC3658D0004BE84 /* InterfaceController.swift */; };
2828
81411DE11BC3658D0004BE84 /* ExtensionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81411DE01BC3658D0004BE84 /* ExtensionDelegate.swift */; };
2929
81411DE71BC3658D0004BE84 /* ParseStarter.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = 81411DCD1BC3658C0004BE84 /* ParseStarter.app */; };
30-
81411DF21BC3660D0004BE84 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81411DF11BC3660D0004BE84 /* Parse.framework */; };
31-
81411DF91BC368880004BE84 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81411DF61BC368800004BE84 /* Bolts.framework */; settings = {ASSET_TAGS = (); }; };
32-
81411DFA1BC3688F0004BE84 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81411DF81BC368800004BE84 /* Bolts.framework */; settings = {ASSET_TAGS = (); }; };
33-
81411E011BC368D30004BE84 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 81411E001BC368D30004BE84 /* libsqlite3.tbd */; };
3430
814C3ACA1B69877600E307BB /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 814C3AC61B69877600E307BB /* Main.storyboard */; };
3531
814C3ACB1B69877600E307BB /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 814C3AC81B69877600E307BB /* Images.xcassets */; };
32+
81ADCB9B1C1C111200A2971F /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 81ADCB9A1C1C111200A2971F /* libsqlite3.tbd */; };
33+
81ADCB9C1C1C111800A2971F /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 81ADCB9A1C1C111200A2971F /* libsqlite3.tbd */; };
34+
81ADCBA31C1C120D00A2971F /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81ADCB9E1C1C120700A2971F /* Bolts.framework */; };
35+
81ADCBA41C1C120D00A2971F /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81ADCB9F1C1C120700A2971F /* Parse.framework */; };
36+
81ADCBA51C1C121200A2971F /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81ADCBA11C1C120700A2971F /* Bolts.framework */; };
37+
81ADCBA61C1C121200A2971F /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81ADCBA21C1C120700A2971F /* Parse.framework */; };
3638
81BA814B1A49DA1800E65899 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81BA814A1A49DA1800E65899 /* AppDelegate.swift */; };
3739
81BA814D1A49DA1800E65899 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81BA814C1A49DA1800E65899 /* ViewController.swift */; };
38-
81BA81711A49DB6800E65899 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81BA816C1A49DB6800E65899 /* Parse.framework */; };
39-
81BA81771A49E0D500E65899 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 81BA81761A49E0D500E65899 /* libsqlite3.dylib */; };
4040
81BA81791A49E0DB00E65899 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81BA81781A49E0DB00E65899 /* AudioToolbox.framework */; };
4141
81BA817B1A49E0E500E65899 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81BA817A1A49E0E500E65899 /* SystemConfiguration.framework */; };
42-
81BA817F1A49E0F000E65899 /* libstdc++.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 81BA817E1A49E0F000E65899 /* libstdc++.6.dylib */; };
4342
/* End PBXBuildFile section */
4443

4544
/* Begin PBXContainerItemProxy section */
@@ -57,20 +56,6 @@
5756
remoteGlobalIDString = 81411DD81BC3658C0004BE84;
5857
remoteInfo = "ParseStarter Extension";
5958
};
60-
81411DF31BC3685A0004BE84 /* PBXContainerItemProxy */ = {
61-
isa = PBXContainerItemProxy;
62-
containerPortal = 81BA813D1A49DA1800E65899 /* Project object */;
63-
proxyType = 1;
64-
remoteGlobalIDString = 81993FC71B69AA940077D6B9;
65-
remoteInfo = Bootstrap;
66-
};
67-
81993FCC1B69AAE40077D6B9 /* PBXContainerItemProxy */ = {
68-
isa = PBXContainerItemProxy;
69-
containerPortal = 81BA813D1A49DA1800E65899 /* Project object */;
70-
proxyType = 1;
71-
remoteGlobalIDString = 81993FC71B69AA940077D6B9;
72-
remoteInfo = Bootstrap;
73-
};
7459
/* End PBXContainerItemProxy section */
7560

7661
/* Begin PBXCopyFilesBuildPhase section */
@@ -107,47 +92,41 @@
10792
81411DDE1BC3658D0004BE84 /* InterfaceController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InterfaceController.swift; sourceTree = "<group>"; };
10893
81411DE01BC3658D0004BE84 /* ExtensionDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionDelegate.swift; sourceTree = "<group>"; };
10994
81411DE41BC3658D0004BE84 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
110-
81411DF11BC3660D0004BE84 /* Parse.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Parse.framework; sourceTree = "<group>"; };
111-
81411DF61BC368800004BE84 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Bolts.framework; sourceTree = "<group>"; };
112-
81411DF81BC368800004BE84 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Bolts.framework; sourceTree = "<group>"; };
113-
81411E001BC368D30004BE84 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS2.0.sdk/usr/lib/libsqlite3.tbd; sourceTree = DEVELOPER_DIR; };
11495
814C3AC71B69877600E307BB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
11596
814C3AC81B69877600E307BB /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
11697
814C3AC91B69877600E307BB /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
98+
81ADCB9A1C1C111200A2971F /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
99+
81ADCB9E1C1C120700A2971F /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Bolts.framework; sourceTree = "<group>"; };
100+
81ADCB9F1C1C120700A2971F /* Parse.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Parse.framework; sourceTree = "<group>"; };
101+
81ADCBA11C1C120700A2971F /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Bolts.framework; sourceTree = "<group>"; };
102+
81ADCBA21C1C120700A2971F /* Parse.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Parse.framework; sourceTree = "<group>"; };
117103
81BA81451A49DA1800E65899 /* ParseStarter-Swift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ParseStarter-Swift.app"; sourceTree = BUILT_PRODUCTS_DIR; };
118104
81BA814A1A49DA1800E65899 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
119105
81BA814C1A49DA1800E65899 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
120-
81BA816C1A49DB6800E65899 /* Parse.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Parse.framework; sourceTree = "<group>"; };
121-
81BA816D1A49DB6800E65899 /* ParseCrashReporting.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ParseCrashReporting.framework; sourceTree = "<group>"; };
122-
81BA816E1A49DB6800E65899 /* ParseFacebookUtils.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ParseFacebookUtils.framework; sourceTree = "<group>"; };
123-
81BA81761A49E0D500E65899 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
124106
81BA81781A49E0DB00E65899 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
125107
81BA817A1A49E0E500E65899 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
126-
81BA817E1A49E0F000E65899 /* libstdc++.6.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.6.dylib"; path = "usr/lib/libstdc++.6.dylib"; sourceTree = SDKROOT; };
127-
81BA81801A49E10C00E65899 /* ParseUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ParseUI.framework; sourceTree = "<group>"; };
128108
/* End PBXFileReference section */
129109

130110
/* Begin PBXFrameworksBuildPhase section */
131111
81411DD61BC3658C0004BE84 /* Frameworks */ = {
132112
isa = PBXFrameworksBuildPhase;
133113
buildActionMask = 2147483647;
134114
files = (
135-
81411E011BC368D30004BE84 /* libsqlite3.tbd in Frameworks */,
136-
81411DF21BC3660D0004BE84 /* Parse.framework in Frameworks */,
137-
81411DFA1BC3688F0004BE84 /* Bolts.framework in Frameworks */,
115+
81ADCB9C1C1C111800A2971F /* libsqlite3.tbd in Frameworks */,
116+
81ADCBA61C1C121200A2971F /* Parse.framework in Frameworks */,
117+
81ADCBA51C1C121200A2971F /* Bolts.framework in Frameworks */,
138118
);
139119
runOnlyForDeploymentPostprocessing = 0;
140120
};
141121
81BA81421A49DA1800E65899 /* Frameworks */ = {
142122
isa = PBXFrameworksBuildPhase;
143123
buildActionMask = 2147483647;
144124
files = (
145-
81BA817F1A49E0F000E65899 /* libstdc++.6.dylib in Frameworks */,
125+
81ADCB9B1C1C111200A2971F /* libsqlite3.tbd in Frameworks */,
146126
81BA817B1A49E0E500E65899 /* SystemConfiguration.framework in Frameworks */,
147127
81BA81791A49E0DB00E65899 /* AudioToolbox.framework in Frameworks */,
148-
81411DF91BC368880004BE84 /* Bolts.framework in Frameworks */,
149-
81BA81771A49E0D500E65899 /* libsqlite3.dylib in Frameworks */,
150-
81BA81711A49DB6800E65899 /* Parse.framework in Frameworks */,
128+
81ADCBA31C1C120D00A2971F /* Bolts.framework in Frameworks */,
129+
81ADCBA41C1C120D00A2971F /* Parse.framework in Frameworks */,
151130
);
152131
runOnlyForDeploymentPostprocessing = 0;
153132
};
@@ -192,32 +171,34 @@
192171
name = Resources;
193172
sourceTree = "<group>";
194173
};
195-
81411DF51BC368800004BE84 /* iOS */ = {
174+
814C3AC51B69877600E307BB /* Resources */ = {
196175
isa = PBXGroup;
197176
children = (
198-
81411DF61BC368800004BE84 /* Bolts.framework */,
177+
814C3AC81B69877600E307BB /* Images.xcassets */,
178+
814C3AC91B69877600E307BB /* Info.plist */,
199179
);
200-
name = iOS;
201-
path = Vendor/iOS;
180+
name = Resources;
181+
path = ../Resources;
202182
sourceTree = "<group>";
203183
};
204-
81411DF71BC368800004BE84 /* watchOS */ = {
184+
81ADCB9D1C1C120700A2971F /* iOS */ = {
205185
isa = PBXGroup;
206186
children = (
207-
81411DF81BC368800004BE84 /* Bolts.framework */,
187+
81ADCB9E1C1C120700A2971F /* Bolts.framework */,
188+
81ADCB9F1C1C120700A2971F /* Parse.framework */,
208189
);
209-
name = watchOS;
210-
path = Vendor/watchOS;
190+
name = iOS;
191+
path = Frameworks/iOS;
211192
sourceTree = "<group>";
212193
};
213-
814C3AC51B69877600E307BB /* Resources */ = {
194+
81ADCBA01C1C120700A2971F /* watchOS */ = {
214195
isa = PBXGroup;
215196
children = (
216-
814C3AC81B69877600E307BB /* Images.xcassets */,
217-
814C3AC91B69877600E307BB /* Info.plist */,
197+
81ADCBA11C1C120700A2971F /* Bolts.framework */,
198+
81ADCBA21C1C120700A2971F /* Parse.framework */,
218199
);
219-
name = Resources;
220-
path = ../Resources;
200+
name = watchOS;
201+
path = Frameworks/watchOS;
221202
sourceTree = "<group>";
222203
};
223204
81BA813C1A49DA1800E65899 = {
@@ -255,14 +236,8 @@
255236
81BA816A1A49DB5600E65899 /* Frameworks */ = {
256237
isa = PBXGroup;
257238
children = (
258-
81411E001BC368D30004BE84 /* libsqlite3.tbd */,
259-
81411DF51BC368800004BE84 /* iOS */,
260-
81411DF71BC368800004BE84 /* watchOS */,
261-
81411DF11BC3660D0004BE84 /* Parse.framework */,
262-
81BA816C1A49DB6800E65899 /* Parse.framework */,
263-
81BA816D1A49DB6800E65899 /* ParseCrashReporting.framework */,
264-
81BA816E1A49DB6800E65899 /* ParseFacebookUtils.framework */,
265-
81BA81801A49E10C00E65899 /* ParseUI.framework */,
239+
81ADCB9D1C1C120700A2971F /* iOS */,
240+
81ADCBA01C1C120700A2971F /* watchOS */,
266241
81BA81751A49E0C500E65899 /* System Frameworks */,
267242
);
268243
name = Frameworks;
@@ -271,10 +246,9 @@
271246
81BA81751A49E0C500E65899 /* System Frameworks */ = {
272247
isa = PBXGroup;
273248
children = (
274-
81BA817E1A49E0F000E65899 /* libstdc++.6.dylib */,
249+
81ADCB9A1C1C111200A2971F /* libsqlite3.tbd */,
275250
81BA817A1A49E0E500E65899 /* SystemConfiguration.framework */,
276251
81BA81781A49E0DB00E65899 /* AudioToolbox.framework */,
277-
81BA81761A49E0D500E65899 /* libsqlite3.dylib */,
278252
);
279253
name = "System Frameworks";
280254
sourceTree = "<group>";
@@ -310,7 +284,6 @@
310284
buildRules = (
311285
);
312286
dependencies = (
313-
81411DF41BC3685A0004BE84 /* PBXTargetDependency */,
314287
);
315288
name = "ParseStarter Extension";
316289
productName = "ParseStarter Extension";
@@ -331,7 +304,6 @@
331304
);
332305
dependencies = (
333306
068C15651BC8F15300820E44 /* PBXTargetDependency */,
334-
81993FCD1B69AAE40077D6B9 /* PBXTargetDependency */,
335307
);
336308
name = "ParseStarter-Swift";
337309
productName = ParseStarterProject;
@@ -423,7 +395,7 @@
423395
);
424396
runOnlyForDeploymentPostprocessing = 0;
425397
shellPath = /bin/sh;
426-
shellScript = "if [[ ! -d \"Vendor/iOS/Bolts.framework\" ]]; then\n mkdir -p Vendor/iOS\n cp -R ../../../Vendor/Bolts-ObjC/build/ios/Bolts.framework ./Vendor/iOS\nfi\n\nif [[ ! -d \"Vendor/watchOS/Bolts.framework\" ]]; then\n mkdir -p Vendor/watchOS\n cp -R ../../../Vendor/Bolts-ObjC/build/watchOS/Bolts.framework ./Vendor/watchOS\nfi\n";
398+
shellScript = "if [[ ! -d \"Frameworks/iOS/Bolts.framework\" ]]; then\n mkdir -p Frameworks/iOS\n cp -R ../../../Vendor/Bolts-ObjC/build/ios/Bolts.framework ./Frameworks/iOS\nfi\n\nif [[ ! -d \"Frameworks/watchOS/Bolts.framework\" ]]; then\n mkdir -p Frameworks/watchOS\n cp -R ../../../Vendor/Bolts-ObjC/build/watchOS/Bolts.framework ./Frameworks/watchOS\nfi\n";
427399
};
428400
81CC85E11A49F6D40076DE19 /* Upload Symbol Files */ = {
429401
isa = PBXShellScriptBuildPhase;
@@ -473,16 +445,6 @@
473445
target = 81411DD81BC3658C0004BE84 /* ParseStarter Extension */;
474446
targetProxy = 81411DDB1BC3658D0004BE84 /* PBXContainerItemProxy */;
475447
};
476-
81411DF41BC3685A0004BE84 /* PBXTargetDependency */ = {
477-
isa = PBXTargetDependency;
478-
target = 81993FC71B69AA940077D6B9 /* Bootstrap */;
479-
targetProxy = 81411DF31BC3685A0004BE84 /* PBXContainerItemProxy */;
480-
};
481-
81993FCD1B69AAE40077D6B9 /* PBXTargetDependency */ = {
482-
isa = PBXTargetDependency;
483-
target = 81993FC71B69AA940077D6B9 /* Bootstrap */;
484-
targetProxy = 81993FCC1B69AAE40077D6B9 /* PBXContainerItemProxy */;
485-
};
486448
/* End PBXTargetDependency section */
487449

488450
/* Begin PBXVariantGroup section */
@@ -514,7 +476,7 @@
514476
FRAMEWORK_SEARCH_PATHS = (
515477
"$(BUILT_PRODUCTS_DIR)",
516478
"$(PROJECT_DIR)",
517-
"$(PROJECT_DIR)/Vendor/watchOS",
479+
"$(PROJECT_DIR)/Frameworks/watchOS",
518480
);
519481
GCC_NO_COMMON_BLOCKS = YES;
520482
INFOPLIST_FILE = "ParseStarter Extension/Info.plist";
@@ -536,7 +498,7 @@
536498
FRAMEWORK_SEARCH_PATHS = (
537499
"$(BUILT_PRODUCTS_DIR)",
538500
"$(PROJECT_DIR)",
539-
"$(PROJECT_DIR)/Vendor/watchOS",
501+
"$(PROJECT_DIR)/Frameworks/watchOS",
540502
);
541503
GCC_NO_COMMON_BLOCKS = YES;
542504
INFOPLIST_FILE = "ParseStarter Extension/Info.plist";
@@ -690,7 +652,7 @@
690652
FRAMEWORK_SEARCH_PATHS = (
691653
"$(inherited)",
692654
"$(PROJECT_DIR)",
693-
"$(PROJECT_DIR)/Vendor/iOS",
655+
"$(PROJECT_DIR)/Frameworks/iOS",
694656
);
695657
INFOPLIST_FILE = Resources/Info.plist;
696658
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -707,7 +669,7 @@
707669
FRAMEWORK_SEARCH_PATHS = (
708670
"$(inherited)",
709671
"$(PROJECT_DIR)",
710-
"$(PROJECT_DIR)/Vendor/iOS",
672+
"$(PROJECT_DIR)/Frameworks/iOS",
711673
);
712674
INFOPLIST_FILE = Resources/Info.plist;
713675
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";

‎ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/xcshareddata/xcschemes/ParseWatchStarter-iOS.xcscheme‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,20 @@
66
parallelizeBuildables = "NO"
77
buildImplicitDependencies = "NO">
88
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "81993FC71B69AA940077D6B9"
18+
BuildableName = "Bootstrap"
19+
BlueprintName = "Bootstrap"
20+
ReferencedContainer = "container:ParseStarter-Swift.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
923
<BuildActionEntry
1024
buildForTesting = "YES"
1125
buildForRunning = "YES"

‎ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/xcshareddata/xcschemes/ParseWatchStarter-watchOS.xcscheme‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,20 @@
66
parallelizeBuildables = "NO"
77
buildImplicitDependencies = "NO">
88
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "81993FC71B69AA940077D6B9"
18+
BuildableName = "Bootstrap"
19+
BlueprintName = "Bootstrap"
20+
ReferencedContainer = "container:ParseStarter-Swift.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
923
<BuildActionEntry
1024
buildForTesting = "YES"
1125
buildForRunning = "YES"

‎ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarterProject/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
4949
let defaultACL = PFACL();
5050

5151
// If you would like all objects to be private by default, remove this line.
52-
defaultACL.setPublicReadAccess(true)
52+
defaultACL.publicReadAccess = true
5353

5454
PFACL.setDefaultACL(defaultACL, withAccessForCurrentUser:true)
5555

‎ParseStarterProject/watchOS/ParseStarterProject-Swift/Resources/Images.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@
5959
"idiom" : "ipad",
6060
"size" : "76x76",
6161
"scale" : "2x"
62+
},
63+
{
64+
"idiom" : "ipad",
65+
"size" : "83.5x83.5",
66+
"scale" : "2x"
6267
}
6368
],
6469
"info" : {

‎Rakefile‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,19 @@ namespace :package do
222222
File.join(script_folder, 'ParseStarterProject', 'watchOS', 'ParseStarterProject-Swift')
223223
]
224224
watchos_framework_archive = File.join(release_folder, package_watchos_name)
225-
make_starter_package(release_folder, watchos_starters, watchos_framework_archive, package_starter_watchos_name)
225+
watchos_starters.each do |project_path|
226+
`git clean -xfd #{project_path}`
227+
`mkdir -p #{project_path}/Frameworks/iOS && mkdir -p #{project_path}/Frameworks/watchOS`
228+
`cd #{project_path}/Frameworks/iOS && unzip -o #{ios_framework_archive}`
229+
`cd #{project_path}/Frameworks/watchOS && unzip -o #{watchos_framework_archive}`
230+
xcodeproj_path = Dir.glob(File.join(project_path, '*.xcodeproj'))[0]
231+
prepare_xcodeproj(xcodeproj_path)
232+
end
233+
make_package(release_folder, watchos_starters, package_starter_watchos_name)
234+
watchos_starters.each do |project_path|
235+
`git clean -xfd #{project_path}`
236+
`git checkout #{project_path}`
237+
end
226238
end
227239

228240
def make_package(target_path, items, archive_name)
@@ -265,7 +277,9 @@ namespace :package do
265277
if target.name == 'Bootstrap'
266278
target.remove_from_project
267279
else
268-
target.dependencies.each(&:remove_from_project)
280+
target.dependencies.each do |dependency|
281+
dependency.remove_from_project if dependency.display_name == 'Bootstrap'
282+
end
269283
end
270284
end
271285
project.save

0 commit comments

Comments
 (0)