Skip to content

Commit 13e43d0

Browse files
ashare80ashare80
committed
tutorial migration to SPM
1 parent ffc489f commit 13e43d0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+574
-614
lines changed

‎ios/tutorials/tutorial1/Podfile

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

‎ios/tutorials/tutorial1/TicTacToe.xcodeproj/project.pbxproj

Lines changed: 74 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 48;
6+
objectVersion = 52;
77
objects = {
88

99
/* Begin PBXBuildFile section */
1010
7EDD59501FA13579005EC8B2 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7EDD594F1FA13579005EC8B2 /* Default-568h@2x.png */; };
11-
AEFA38604D7D1E4A08E9A7FA /* Pods_TicTacToe.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B99EABB5C8D25341027C05C5 /* Pods_TicTacToe.framework */; };
11+
E37156A32503ABBA00797747 /* RIBs in Frameworks */ = {isa = PBXBuildFile; productRef = E37156A22503ABBA00797747 /* RIBs */; };
12+
E3EB47DD2503A74F00B50167 /* RxCocoa in Frameworks */ = {isa = PBXBuildFile; productRef = E3EB47DC2503A74F00B50167 /* RxCocoa */; };
13+
E3EB47DF2503A74F00B50167 /* RxSwift in Frameworks */ = {isa = PBXBuildFile; productRef = E3EB47DE2503A74F00B50167 /* RxSwift */; };
14+
E3EB47E22503A7DC00B50167 /* SnapKit in Frameworks */ = {isa = PBXBuildFile; productRef = E3EB47E12503A7DC00B50167 /* SnapKit */; };
1215
E9C3E1EA1FA1BD0400781364 /* DELETE_ME.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9C3E1E91FA1BD0400781364 /* DELETE_ME.swift */; };
1316
E9CB1D521F97303800D84847 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9CB1D351F972FD500D84847 /* AppDelegate.swift */; };
1417
E9CB1D531F97305A00D84847 /* AppComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9CB1D341F972FD500D84847 /* AppComponent.swift */; };
@@ -21,9 +24,7 @@
2124

2225
/* Begin PBXFileReference section */
2326
7EDD594F1FA13579005EC8B2 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
24-
833B15CABE3CBE09720A0409 /* Pods-TicTacToe.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TicTacToe.debug.xcconfig"; path = "Pods/Target Support Files/Pods-TicTacToe/Pods-TicTacToe.debug.xcconfig"; sourceTree = "<group>"; };
25-
A791EBDAD202886E66137B9C /* Pods-TicTacToe.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TicTacToe.release.xcconfig"; path = "Pods/Target Support Files/Pods-TicTacToe/Pods-TicTacToe.release.xcconfig"; sourceTree = "<group>"; };
26-
B99EABB5C8D25341027C05C5 /* Pods_TicTacToe.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TicTacToe.framework; sourceTree = BUILT_PRODUCTS_DIR; };
27+
E37156A12503A8E100797747 /* RIBs */ = {isa = PBXFileReference; lastKnownFileType = folder; name = RIBs; path = ../../..; sourceTree = "<group>"; };
2728
E9894B4A1F972CC500688FCB /* TicTacToe.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TicTacToe.app; sourceTree = BUILT_PRODUCTS_DIR; };
2829
E9894B591F972CC500688FCB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
2930
E9C3E1E91FA1BD0400781364 /* DELETE_ME.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DELETE_ME.swift; sourceTree = "<group>"; };
@@ -41,22 +42,16 @@
4142
isa = PBXFrameworksBuildPhase;
4243
buildActionMask = 2147483647;
4344
files = (
44-
AEFA38604D7D1E4A08E9A7FA /* Pods_TicTacToe.framework in Frameworks */,
45+
E37156A32503ABBA00797747 /* RIBs in Frameworks */,
46+
E3EB47E22503A7DC00B50167 /* SnapKit in Frameworks */,
47+
E3EB47DF2503A74F00B50167 /* RxSwift in Frameworks */,
48+
E3EB47DD2503A74F00B50167 /* RxCocoa in Frameworks */,
4549
);
4650
runOnlyForDeploymentPostprocessing = 0;
4751
};
4852
/* End PBXFrameworksBuildPhase section */
4953

