Skip to content

Commit

Permalink
Update examples to use Swift 4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Toine Heuvelmans committed Jan 28, 2019
1 parent 9850f4e commit c1681ea
Show file tree
Hide file tree
Showing 40 changed files with 790 additions and 600 deletions.
96 changes: 52 additions & 44 deletions Examples/BuiltInTransitionsCatalog/BuiltInTransitionsCatalog.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
85277C71050F4FC75BBA430F /* Pods_BuiltInTransitionsCatalog.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08B4DEF040CAAD71238C4EB5 /* Pods_BuiltInTransitionsCatalog.framework */; };
BA7592DE1E5CC79B00B021BF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA7592DD1E5CC79B00B021BF /* AppDelegate.swift */; };
BA7592E01E5CC79B00B021BF /* AwesomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA7592DF1E5CC79B00B021BF /* AwesomeViewController.swift */; };
BA7592E31E5CC79B00B021BF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BA7592E11E5CC79B00B021BF /* Main.storyboard */; };
Expand All @@ -15,12 +16,11 @@
BA7592F01E5CC89F00B021BF /* CatalogMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA7592EF1E5CC89F00B021BF /* CatalogMenu.swift */; };
BA7592F21E5CD10C00B021BF /* Catalog.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA7592F11E5CD10C00B021BF /* Catalog.swift */; };
BAE576771E5ED48400E8ABC3 /* TransitionStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAE576761E5ED48400E8ABC3 /* TransitionStyle.swift */; };
E869D1806ADD6F26D1037B77 /* Pods_BuiltInTransitionsCatalog.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AC8F032D74589B67CB68A56E /* Pods_BuiltInTransitionsCatalog.framework */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
AC8F032D74589B67CB68A56E /* Pods_BuiltInTransitionsCatalog.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_BuiltInTransitionsCatalog.framework; sourceTree = BUILT_PRODUCTS_DIR; };
B5A66A82E93113AEA7FA77BA /* Pods-BuiltInTransitionsCatalog.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BuiltInTransitionsCatalog.debug.xcconfig"; path = "Pods/Target Support Files/Pods-BuiltInTransitionsCatalog/Pods-BuiltInTransitionsCatalog.debug.xcconfig"; sourceTree = "<group>"; };
08B4DEF040CAAD71238C4EB5 /* Pods_BuiltInTransitionsCatalog.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_BuiltInTransitionsCatalog.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4DEF4EAD7EED2B7BDBA682E7 /* Pods-BuiltInTransitionsCatalog.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BuiltInTransitionsCatalog.release.xcconfig"; path = "Pods/Target Support Files/Pods-BuiltInTransitionsCatalog/Pods-BuiltInTransitionsCatalog.release.xcconfig"; sourceTree = "<group>"; };
BA7592DA1E5CC79B00B021BF /* BuiltInTransitionsCatalog.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BuiltInTransitionsCatalog.app; sourceTree = BUILT_PRODUCTS_DIR; };
BA7592DD1E5CC79B00B021BF /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
BA7592DF1E5CC79B00B021BF /* AwesomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AwesomeViewController.swift; sourceTree = "<group>"; };
Expand All @@ -31,34 +31,26 @@
BA7592EF1E5CC89F00B021BF /* CatalogMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CatalogMenu.swift; sourceTree = "<group>"; };
BA7592F11E5CD10C00B021BF /* Catalog.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Catalog.swift; sourceTree = "<group>"; };
BAE576761E5ED48400E8ABC3 /* TransitionStyle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransitionStyle.swift; sourceTree = "<group>"; };
C0B51F0F4063C9382929024E /* Pods-BuiltInTransitionsCatalog.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BuiltInTransitionsCatalog.release.xcconfig"; path = "Pods/Target Support Files/Pods-BuiltInTransitionsCatalog/Pods-BuiltInTransitionsCatalog.release.xcconfig"; sourceTree = "<group>"; };
D5C11E822D9E1D25F5AFFE7C /* Pods-BuiltInTransitionsCatalog.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BuiltInTransitionsCatalog.debug.xcconfig"; path = "Pods/Target Support Files/Pods-BuiltInTransitionsCatalog/Pods-BuiltInTransitionsCatalog.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
BA7592D71E5CC79B00B021BF /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
E869D1806ADD6F26D1037B77 /* Pods_BuiltInTransitionsCatalog.framework in Frameworks */,
85277C71050F4FC75BBA430F /* Pods_BuiltInTransitionsCatalog.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
3B9C56C65E2C1CDA4970DE67 /* Frameworks */ = {
18E86D9309BD4FAD631D0F18 /* Pods */ = {
isa = PBXGroup;
children = (
AC8F032D74589B67CB68A56E /* Pods_BuiltInTransitionsCatalog.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
9D8832D06883192DE70050BC /* Pods */ = {
isa = PBXGroup;
children = (
B5A66A82E93113AEA7FA77BA /* Pods-BuiltInTransitionsCatalog.debug.xcconfig */,
C0B51F0F4063C9382929024E /* Pods-BuiltInTransitionsCatalog.release.xcconfig */,
D5C11E822D9E1D25F5AFFE7C /* Pods-BuiltInTransitionsCatalog.debug.xcconfig */,
4DEF4EAD7EED2B7BDBA682E7 /* Pods-BuiltInTransitionsCatalog.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
Expand All @@ -68,8 +60,8 @@
children = (
BA7592DC1E5CC79B00B021BF /* BuiltInTransitionsCatalog */,
BA7592DB1E5CC79B00B021BF /* Products */,
9D8832D06883192DE70050BC /* Pods */,
3B9C56C65E2C1CDA4970DE67 /* Frameworks */,
18E86D9309BD4FAD631D0F18 /* Pods */,
E43A34B2DF12344A2117A3D0 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -105,19 +97,26 @@
name = Resources;
sourceTree = "<group>";
};
E43A34B2DF12344A2117A3D0 /* Frameworks */ = {
isa = PBXGroup;
children = (
08B4DEF040CAAD71238C4EB5 /* Pods_BuiltInTransitionsCatalog.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
BA7592D91E5CC79B00B021BF /* BuiltInTransitionsCatalog */ = {
isa = PBXNativeTarget;
buildConfigurationList = BA7592EC1E5CC79B00B021BF /* Build configuration list for PBXNativeTarget "BuiltInTransitionsCatalog" */;
buildPhases = (
E3310AD200D42A35D2FBA182 /* [CP] Check Pods Manifest.lock */,
F5EC54BB13AFE33EC4E55605 /* [CP] Check Pods Manifest.lock */,
BA7592D61E5CC79B00B021BF /* Sources */,
BA7592D71E5CC79B00B021BF /* Frameworks */,
BA7592D81E5CC79B00B021BF /* Resources */,
C12F6E9F3F5E5C8D1084AD91 /* [CP] Embed Pods Frameworks */,
24B5C947C1AA082EDE06BD7D /* [CP] Copy Pods Resources */,
7C7AB9BE18FC8A69D847A051 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand All @@ -135,7 +134,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0820;
LastUpgradeCheck = 0820;
LastUpgradeCheck = 1000;
ORGANIZATIONNAME = Touchwonders;
TargetAttributes = {
BA7592D91E5CC79B00B021BF = {
Expand Down Expand Up @@ -178,31 +177,20 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
24B5C947C1AA082EDE06BD7D /* [CP] Copy Pods Resources */ = {
7C7AB9BE18FC8A69D847A051 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-BuiltInTransitionsCatalog/Pods-BuiltInTransitionsCatalog-resources.sh\"\n";
showEnvVarsInLog = 0;
};
C12F6E9F3F5E5C8D1084AD91 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
inputFileListPaths = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-BuiltInTransitionsCatalog/Pods-BuiltInTransitionsCatalog-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Transition/Transition.framework",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
);
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Transition.framework",
);
Expand All @@ -211,16 +199,20 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-BuiltInTransitionsCatalog/Pods-BuiltInTransitionsCatalog-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
E3310AD200D42A35D2FBA182 /* [CP] Check Pods Manifest.lock */ = {
F5EC54BB13AFE33EC4E55605 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-BuiltInTransitionsCatalog-checkManifestLockResult.txt",
);
Expand Down Expand Up @@ -275,15 +267,23 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -323,15 +323,23 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand All @@ -357,29 +365,29 @@
};
BA7592ED1E5CC79B00B021BF /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = B5A66A82E93113AEA7FA77BA /* Pods-BuiltInTransitionsCatalog.debug.xcconfig */;
baseConfigurationReference = D5C11E822D9E1D25F5AFFE7C /* Pods-BuiltInTransitionsCatalog.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = BuiltInTransitionsCatalog/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.touchwonders.BuiltInTransitionsCatalog;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
BA7592EE1E5CC79B00B021BF /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = C0B51F0F4063C9382929024E /* Pods-BuiltInTransitionsCatalog.release.xcconfig */;
baseConfigurationReference = 4DEF4EAD7EED2B7BDBA682E7 /* Pods-BuiltInTransitionsCatalog.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = BuiltInTransitionsCatalog/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.touchwonders.BuiltInTransitionsCatalog;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion ...tInTransitionsCatalog.xcodeproj/xcshareddata/xcschemes/BuiltInTransitionsCatalog.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0820"
LastUpgradeVersion = "1000"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
8 changes: 8 additions & 0 deletions ...itionsCatalog/BuiltInTransitionsCatalog.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
4 changes: 2 additions & 2 deletions Examples/BuiltInTransitionsCatalog/BuiltInTransitionsCatalog/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {

var window: UIWindow?

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
if let navigationController = window?.rootViewController as? UINavigationController, let font = UIFont(name: transitionFontName, size: 20.0) {
navigationController.navigationBar.titleTextAttributes = [NSAttributedStringKey.font: font, NSAttributedStringKey.foregroundColor: UIColor.white]
navigationController.navigationBar.titleTextAttributes = [NSAttributedString.Key.font: font, NSAttributedString.Key.foregroundColor: UIColor.white]
}
return true
}
Expand Down
5 changes: 5 additions & 0 deletions ...sitionsCatalog/BuiltInTransitionsCatalog/Assets.xcassets/AppIcon.appiconset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,11 @@
"filename" : "[email protected]",
"scale" : "2x"
},
{
"idiom" : "ios-marketing",
"size" : "1024x1024",
"scale" : "1x"
},
{
"size" : "60x60",
"idiom" : "car",
Expand Down
2 changes: 1 addition & 1 deletion Examples/BuiltInTransitionsCatalog/BuiltInTransitionsCatalog/CatalogMenu.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ extension CatalogMenu : TransitionsSource {

extension CatalogMenu : InteractiveNavigationTransitionOperationDelegate {

func performOperation(operation: UINavigationControllerOperation, forInteractiveTransitionIn controller: UINavigationController, gestureRecognizer: UIGestureRecognizer) {
func performOperation(operation: UINavigationController.Operation, forInteractiveTransitionIn controller: UINavigationController, gestureRecognizer: UIGestureRecognizer) {
switch operation {
case .push:
if selectedIndex == nil {
Expand Down
8 changes: 4 additions & 4 deletions Examples/BuiltInTransitionsCatalog/Podfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
PODS:
- Transition (1.1.0)
- Transition (1.2.1)

DEPENDENCIES:
- Transition (from `../../`)

EXTERNAL SOURCES:
Transition:
:path: ../../
:path: "../../"

SPEC CHECKSUMS:
Transition: 1f9b5445a034df95edcb243f81952b3fda317d72
Transition: 5f88f6d8b18036973976430aaea0857d0c2ef894

PODFILE CHECKSUM: b59c970b89cb4702c2022cf9dcbc7f1aa68e099a

COCOAPODS: 1.3.1
COCOAPODS: 1.5.3
Loading

0 comments on commit c1681ea

Please sign in to comment.