diff --git a/Cartfile b/Cartfile index f8a4c2f..8297d9c 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "yuzushioh/CryptoEthereumSwift" ~> 1.0.0 +github "yuzushioh/CryptoEthereumSwift" diff --git a/Cartfile.resolved b/Cartfile.resolved index 276dec6..8b08fc5 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ -github "krzyzanowskim/CryptoSwift" "0.10.0" -github "yuzushioh/CryptoEthereumSwift" "1.0.1" +github "krzyzanowskim/CryptoSwift" "0.11.0" +github "yuzushioh/CryptoEthereumSwift" "2.0.0" diff --git a/EthereumKit.xcodeproj/project.pbxproj b/EthereumKit.xcodeproj/project.pbxproj index 614d6aa..d76910b 100644 --- a/EthereumKit.xcodeproj/project.pbxproj +++ b/EthereumKit.xcodeproj/project.pbxproj @@ -547,16 +547,18 @@ TargetAttributes = { AE90A0741FFA698D005ED7AF = { CreatedOnToolsVersion = 9.2; + LastSwiftMigration = 1000; ProvisioningStyle = Automatic; TestTargetID = AEBA90EF1FFA2C6A003EA2BA; }; AEBA90D41FFA21ED003EA2BA = { CreatedOnToolsVersion = 9.2; - LastSwiftMigration = 0920; + LastSwiftMigration = 1000; ProvisioningStyle = Manual; }; AEBA90EF1FFA2C6A003EA2BA = { CreatedOnToolsVersion = 9.2; + LastSwiftMigration = 1000; ProvisioningStyle = Manual; }; }; @@ -772,7 +774,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = yuzushioh.EthereumKitTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example"; }; @@ -793,7 +795,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = yuzushioh.EthereumKitTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example"; }; @@ -948,7 +950,7 @@ SWIFT_INCLUDE_PATHS = ""; SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; VALID_ARCHS = "arm64 armv7 armv7s"; }; @@ -979,7 +981,7 @@ SKIP_INSTALL = YES; SWIFT_INCLUDE_PATHS = ""; SWIFT_OBJC_BRIDGING_HEADER = ""; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; VALID_ARCHS = "arm64 armv7 armv7s"; }; @@ -1003,7 +1005,7 @@ PRODUCT_BUNDLE_IDENTIFIER = yuzushioh.Example; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -1026,7 +1028,7 @@ PRODUCT_BUNDLE_IDENTIFIER = yuzushioh.Example; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; diff --git a/Example/AppDelegate.swift b/Example/AppDelegate.swift index 296456d..f82a8c2 100644 --- a/Example/AppDelegate.swift +++ b/Example/AppDelegate.swift @@ -13,8 +13,7 @@ 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 { // Override point for customization after application launch. return true } @@ -41,6 +40,4 @@ class AppDelegate: UIResponder, UIApplicationDelegate { // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. } - } -