5054
/* Begin PBXGroup section */
51-
59F943336420DE07CA779F6F /* Pods */ = {
52-
isa = PBXGroup;
53-
children = (
54-
833B15CABE3CBE09720A0409 /* Pods-TicTacToe.debug.xcconfig */,
55-
A791EBDAD202886E66137B9C /* Pods-TicTacToe.release.xcconfig */,
56-
);
57-
name = Pods;
58-
sourceTree = "<group>";
59-
};
6055
7EDD59511FA135E9005EC8B2 /* Resources */ = {
6156
isa = PBXGroup;
6257
children = (
@@ -68,9 +63,9 @@
6863
E9894B411F972CC500688FCB = {
6964
isa = PBXGroup;
7065
children = (
66+
E37156A12503A8E100797747 /* RIBs */,
7167
E9894B4C1F972CC500688FCB /* TicTacToe */,
7268
E9894B4B1F972CC500688FCB /* Products */,
73-
59F943336420DE07CA779F6F /* Pods */,
7469
F5205CCF508911BE388D8406 /* Frameworks */,
7570
);
7671
sourceTree = "<group>";
@@ -127,7 +122,6 @@
127122
F5205CCF508911BE388D8406 /* Frameworks */ = {
128123
isa = PBXGroup;
129124
children = (
130-
B99EABB5C8D25341027C05C5 /* Pods_TicTacToe.framework */,
131125
);
132126
name = Frameworks;
133127
sourceTree = "<group>";
@@ -139,17 +133,21 @@
139133
isa = PBXNativeTarget;
140134
buildConfigurationList = E9894B671F972CC600688FCB /* Build configuration list for PBXNativeTarget "TicTacToe" */;
141135
buildPhases = (
142-
64CF0EF6C16C782FD4AF3F3C /* [CP] Check Pods Manifest.lock */,
143136
E9894B461F972CC500688FCB /* Sources */,
144137
E9894B471F972CC500688FCB /* Frameworks */,
145138
E9894B481F972CC500688FCB /* Resources */,
146-
01C0219C62DB08840E36B78D /* [CP] Embed Pods Frameworks */,
147139
);
148140
buildRules = (
149141
);
150142
dependencies = (
151143
);
152144
name = TicTacToe;
145+
packageProductDependencies = (
146+
E3EB47DC2503A74F00B50167 /* RxCocoa */,
147+
E3EB47DE2503A74F00B50167 /* RxSwift */,
148+
E3EB47E12503A7DC00B50167 /* SnapKit */,
149+
E37156A22503ABBA00797747 /* RIBs */,
150+
);
153151
productName = TicTacToe;
154152
productReference = E9894B4A1F972CC500688FCB /* TicTacToe.app */;
155153
productType = "com.apple.product-type.application";
@@ -179,6 +177,10 @@
179177
Base,
180178
);
181179
mainGroup = E9894B411F972CC500688FCB;
180+
packageReferences = (
181+
E3EB47DB2503A74F00B50167 /* XCRemoteSwiftPackageReference "RxSwift" */,
182+
E3EB47E02503A7DC00B50167 /* XCRemoteSwiftPackageReference "SnapKit" */,
183+
);
182184
productRefGroup = E9894B4B1F972CC500688FCB /* Products */;
183185
projectDirPath = "";
184186
projectRoot = "";
@@ -199,53 +201,6 @@
199201
};
200202
/* End PBXResourcesBuildPhase section */
201203

202-
/* Begin PBXShellScriptBuildPhase section */
203-
01C0219C62DB08840E36B78D /* [CP] Embed Pods Frameworks */ = {
204-
isa = PBXShellScriptBuildPhase;
205-
buildActionMask = 2147483647;
206-
files = (
207-
);
208-
inputPaths = (
209-
"${PODS_ROOT}/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh",
210-
"${BUILT_PRODUCTS_DIR}/RIBs/RIBs.framework",
211-
"${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework",
212-
"${BUILT_PRODUCTS_DIR}/RxRelay/RxRelay.framework",
213-
"${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework",
214-
"${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework",
215-
);
216-
name = "[CP] Embed Pods Frameworks";
217-
outputPaths = (
218-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RIBs.framework",
219-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",
220-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRelay.framework",
221-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
222-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework",
223-
);
224-
runOnlyForDeploymentPostprocessing = 0;
225-
shellPath = /bin/sh;
226-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh\"\n";
227-
showEnvVarsInLog = 0;
228-
};
229-
64CF0EF6C16C782FD4AF3F3C /* [CP] Check Pods Manifest.lock */ = {
230-
isa = PBXShellScriptBuildPhase;
231-
buildActionMask = 2147483647;
232-
files = (
233-
);
234-
inputPaths = (
235-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
236-
"${PODS_ROOT}/Manifest.lock",
237-
);
238-
name = "[CP] Check Pods Manifest.lock";
239-
outputPaths = (
240-
"$(DERIVED_FILE_DIR)/Pods-TicTacToe-checkManifestLockResult.txt",
241-
);
242-
runOnlyForDeploymentPostprocessing = 0;
243-
shellPath = /bin/sh;
244-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
245-
showEnvVarsInLog = 0;
246-
};
247-
/* End PBXShellScriptBuildPhase section */
248-
249204
/* Begin PBXSourcesBuildPhase section */
250205
E9894B461F972CC500688FCB /* Sources */ = {
251206
isa = PBXSourcesBuildPhase;
@@ -315,7 +270,7 @@
315270
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
316271
GCC_WARN_UNUSED_FUNCTION = YES;
317272
GCC_WARN_UNUSED_VARIABLE = YES;
318-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
273+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
319274
MTL_ENABLE_DEBUG_INFO = YES;
320275
ONLY_ACTIVE_ARCH = YES;
321276
SDKROOT = iphoneos;
@@ -369,22 +324,25 @@
369324
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
370325
GCC_WARN_UNUSED_FUNCTION = YES;
371326
GCC_WARN_UNUSED_VARIABLE = YES;
372-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
327+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
373328
MTL_ENABLE_DEBUG_INFO = NO;
374329
SDKROOT = iphoneos;
375-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
330+
SWIFT_COMPILATION_MODE = wholemodule;
331+
SWIFT_OPTIMIZATION_LEVEL = "-O";
376332
SWIFT_VERSION = 4.0;
377333
VALIDATE_PRODUCT = YES;
378334
};
379335
name = Release;
380336
};
381337
E9894B681F972CC600688FCB /* Debug */ = {
382338
isa = XCBuildConfiguration;
383-
baseConfigurationReference = 833B15CABE3CBE09720A0409 /* Pods-TicTacToe.debug.xcconfig */;
384339
buildSettings = {
385340
CODE_SIGN_STYLE = Automatic;
386341
INFOPLIST_FILE = TicTacToe/Info.plist;
387-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
342+
LD_RUNPATH_SEARCH_PATHS = (
343+
"$(inherited)",
344+
"@executable_path/Frameworks",
345+
);
388346
PRODUCT_BUNDLE_IDENTIFIER = com.ubercab.TicTacToe;
389347
PRODUCT_NAME = "$(TARGET_NAME)";
390348
SWIFT_VERSION = 4.0;
@@ -394,11 +352,13 @@
394352
};
395353
E9894B691F972CC600688FCB /* Release */ = {
396354
isa = XCBuildConfiguration;
397-
baseConfigurationReference = A791EBDAD202886E66137B9C /* Pods-TicTacToe.release.xcconfig */;
398355
buildSettings = {
399356
CODE_SIGN_STYLE = Automatic;
400357
INFOPLIST_FILE = TicTacToe/Info.plist;
401-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
358+
LD_RUNPATH_SEARCH_PATHS = (
359+
"$(inherited)",
360+
"@executable_path/Frameworks",
361+
);
402362
PRODUCT_BUNDLE_IDENTIFIER = com.ubercab.TicTacToe;
403363
PRODUCT_NAME = "$(TARGET_NAME)";
404364
SWIFT_VERSION = 4.0;
@@ -428,6 +388,47 @@
428388
defaultConfigurationName = Release;
429389
};
430390
/* End XCConfigurationList section */
391+
392+
/* Begin XCRemoteSwiftPackageReference section */
393+
E3EB47DB2503A74F00B50167 /* XCRemoteSwiftPackageReference "RxSwift" */ = {
394+
isa = XCRemoteSwiftPackageReference;
395+
repositoryURL = "https://github.com/ReactiveX/RxSwift.git";
396+
requirement = {
397+
kind = upToNextMajorVersion;
398+
minimumVersion = 5.1.0;
399+
};
400+
};
401+
E3EB47E02503A7DC00B50167 /* XCRemoteSwiftPackageReference "SnapKit" */ = {
402+
isa = XCRemoteSwiftPackageReference;
403+
repositoryURL = "https://github.com/SnapKit/SnapKit.git";
404+
requirement = {
405+
branch = develop;
406+
kind = branch;
407+
};
408+
};
409+
/* End XCRemoteSwiftPackageReference section */
410+
411+
/* Begin XCSwiftPackageProductDependency section */
412+
E37156A22503ABBA00797747 /* RIBs */ = {
413+
isa = XCSwiftPackageProductDependency;
414+
productName = RIBs;
415+
};
416+
E3EB47DC2503A74F00B50167 /* RxCocoa */ = {
417+
isa = XCSwiftPackageProductDependency;
418+
package = E3EB47DB2503A74F00B50167 /* XCRemoteSwiftPackageReference "RxSwift" */;
419+
productName = RxCocoa;
420+
};
421+
E3EB47DE2503A74F00B50167 /* RxSwift */ = {
422+
isa = XCSwiftPackageProductDependency;
423+
package = E3EB47DB2503A74F00B50167 /* XCRemoteSwiftPackageReference "RxSwift" */;
424+
productName = RxSwift;
425+
};
426+
E3EB47E12503A7DC00B50167 /* SnapKit */ = {
427+
isa = XCSwiftPackageProductDependency;
428+
package = E3EB47E02503A7DC00B50167 /* XCRemoteSwiftPackageReference "SnapKit" */;
429+
productName = SnapKit;
430+
};
431+
/* End XCSwiftPackageProductDependency section */
431432
};
432433
rootObject = E9894B421F972CC500688FCB /* Project object */;
433434
}

‎ios/tutorials/tutorial1/TicTacToe/LoggedOut/DELETE_ME.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
//
1616

1717
import RIBs
18+
import UIKit
1819

1920
protocol LoggedOutDependency {}
2021

‎ios/tutorials/tutorial2/Podfile

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

0 commit comments

Comments
 (0)