Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tutorial migration to swift 5 and SPM instead of cocoa pods #376

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Tutorial migration to swift 5 and SPM instead of cocoa pods #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions ios/tutorials/tutorial1/Podfile
View file
Open in desktop

This file was deleted.

147 changes: 74 additions & 73 deletions ios/tutorials/tutorial1/TicTacToe.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@
archiveVersion = 1;
classes = {
};
objectVersion = 48;
objectVersion = 52;
objects = {

/* Begin PBXBuildFile section */
7EDD59501FA13579005EC8B2 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 7EDD594F1FA13579005EC8B2 /* [email protected] */; };
AEFA38604D7D1E4A08E9A7FA /* Pods_TicTacToe.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B99EABB5C8D25341027C05C5 /* Pods_TicTacToe.framework */; };
E37156A32503ABBA00797747 /* RIBs in Frameworks */ = {isa = PBXBuildFile; productRef = E37156A22503ABBA00797747 /* RIBs */; };
E3EB47DD2503A74F00B50167 /* RxCocoa in Frameworks */ = {isa = PBXBuildFile; productRef = E3EB47DC2503A74F00B50167 /* RxCocoa */; };
E3EB47DF2503A74F00B50167 /* RxSwift in Frameworks */ = {isa = PBXBuildFile; productRef = E3EB47DE2503A74F00B50167 /* RxSwift */; };
E3EB47E22503A7DC00B50167 /* SnapKit in Frameworks */ = {isa = PBXBuildFile; productRef = E3EB47E12503A7DC00B50167 /* SnapKit */; };
E9C3E1EA1FA1BD0400781364 /* DELETE_ME.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9C3E1E91FA1BD0400781364 /* DELETE_ME.swift */; };
E9CB1D521F97303800D84847 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9CB1D351F972FD500D84847 /* AppDelegate.swift */; };
E9CB1D531F97305A00D84847 /* AppComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9CB1D341F972FD500D84847 /* AppComponent.swift */; };
Expand All @@ -21,9 +24,7 @@

