From d6a5db8ffa8fac9b27bb7f4d659d256a115d190f Mon Sep 17 00:00:00 2001 From: Daisuke Iwata Date: Thu, 25 Apr 2019 13:30:26 +0900 Subject: [PATCH 1/4] update swift version --- .swift-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.swift-version b/.swift-version index 5186d07..819e07a 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.0 +5.0 From 0fe620a5c273e4a5779421f1f1067288e505cbbf Mon Sep 17 00:00:00 2001 From: Daisuke Iwata Date: Thu, 25 Apr 2019 13:30:43 +0900 Subject: [PATCH 2/4] update Cartfile.resolved --- Cartfile.resolved | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cartfile.resolved b/Cartfile.resolved index 4a33a6b..810925c 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ -github "Quick/Nimble" "v7.0.1" -github "Quick/Quick" "v1.1.0" +github "Quick/Nimble" "v8.0.1" +github "Quick/Quick" "v2.1.0" From 383b809d7471ea23142953e00357420240756b74 Mon Sep 17 00:00:00 2001 From: Daisuke Iwata Date: Thu, 25 Apr 2019 13:32:36 +0900 Subject: [PATCH 3/4] compatible Xcode 10.2 --- Fakery.xcodeproj/project.pbxproj | 36 +++++++++---------- .../xcschemes/Fakery-iOS.xcscheme | 2 +- .../xcschemes/Fakery-macOS.xcscheme | 2 +- .../xcschemes/Fakery-tvOS.xcscheme | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Fakery.xcodeproj/project.pbxproj b/Fakery.xcodeproj/project.pbxproj index ec9f41c..d049a07 100644 --- a/Fakery.xcodeproj/project.pbxproj +++ b/Fakery.xcodeproj/project.pbxproj @@ -629,35 +629,35 @@ BCF0DF311BF9F77E00427DB4 /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 0940; - LastUpgradeCheck = 0930; + LastSwiftUpdateCheck = 1020; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = "Vadym Markov"; TargetAttributes = { BC827FA71BFA3CE1005F09A4 = { CreatedOnToolsVersion = 7.1.1; - LastSwiftMigration = 0900; + LastSwiftMigration = 1020; }; BC827FB01BFA3CE1005F09A4 = { CreatedOnToolsVersion = 7.1.1; - LastSwiftMigration = 0900; + LastSwiftMigration = 1020; }; BCF0DF391BF9F77E00427DB4 = { CreatedOnToolsVersion = 7.1.1; - LastSwiftMigration = 0900; + LastSwiftMigration = 1020; }; BCF0DF431BF9F77E00427DB4 = { CreatedOnToolsVersion = 7.1.1; - LastSwiftMigration = 0900; + LastSwiftMigration = 1020; }; BDC291271D9441F2007DA2FC = { CreatedOnToolsVersion = 7.3.1; - LastSwiftMigration = 0900; + LastSwiftMigration = 1020; }; }; }; buildConfigurationList = BCF0DF341BF9F77E00427DB4 /* Build configuration list for PBXProject "Fakery" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, @@ -1033,7 +1033,7 @@ SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -1057,7 +1057,7 @@ SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -1074,7 +1074,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -1091,7 +1091,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -1223,7 +1223,7 @@ PRODUCT_NAME = Fakery; SKIP_INSTALL = YES; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -1243,7 +1243,7 @@ PRODUCT_NAME = Fakery; SKIP_INSTALL = YES; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -1256,7 +1256,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.vadym-markov.FakeryTests"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -1269,7 +1269,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.vadym-markov.FakeryTests"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -1291,7 +1291,7 @@ SDKROOT = appletvos; SKIP_INSTALL = YES; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; }; @@ -1315,7 +1315,7 @@ SDKROOT = appletvos; SKIP_INSTALL = YES; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; }; diff --git a/Fakery.xcodeproj/xcshareddata/xcschemes/Fakery-iOS.xcscheme b/Fakery.xcodeproj/xcshareddata/xcschemes/Fakery-iOS.xcscheme index ab00204..4f74039 100644 --- a/Fakery.xcodeproj/xcshareddata/xcschemes/Fakery-iOS.xcscheme +++ b/Fakery.xcodeproj/xcshareddata/xcschemes/Fakery-iOS.xcscheme @@ -1,6 +1,6 @@ Date: Thu, 25 Apr 2019 13:42:13 +0900 Subject: [PATCH 4/4] update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5a34274..ce91679 100755 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -osx_image: xcode9 +osx_image: xcode10.2 language: objective-c xcode_sdk: iphonesimulator10.0