From 68db9b4be0c1007374d0dd19e9f242bb3677d20a Mon Sep 17 00:00:00 2001 From: lvnkmn <2656075+lvnkmn@users.noreply.github.com> Date: Tue, 6 Nov 2018 14:29:25 +0100 Subject: [PATCH] #58 - Update project to Swift 4.2 --- Example/Pods/Pods.xcodeproj/project.pbxproj | 32 +++++++++------- Example/Zoomy.xcodeproj/project.pbxproj | 37 +++++++++---------- .../xcschemes/Zoomy-Example.xcscheme | 2 +- Example/Zoomy/AppDelegate.swift | 2 +- Example/Zoomy/NavigationController.swift | 4 +- ...ognizerState+CustomStringConvertible.swift | 2 +- Zoomy/Classes/Structs/Animator.swift | 4 +- Zoomy/Classes/Structs/SpringAnimator.swift | 4 +- 8 files changed, 45 insertions(+), 42 deletions(-) diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index 19822b5..1baee2c 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -156,7 +156,7 @@ 0ABA4D9AE8F62C52467DEA1530616B11 /* CGPoint+valueInDirection.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "CGPoint+valueInDirection.swift"; sourceTree = ""; }; 0AF8C4D93FFFAD5DF06A4925244AB462 /* TypeAliasses.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = TypeAliasses.swift; sourceTree = ""; }; 17063887E6BDF08E74DC59DCD538F7AE /* BounceOffsets.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = BounceOffsets.swift; sourceTree = ""; }; - 1738CAACBADC15B6980EFBED9CFAACA6 /* Pods_Zoomy_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_Zoomy_Example.framework; path = "Pods-Zoomy_Example.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 1738CAACBADC15B6980EFBED9CFAACA6 /* Pods_Zoomy_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Zoomy_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 175E0EB0ADE3CAF4052D0612045CF113 /* ImageZoomController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ImageZoomController.swift; sourceTree = ""; }; 19A58E463D698EEC72DC72DDE0218C37 /* NSArray+PureLayout.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSArray+PureLayout.m"; path = "PureLayout/PureLayout/NSArray+PureLayout.m"; sourceTree = ""; }; 1A8B82793CC5BFA9FC8D688B9EB5370D /* CanLogMessageInFileInFunctionAtLine.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CanLogMessageInFileInFunctionAtLine.swift; path = InjectableLoggers/Classes/Protocols/CanLogMessageInFileInFunctionAtLine.swift; sourceTree = ""; }; @@ -176,7 +176,7 @@ 3622C3B73DB97802552F50C1F5794781 /* PureLayout+Internal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "PureLayout+Internal.h"; path = "PureLayout/PureLayout/PureLayout+Internal.h"; sourceTree = ""; }; 3892BC313046745E2D7EDA44198174BA /* DeprecatedTypeAliasses.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = DeprecatedTypeAliasses.swift; sourceTree = ""; }; 3B33CC9ECF5C7EA8540C47E5A5ABD673 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 3B93EA65CEDBD234F5B837B48845ACDF /* Zoomy.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; path = Zoomy.podspec; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 3B93EA65CEDBD234F5B837B48845ACDF /* Zoomy.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; path = Zoomy.podspec; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 3D45FE262DAAE5A43A2E6FE1FF01D4C0 /* CGRect+transformedByTransform.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "CGRect+transformedByTransform.swift"; sourceTree = ""; }; 3FEB4126E9EB249106CC6641AA2DF92B /* Pods-Zoomy_Tests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Zoomy_Tests-resources.sh"; sourceTree = ""; }; 41B1C720130A0CD63C9DE644DAAA12EF /* Pods-Zoomy_Example-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-Zoomy_Example-dummy.m"; sourceTree = ""; }; @@ -192,26 +192,26 @@ 4CF8AE60A3EE3B6E58BEFCFE1279DA67 /* CGAffineTransform+transformWithScaleTranslationCenter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "CGAffineTransform+transformWithScaleTranslationCenter.swift"; sourceTree = ""; }; 53300606E44E224588AF3B3A1EACB9A5 /* Pods-Zoomy_Example-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Zoomy_Example-frameworks.sh"; sourceTree = ""; }; 5559FE0C0294E85D6D92CD664DDA0465 /* ImageZoomControllerContentState.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ImageZoomControllerContentState.swift; sourceTree = ""; }; - 559B861CA1079E170556DDA3C3EEDFB2 /* Zoomy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Zoomy.framework; path = Zoomy.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 578314BDB95C7D6C961925E8ED09AD53 /* Pods_Zoomy_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_Zoomy_Tests.framework; path = "Pods-Zoomy_Tests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 559B861CA1079E170556DDA3C3EEDFB2 /* Zoomy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Zoomy.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 578314BDB95C7D6C961925E8ED09AD53 /* Pods_Zoomy_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Zoomy_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 580407ECB84DC43871339EF1701B8580 /* ImageZoomController+Deprecated.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "ImageZoomController+Deprecated.swift"; sourceTree = ""; }; - 5A240452653E067E1C2F456E6916D8DB /* PureLayout.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = PureLayout.framework; path = PureLayout.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 5A240452653E067E1C2F456E6916D8DB /* PureLayout.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PureLayout.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 5A434F446B6A514B243B1E5A606A8CBA /* logger.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = logger.swift; sourceTree = ""; }; 5BCEF32B4895106E81666CDD91CEECBA /* CanManageZoomBehaviors.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = CanManageZoomBehaviors.swift; sourceTree = ""; }; 626FF3CBF9DDCEA0D60DBA85E90E9453 /* Pods-Zoomy_Example-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-Zoomy_Example-acknowledgements.markdown"; sourceTree = ""; }; - 6370BCA44AB8657DC009CDA94F34C9BD /* InjectableLoggers.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = InjectableLoggers.framework; path = InjectableLoggers.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 6370BCA44AB8657DC009CDA94F34C9BD /* InjectableLoggers.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = InjectableLoggers.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 689390AE80477B793E8D23C109283553 /* ALView+PureLayout.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "ALView+PureLayout.h"; path = "PureLayout/PureLayout/ALView+PureLayout.h"; sourceTree = ""; }; 69373160F20F6C127B698CFAEEAD2A24 /* ImageZoomControllerIsHandlingScrollViewBounceTriggeredDismissalState.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ImageZoomControllerIsHandlingScrollViewBounceTriggeredDismissalState.swift; sourceTree = ""; }; 6ACB65568A598A321B03740B17752A43 /* PureLayout-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "PureLayout-prefix.pch"; sourceTree = ""; }; 6E7A1334EE1570B40D60BAECAFD90C2D /* InjectableLoggers.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = InjectableLoggers.modulemap; sourceTree = ""; }; 7165AC8A8D500CA77DB27446576CCFD2 /* Pods-Zoomy_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Zoomy_Example.debug.xcconfig"; sourceTree = ""; }; - 72F78968BBE80C3BBFEC788E0CE79CB0 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; path = README.md; sourceTree = ""; }; + 72F78968BBE80C3BBFEC788E0CE79CB0 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; 756702CBD84465CFF4F808A63A5E76E2 /* PureLayout.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = PureLayout.xcconfig; sourceTree = ""; }; 772F09C61E6AD93BFE8ECEF610119466 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 774D60FB45D4F95874A3622DC6247FE9 /* CanFormatMessageInFileInFunctionAtLineWithSettings.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CanFormatMessageInFileInFunctionAtLineWithSettings.swift; path = InjectableLoggers/Classes/Protocols/CanFormatMessageInFileInFunctionAtLineWithSettings.swift; sourceTree = ""; }; 7AC2543C6C2CA12F8CA7C97BB14DFB84 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 7C12F925753BEF95B4656CC0B6750F7F /* ImageZoomController.Factory.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ImageZoomController.Factory.swift; sourceTree = ""; }; - 7E13CB1E95A269DD79FC1A1B58D4984F /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; path = LICENSE; sourceTree = ""; }; + 7E13CB1E95A269DD79FC1A1B58D4984F /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = LICENSE; sourceTree = ""; }; 7E881823749AE8CDC509E22B922B248F /* Pods-Zoomy_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Zoomy_Tests.release.xcconfig"; sourceTree = ""; }; 80251AABC551EDE9D5BDD3E2BEF2FDB8 /* CanProvideAnimatorForEvent.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = CanProvideAnimatorForEvent.swift; sourceTree = ""; }; 8654511299AE68AAEA30D48A263C7EED /* CanAnimate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = CanAnimate.swift; sourceTree = ""; }; @@ -224,7 +224,7 @@ 9222C98B45153ADDAD9C7028366170BA /* InjectableLoggers-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "InjectableLoggers-prefix.pch"; sourceTree = ""; }; 9274388689D5D6797D6A06C8BE450EB7 /* Side.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Side.swift; sourceTree = ""; }; 92EF429CF585E052231F6255A999674F /* CGPoint+maximumAbsoluteValue.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "CGPoint+maximumAbsoluteValue.swift"; sourceTree = ""; }; - 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 94054DB45B4CF25091C343303C93D116 /* CanBetriggered.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = CanBetriggered.swift; sourceTree = ""; }; 97E78CAD85973679C6B43030B85FD099 /* UIImage+Color.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "UIImage+Color.swift"; sourceTree = ""; }; 97FFA06F3AFDE6A0CC4D6D6E2A1F0553 /* CanPerformAction.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = CanPerformAction.swift; sourceTree = ""; }; @@ -338,7 +338,6 @@ C33DBD8103AF6F907B91BBBF45336FEF /* PureLayoutDefines.h */, 306EA2A14670EF1E0E946B9B963A9337 /* Support Files */, ); - name = PureLayout; path = PureLayout; sourceTree = ""; }; @@ -414,7 +413,6 @@ E0B33D1D251775F8F77AAEF4B2C5A13B /* SimpleLogger.Settings.swift */, 5FE87E3E646D17B885DDA0D24260B8C4 /* Support Files */, ); - name = InjectableLoggers; path = InjectableLoggers; sourceTree = ""; }; @@ -788,7 +786,12 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0930; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1010; + TargetAttributes = { + C46597CAD274AEF5E219FAD22A27FB95 = { + LastSwiftMigration = 1010; + }; + }; }; buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; @@ -1016,6 +1019,7 @@ MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = "$(TARGET_NAME)"; STRIP_INSTALLED_PRODUCT = NO; + SWIFT_COMPILATION_MODE = wholemodule; SYMROOT = "${SRCROOT}/../build"; }; name = Release; @@ -1045,7 +1049,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1108,7 +1112,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; diff --git a/Example/Zoomy.xcodeproj/project.pbxproj b/Example/Zoomy.xcodeproj/project.pbxproj index f5613e9..915b486 100644 --- a/Example/Zoomy.xcodeproj/project.pbxproj +++ b/Example/Zoomy.xcodeproj/project.pbxproj @@ -366,16 +366,19 @@ TargetAttributes = { 607FACCF1AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; - LastSwiftMigration = 0900; + DevelopmentTeam = P6ZSWCNHR5; + LastSwiftMigration = 1010; }; 607FACE41AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; - LastSwiftMigration = 0900; + DevelopmentTeam = P6ZSWCNHR5; + LastSwiftMigration = 1010; TestTargetID = 607FACCF1AFB9204008FA782; }; DE9C330C20AB751A00827664 = { CreatedOnToolsVersion = 9.3; - DevelopmentTeam = 9W484F6894; + DevelopmentTeam = P6ZSWCNHR5; + LastSwiftMigration = 1010; ProvisioningStyle = Automatic; TestTargetID = 607FACCF1AFB9204008FA782; }; @@ -698,15 +701,14 @@ baseConfigurationReference = DD115103ECCA1B48331A8AA4 /* Pods-Zoomy_Example.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = P6ZSWCNHR5; INFOPLIST_FILE = Zoomy/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -715,15 +717,14 @@ baseConfigurationReference = 03AB2A65BF0838941B06335E /* Pods-Zoomy_Example.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = P6ZSWCNHR5; INFOPLIST_FILE = Zoomy/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -731,7 +732,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = C26A9668B695057665AAB154 /* Pods-Zoomy_Tests.debug.xcconfig */; buildSettings = { - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = P6ZSWCNHR5; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", @@ -744,8 +745,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Zoomy_Example.app/Zoomy_Example"; }; name = Debug; @@ -754,7 +754,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 6EBE13B570B856F523C61486 /* Pods-Zoomy_Tests.release.xcconfig */; buildSettings = { - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = P6ZSWCNHR5; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", @@ -763,8 +763,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Zoomy_Example.app/Zoomy_Example"; }; name = Release; @@ -781,7 +780,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = 9W484F6894; + DEVELOPMENT_TEAM = P6ZSWCNHR5; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = Zoomy_ExampleUITests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.3; @@ -789,7 +788,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "MennoLovink.Zoomy-ExampleUITests"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = Zoomy_Example; }; @@ -806,14 +805,14 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 9W484F6894; + DEVELOPMENT_TEAM = P6ZSWCNHR5; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = Zoomy_ExampleUITests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "MennoLovink.Zoomy-ExampleUITests"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = Zoomy_Example; }; diff --git a/Example/Zoomy.xcodeproj/xcshareddata/xcschemes/Zoomy-Example.xcscheme b/Example/Zoomy.xcodeproj/xcshareddata/xcschemes/Zoomy-Example.xcscheme index be89ddc..7b1e38c 100644 --- a/Example/Zoomy.xcodeproj/xcshareddata/xcschemes/Zoomy-Example.xcscheme +++ b/Example/Zoomy.xcodeproj/xcshareddata/xcschemes/Zoomy-Example.xcscheme @@ -1,6 +1,6 @@ Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { // Override point for customization after application launch. return true } diff --git a/Example/Zoomy/NavigationController.swift b/Example/Zoomy/NavigationController.swift index f44bdc4..a7326fb 100644 --- a/Example/Zoomy/NavigationController.swift +++ b/Example/Zoomy/NavigationController.swift @@ -15,7 +15,7 @@ class NavigationController: UINavigationController { let alertController = UIAlertController(title: "Shake to toggle navigationbar", message: "You can shake your device to toggle the navigationbar in order to see the examples with and without it.", - preferredStyle: UIAlertControllerStyle.actionSheet) + preferredStyle: UIAlertController.Style.actionSheet) alertController.addAction(UIAlertAction(title: "Ok", style: .default, handler: nil)) present(alertController, animated: true, completion: nil) becomeFirstResponder() @@ -27,7 +27,7 @@ class NavigationController: UINavigationController { } } - override func motionEnded(_ motion: UIEventSubtype, with event: UIEvent?) { + override func motionEnded(_ motion: UIEvent.EventSubtype, with event: UIEvent?) { guard motion == .motionShake else { return } toggleNavigationBar() diff --git a/Zoomy/Classes/Extensions/UIGestureRecognizerState+CustomStringConvertible.swift b/Zoomy/Classes/Extensions/UIGestureRecognizerState+CustomStringConvertible.swift index effb778..7948f33 100644 --- a/Zoomy/Classes/Extensions/UIGestureRecognizerState+CustomStringConvertible.swift +++ b/Zoomy/Classes/Extensions/UIGestureRecognizerState+CustomStringConvertible.swift @@ -1,4 +1,4 @@ -extension UIGestureRecognizerState: CustomStringConvertible { +extension UIGestureRecognizer.State: CustomStringConvertible { public var description: String { switch self { case .began: diff --git a/Zoomy/Classes/Structs/Animator.swift b/Zoomy/Classes/Structs/Animator.swift index f18c2fe..4aaeab1 100644 --- a/Zoomy/Classes/Structs/Animator.swift +++ b/Zoomy/Classes/Structs/Animator.swift @@ -4,10 +4,10 @@ public struct Animator { // MARK: Public properties public let duration: TimeInterval public let delay: TimeInterval - public let options: UIViewAnimationOptions + public let options: UIView.AnimationOptions // MARK: Initializers - public init(duration: TimeInterval = 0.5, delay: TimeInterval = 0, options: UIViewAnimationOptions = .curveEaseInOut) { + public init(duration: TimeInterval = 0.5, delay: TimeInterval = 0, options: UIView.AnimationOptions = .curveEaseInOut) { self.duration = duration self.delay = delay self.options = options diff --git a/Zoomy/Classes/Structs/SpringAnimator.swift b/Zoomy/Classes/Structs/SpringAnimator.swift index 4008d66..92fcb23 100644 --- a/Zoomy/Classes/Structs/SpringAnimator.swift +++ b/Zoomy/Classes/Structs/SpringAnimator.swift @@ -6,14 +6,14 @@ public struct SpringAnimator { public let delay: TimeInterval public let springDamping: CGFloat public let initialSpringVelocity: CGFloat - public let options: UIViewAnimationOptions + public let options: UIView.AnimationOptions // MARK: Initializers public init(duration: TimeInterval = 0.5, delay: TimeInterval = 0, springDamping: CGFloat = 0.66, initialSpringVelocity: CGFloat = 0.5, - options: UIViewAnimationOptions = []) { + options: UIView.AnimationOptions = []) { self.duration = duration self.delay = delay self.springDamping = springDamping