From 5a79be436119786668243fbb97c93d7cfc551ac5 Mon Sep 17 00:00:00 2001 From: phimage Date: Fri, 7 Jun 2019 11:07:32 +0200 Subject: [PATCH] Update to swift 5 --- .swift-version | 2 +- .travis.yml | 6 +-- Cartfile | 4 +- Cartfile.resolved | 7 ++- Erik.podspec | 2 +- Erik.xcodeproj/project.pbxproj | 47 +++++++------------ .../xcshareddata/xcschemes/Erik.xcscheme | 2 +- .../xcshareddata/xcschemes/ErikOSX.xcscheme | 2 +- ErikTests/ErikTests.swift | 1 - Sources/Document.swift | 6 +-- Sources/Erik.swift | 5 -- Sources/Future/Future.swift | 1 - 12 files changed, 32 insertions(+), 53 deletions(-) diff --git a/.swift-version b/.swift-version index bf77d54..819e07a 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.2 +5.0 diff --git a/.travis.yml b/.travis.yml index 7960caf..20930d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,18 @@ language: objective-c -osx_image: xcode10 +osx_image: xcode10.2 global: - LC_CTYPE=en_US.UTF-8 - LANG=en_US.UTF-8 - WORKSPACE=Erik.xcworkspace - IOS_FRAMEWORK_SCHEME="Erik" - MACOS_FRAMEWORK_SCHEME="ErikOSX" - - IOS_SDK=iphonesimulator12.0 + - IOS_SDK=iphonesimulator12.2 - MACOS_SDK=macosx10.14 env: - DESTINATION="OS=12.0,name=iPhone 8" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" - DESTINATION="arch=x86_64" SCHEME="$MACOS_FRAMEWORK_SCHEME" SDK="$MACOS_SDK" before_install: - - gem install xcpretty --no-rdoc --no-ri --no-document --quiet + - gem install xcpretty --no-document --quiet - brew update - brew outdated carthage || brew upgrade carthage script: diff --git a/Cartfile b/Cartfile index 1caf5b1..85061ab 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -github "tid-kijyun/Kanna" ~> 4.0.2 -github "Thomvis/BrightFutures" ~> 7.0.0 +github "tid-kijyun/Kanna" ~> 5.0.0 +github "Thomvis/BrightFutures" ~> 8.0.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 871e46f..eaf9e73 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,3 @@ -github "Thomvis/BrightFutures" "7.0.0" -github "antitypical/Result" "4.0.0" -github "nvzqz/FileKit" "cb1a5285ca780d66264a3e70862f9845ff1cfb18" -github "tid-kijyun/Kanna" "4.0.2" +github "Thomvis/BrightFutures" "8.0.1" +github "nvzqz/FileKit" "48b5ddb287f131a5c628badc819b880453f94449" +github "tid-kijyun/Kanna" "5.0.0" diff --git a/Erik.podspec b/Erik.podspec index 8d5852e..e2f71db 100644 --- a/Erik.podspec +++ b/Erik.podspec @@ -2,7 +2,7 @@ Pod::Spec.new do |s| # ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # s.name = "Erik" - s.version = "4.2.0" + s.version = "5.0.0" s.summary = "A headless browser written in Swift" s.description = <<-DESC Erik is an headless browser based on WebKit and HTML parser Kanna. diff --git a/Erik.xcodeproj/project.pbxproj b/Erik.xcodeproj/project.pbxproj index 55c1141..a98d099 100644 --- a/Erik.xcodeproj/project.pbxproj +++ b/Erik.xcodeproj/project.pbxproj @@ -19,24 +19,18 @@ C46F2E171DACF200006A036D /* FileKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C46F2E111DACF200006A036D /* FileKit.framework */; }; C46F2E181DACF200006A036D /* Kanna.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C46F2E121DACF200006A036D /* Kanna.framework */; }; C46F2E191DACF200006A036D /* Kanna.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C46F2E121DACF200006A036D /* Kanna.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - C46F2E1A1DACF200006A036D /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C46F2E131DACF200006A036D /* Result.framework */; }; - C46F2E1B1DACF200006A036D /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C46F2E131DACF200006A036D /* Result.framework */; }; C46F2E201DACF210006A036D /* BrightFutures.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C46F2E1C1DACF210006A036D /* BrightFutures.framework */; }; C46F2E211DACF210006A036D /* BrightFutures.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C46F2E1C1DACF210006A036D /* BrightFutures.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; C46F2E231DACF210006A036D /* FileKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C46F2E1D1DACF210006A036D /* FileKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; C46F2E241DACF210006A036D /* Kanna.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C46F2E1E1DACF210006A036D /* Kanna.framework */; }; C46F2E251DACF210006A036D /* Kanna.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C46F2E1E1DACF210006A036D /* Kanna.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; - C46F2E261DACF210006A036D /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C46F2E1F1DACF210006A036D /* Result.framework */; }; - C46F2E271DACF210006A036D /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C46F2E1F1DACF210006A036D /* Result.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; C48B18ED1E525BAB000ED799 /* Erik.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C431787F1BFA3E1A00C04250 /* Erik.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; C48B18F81E5266B4000ED799 /* BrightFutures.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C46F2E1C1DACF210006A036D /* BrightFutures.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; C48B18F91E5266B4000ED799 /* FileKit.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C46F2E1D1DACF210006A036D /* FileKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; C48B18FA1E5266B4000ED799 /* Kanna.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C46F2E1E1DACF210006A036D /* Kanna.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - C48B18FB1E5266B4000ED799 /* Result.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C46F2E1F1DACF210006A036D /* Result.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; C48B18FD1E5266D1000ED799 /* BrightFutures.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C46F2E101DACF200006A036D /* BrightFutures.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; C48B18FE1E5266D1000ED799 /* FileKit.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C46F2E111DACF200006A036D /* FileKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; C48B18FF1E5266D1000ED799 /* Kanna.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C46F2E121DACF200006A036D /* Kanna.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - C48B19001E5266D1000ED799 /* Result.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = C46F2E131DACF200006A036D /* Result.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; C4AAB7241E52C3E100348D04 /* KannaTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4AAB7231E52C3E100348D04 /* KannaTests.swift */; }; C4AAB7261E52C40000348D04 /* google.html in Resources */ = {isa = PBXBuildFile; fileRef = C4AAB7251E52C40000348D04 /* google.html */; }; C4AAB7271E52C40000348D04 /* google.html in Resources */ = {isa = PBXBuildFile; fileRef = C4AAB7251E52C40000348D04 /* google.html */; }; @@ -76,7 +70,6 @@ C48B18F81E5266B4000ED799 /* BrightFutures.framework in CopyFiles */, C48B18F91E5266B4000ED799 /* FileKit.framework in CopyFiles */, C48B18FA1E5266B4000ED799 /* Kanna.framework in CopyFiles */, - C48B18FB1E5266B4000ED799 /* Result.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -89,7 +82,6 @@ C48B18FD1E5266D1000ED799 /* BrightFutures.framework in CopyFiles */, C48B18FE1E5266D1000ED799 /* FileKit.framework in CopyFiles */, C48B18FF1E5266D1000ED799 /* Kanna.framework in CopyFiles */, - C48B19001E5266D1000ED799 /* Result.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -108,11 +100,9 @@ C46F2E101DACF200006A036D /* BrightFutures.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BrightFutures.framework; path = Carthage/Build/iOS/BrightFutures.framework; sourceTree = ""; }; C46F2E111DACF200006A036D /* FileKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FileKit.framework; path = Carthage/Build/iOS/FileKit.framework; sourceTree = ""; }; C46F2E121DACF200006A036D /* Kanna.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Kanna.framework; path = Carthage/Build/iOS/Kanna.framework; sourceTree = ""; }; - C46F2E131DACF200006A036D /* Result.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Result.framework; path = Carthage/Build/iOS/Result.framework; sourceTree = ""; }; C46F2E1C1DACF210006A036D /* BrightFutures.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BrightFutures.framework; path = Carthage/Build/Mac/BrightFutures.framework; sourceTree = ""; }; C46F2E1D1DACF210006A036D /* FileKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FileKit.framework; path = Carthage/Build/Mac/FileKit.framework; sourceTree = ""; }; C46F2E1E1DACF210006A036D /* Kanna.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Kanna.framework; path = Carthage/Build/Mac/Kanna.framework; sourceTree = ""; }; - C46F2E1F1DACF210006A036D /* Result.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Result.framework; path = Carthage/Build/Mac/Result.framework; sourceTree = ""; }; C4AAB7231E52C3E100348D04 /* KannaTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KannaTests.swift; sourceTree = ""; }; C4AAB7251E52C40000348D04 /* google.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = google.html; sourceTree = SOURCE_ROOT; }; C4D50DDC1BFB51130053B624 /* Erik.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Erik.swift; sourceTree = ""; }; @@ -131,7 +121,6 @@ files = ( C46F2E141DACF200006A036D /* BrightFutures.framework in Frameworks */, C46F2E181DACF200006A036D /* Kanna.framework in Frameworks */, - C46F2E1A1DACF200006A036D /* Result.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -140,7 +129,6 @@ buildActionMask = 2147483647; files = ( C46F2E191DACF200006A036D /* Kanna.framework in Frameworks */, - C46F2E1B1DACF200006A036D /* Result.framework in Frameworks */, C46F2E151DACF200006A036D /* BrightFutures.framework in Frameworks */, C46F2E171DACF200006A036D /* FileKit.framework in Frameworks */, C42828E21BF9EDE1005EC7C3 /* Erik.framework in Frameworks */, @@ -153,7 +141,6 @@ files = ( C46F2E201DACF210006A036D /* BrightFutures.framework in Frameworks */, C46F2E241DACF210006A036D /* Kanna.framework in Frameworks */, - C46F2E261DACF210006A036D /* Result.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -163,7 +150,6 @@ files = ( C48B18ED1E525BAB000ED799 /* Erik.framework in Frameworks */, C46F2E251DACF210006A036D /* Kanna.framework in Frameworks */, - C46F2E271DACF210006A036D /* Result.framework in Frameworks */, C46F2E211DACF210006A036D /* BrightFutures.framework in Frameworks */, C46F2E231DACF210006A036D /* FileKit.framework in Frameworks */, ); @@ -251,7 +237,6 @@ C46F2E101DACF200006A036D /* BrightFutures.framework */, C46F2E111DACF200006A036D /* FileKit.framework */, C46F2E121DACF200006A036D /* Kanna.framework */, - C46F2E131DACF200006A036D /* Result.framework */, ); name = iOS; sourceTree = ""; @@ -262,7 +247,6 @@ C46F2E1C1DACF210006A036D /* BrightFutures.framework */, C46F2E1D1DACF210006A036D /* FileKit.framework */, C46F2E1E1DACF210006A036D /* Kanna.framework */, - C46F2E1F1DACF210006A036D /* Result.framework */, ); name = Mac; sourceTree = ""; @@ -395,18 +379,18 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0710; - LastUpgradeCheck = 1000; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = phimage; TargetAttributes = { C42828D61BF9EDE1005EC7C3 = { CreatedOnToolsVersion = 7.1; DevelopmentTeam = GGU39CDBL2; - LastSwiftMigration = 1000; + LastSwiftMigration = 1020; }; C42828E01BF9EDE1005EC7C3 = { CreatedOnToolsVersion = 7.1; DevelopmentTeam = GGU39CDBL2; - LastSwiftMigration = 1000; + LastSwiftMigration = 1020; }; C431787E1BFA3E1A00C04250 = { CreatedOnToolsVersion = 7.1; @@ -418,10 +402,11 @@ }; buildConfigurationList = C42828D11BF9EDE1005EC7C3 /* Build configuration list for PBXProject "Erik" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = C42828CD1BF9EDE1005EC7C3; productRefGroup = C42828D81BF9EDE1005EC7C3 /* Products */; @@ -530,6 +515,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -580,7 +566,7 @@ SDKROOT = macosx; SWIFT_INCLUDE_PATHS = "$(SRCROOT)/Carthage/Checkouts/Kanna/Modules"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -591,6 +577,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -634,7 +621,7 @@ SDKROOT = macosx; SWIFT_INCLUDE_PATHS = "$(SRCROOT)/Carthage/Checkouts/Kanna/Modules"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -666,7 +653,7 @@ SKIP_INSTALL = YES; SWIFT_INCLUDE_PATHS = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -692,7 +679,7 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_INCLUDE_PATHS = ""; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -712,7 +699,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SWIFT_INCLUDE_PATHS = "$(SRCROOT)/Carthage/Checkouts/Kanna/Modules"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -732,7 +719,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SWIFT_INCLUDE_PATHS = "$(SRCROOT)/Carthage/Checkouts/Kanna/Modules"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -759,7 +746,7 @@ PRODUCT_NAME = Erik; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -785,7 +772,7 @@ PRODUCT_NAME = Erik; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -807,7 +794,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SWIFT_INCLUDE_PATHS = "$(SRCROOT)/Carthage/Checkouts/Kanna/Modules"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -829,7 +816,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SWIFT_INCLUDE_PATHS = "$(SRCROOT)/Carthage/Checkouts/Kanna/Modules"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/Erik.xcodeproj/xcshareddata/xcschemes/Erik.xcscheme b/Erik.xcodeproj/xcshareddata/xcschemes/Erik.xcscheme index 1ffd2ed..d8cb0ea 100644 --- a/Erik.xcodeproj/xcshareddata/xcschemes/Erik.xcscheme +++ b/Erik.xcodeproj/xcshareddata/xcschemes/Erik.xcscheme @@ -1,6 +1,6 @@