/* Begin PBXFileReference section */
7EDD594F1FA13579005EC8B2 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
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>"; };
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>"; };
B99EABB5C8D25341027C05C5 /* Pods_TicTacToe.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TicTacToe.framework; sourceTree = BUILT_PRODUCTS_DIR; };
E37156A12503A8E100797747 /* RIBs */ = {isa = PBXFileReference; lastKnownFileType = folder; name = RIBs; path = ../../..; sourceTree = "<group>"; };
E9894B4A1F972CC500688FCB /* TicTacToe.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TicTacToe.app; sourceTree = BUILT_PRODUCTS_DIR; };
E9894B591F972CC500688FCB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
E9C3E1E91FA1BD0400781364 /* DELETE_ME.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DELETE_ME.swift; sourceTree = "<group>"; };
Expand All @@ -41,22 +42,16 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
AEFA38604D7D1E4A08E9A7FA /* Pods_TicTacToe.framework in Frameworks */,
E37156A32503ABBA00797747 /* RIBs in Frameworks */,
E3EB47E22503A7DC00B50167 /* SnapKit in Frameworks */,
E3EB47DF2503A74F00B50167 /* RxSwift in Frameworks */,
E3EB47DD2503A74F00B50167 /* RxCocoa in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
59F943336420DE07CA779F6F /* Pods */ = {
isa = PBXGroup;
children = (
833B15CABE3CBE09720A0409 /* Pods-TicTacToe.debug.xcconfig */,
A791EBDAD202886E66137B9C /* Pods-TicTacToe.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
7EDD59511FA135E9005EC8B2 /* Resources */ = {
isa = PBXGroup;
children = (
Expand All @@ -68,9 +63,9 @@
E9894B411F972CC500688FCB = {
isa = PBXGroup;
children = (
E37156A12503A8E100797747 /* RIBs */,
E9894B4C1F972CC500688FCB /* TicTacToe */,
E9894B4B1F972CC500688FCB /* Products */,
59F943336420DE07CA779F6F /* Pods */,
F5205CCF508911BE388D8406 /* Frameworks */,
);
sourceTree = "<group>";
Expand Down Expand Up @@ -127,7 +122,6 @@
F5205CCF508911BE388D8406 /* Frameworks */ = {
isa = PBXGroup;
children = (
B99EABB5C8D25341027C05C5 /* Pods_TicTacToe.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand All @@ -139,17 +133,21 @@
isa = PBXNativeTarget;
buildConfigurationList = E9894B671F972CC600688FCB /* Build configuration list for PBXNativeTarget "TicTacToe" */;
buildPhases = (
64CF0EF6C16C782FD4AF3F3C /* [CP] Check Pods Manifest.lock */,
E9894B461F972CC500688FCB /* Sources */,
E9894B471F972CC500688FCB /* Frameworks */,
E9894B481F972CC500688FCB /* Resources */,
01C0219C62DB08840E36B78D /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
dependencies = (
);
name = TicTacToe;
packageProductDependencies = (
E3EB47DC2503A74F00B50167 /* RxCocoa */,
E3EB47DE2503A74F00B50167 /* RxSwift */,
E3EB47E12503A7DC00B50167 /* SnapKit */,
E37156A22503ABBA00797747 /* RIBs */,
);
productName = TicTacToe;
productReference = E9894B4A1F972CC500688FCB /* TicTacToe.app */;
productType = "com.apple.product-type.application";
Expand Down Expand Up @@ -179,6 +177,10 @@
Base,
);
mainGroup = E9894B411F972CC500688FCB;
packageReferences = (
E3EB47DB2503A74F00B50167 /* XCRemoteSwiftPackageReference "RxSwift" */,
E3EB47E02503A7DC00B50167 /* XCRemoteSwiftPackageReference "SnapKit" */,
);
productRefGroup = E9894B4B1F972CC500688FCB /* Products */;
projectDirPath = "";
projectRoot = "";
Expand All @@ -199,53 +201,6 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
01C0219C62DB08840E36B78D /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/RIBs/RIBs.framework",
"${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework",
"${BUILT_PRODUCTS_DIR}/RxRelay/RxRelay.framework",
"${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework",
"${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RIBs.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRelay.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-TicTacToe/Pods-TicTacToe-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
64CF0EF6C16C782FD4AF3F3C /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-TicTacToe-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
E9894B461F972CC500688FCB /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand Down Expand Up @@ -315,7 +270,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -369,22 +324,25 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 4.0;
VALIDATE_PRODUCT = YES;
};
name = Release;
};
E9894B681F972CC600688FCB /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 833B15CABE3CBE09720A0409 /* Pods-TicTacToe.debug.xcconfig */;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
INFOPLIST_FILE = TicTacToe/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.ubercab.TicTacToe;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
Expand All @@ -394,11 +352,13 @@
};
E9894B691F972CC600688FCB /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = A791EBDAD202886E66137B9C /* Pods-TicTacToe.release.xcconfig */;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
INFOPLIST_FILE = TicTacToe/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.ubercab.TicTacToe;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
Expand Down Expand Up @@ -428,6 +388,47 @@
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
E3EB47DB2503A74F00B50167 /* XCRemoteSwiftPackageReference "RxSwift" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/ReactiveX/RxSwift.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 5.1.0;
};
};
E3EB47E02503A7DC00B50167 /* XCRemoteSwiftPackageReference "SnapKit" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/SnapKit/SnapKit.git";
requirement = {
branch = develop;
kind = branch;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
E37156A22503ABBA00797747 /* RIBs */ = {
isa = XCSwiftPackageProductDependency;
productName = RIBs;
};
E3EB47DC2503A74F00B50167 /* RxCocoa */ = {
isa = XCSwiftPackageProductDependency;
package = E3EB47DB2503A74F00B50167 /* XCRemoteSwiftPackageReference "RxSwift" */;
productName = RxCocoa;
};
E3EB47DE2503A74F00B50167 /* RxSwift */ = {
isa = XCSwiftPackageProductDependency;
package = E3EB47DB2503A74F00B50167 /* XCRemoteSwiftPackageReference "RxSwift" */;
productName = RxSwift;
};
E3EB47E12503A7DC00B50167 /* SnapKit */ = {
isa = XCSwiftPackageProductDependency;
package = E3EB47E02503A7DC00B50167 /* XCRemoteSwiftPackageReference "SnapKit" */;
productName = SnapKit;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = E9894B421F972CC500688FCB /* Project object */;
}
1 change: 1 addition & 0 deletions ios/tutorials/tutorial1/TicTacToe/LoggedOut/DELETE_ME.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
//

import RIBs
import UIKit

protocol LoggedOutDependency {}

Expand Down
14 changes: 0 additions & 14 deletions ios/tutorials/tutorial2/Podfile
View file
Open in desktop

This file was deleted.

Loading