From 39beca2952c3be875e925507944d98831fe7bacb Mon Sep 17 00:00:00 2001 From: Myron Amanatidis Date: Tue, 24 Sep 2019 17:25:19 +0100 Subject: [PATCH] Migrate to swift5/Xcode 10.2.x or greater --- Cartfile.private | 2 +- Cartfile.resolved | 2 +- Carthage/Checkouts/Nimble | 2 +- README.md | 9 +++++ Typesetter.xcodeproj/project.pbxproj | 31 ++++++++++++---- .../xcschemes/Typesetter.xcscheme | 24 ++++++------- Typesetter/TypesetterTextStyle.swift | 36 +++++++++---------- .../TypesetterTextStyleTests.swift | 24 ++++++------- 8 files changed, 77 insertions(+), 53 deletions(-) diff --git a/Cartfile.private b/Cartfile.private index 1f82de8..e373088 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1 +1 @@ -github "Quick/Nimble" ~> 6.0 +github "Quick/Nimble" ~> 8.0.4 diff --git a/Cartfile.resolved b/Cartfile.resolved index 75181c5..a0c1c56 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "Quick/Nimble" "v6.0.1" +github "Quick/Nimble" "v8.0.4" diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble index 8e2703f..6abeb3f 160000 --- a/Carthage/Checkouts/Nimble +++ b/Carthage/Checkouts/Nimble @@ -1 +1 @@ -Subproject commit 8e2703fabde578a6d28537c73844f84d48e71200 +Subproject commit 6abeb3f5c03beba2b9e4dbe20886e773b5b629b6 diff --git a/README.md b/README.md index 7f6eb69..727bef2 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,10 @@ This library puts you back in control by reading the sizes from a CSV file which #### Via [Carthage](https://github.com/Carthage/Carthage): Add the following your Cartfile: +For Swift 5: +```Swift +github "ios-studio/Typesetter" ~> 1.1.0 +``` For Swift 3: ```Swift github "ios-studio/Typesetter" ~> 1.0.0 @@ -22,6 +26,11 @@ github "ios-studio/Typesetter" ~> 0.1.3 #### Via [CocoaPods](https://cocoapods.org/): Add the following your Podfile: +For Swift 5: +```ruby +pod "Typesetter", "~> 1.1.0" +``` + For Swift 3: ```ruby pod "Typesetter", "~> 1.0.0" diff --git a/Typesetter.xcodeproj/project.pbxproj b/Typesetter.xcodeproj/project.pbxproj index 987489f..0076740 100644 --- a/Typesetter.xcodeproj/project.pbxproj +++ b/Typesetter.xcodeproj/project.pbxproj @@ -219,7 +219,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0720; - LastUpgradeCheck = 0820; + LastUpgradeCheck = 1100; ORGANIZATIONNAME = "Beat Richartz"; TargetAttributes = { 536F38111C5D11E800948324 = { @@ -236,10 +236,11 @@ }; buildConfigurationList = 536F380C1C5D11E800948324 /* Build configuration list for PBXProject "Typesetter" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 536F38081C5D11E800948324; productRefGroup = 536F38131C5D11E800948324 /* Products */; @@ -318,18 +319,27 @@ 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; 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_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; @@ -369,18 +379,27 @@ 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; 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_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; @@ -431,7 +450,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -456,7 +475,7 @@ PRODUCT_BUNDLE_IDENTIFIER = studio.Typesetter; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -473,7 +492,7 @@ PRODUCT_BUNDLE_IDENTIFIER = studio.TypesetterTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -489,7 +508,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = studio.TypesetterTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/Typesetter.xcodeproj/xcshareddata/xcschemes/Typesetter.xcscheme b/Typesetter.xcodeproj/xcshareddata/xcschemes/Typesetter.xcscheme index 6afbe56..0050145 100644 --- a/Typesetter.xcodeproj/xcshareddata/xcschemes/Typesetter.xcscheme +++ b/Typesetter.xcodeproj/xcshareddata/xcschemes/Typesetter.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -40,17 +49,6 @@ - - - - - - - -