From 31169bcdebdba3b7ca711f5af4f316af4fff6a21 Mon Sep 17 00:00:00 2001 From: Guillermo Gonzalez Date: Tue, 10 Sep 2019 18:13:44 +0200 Subject: [PATCH] Update project settings (#13) * Update project settings * Update podspec --- Markup.podspec | 2 +- Markup.xcodeproj/project.pbxproj | 35 ++++++++++++++----- .../xcschemes/Markup-iOS.xcscheme | 2 +- .../xcschemes/Markup-macOS.xcscheme | 2 +- .../xcschemes/Markup-tvOS.xcscheme | 2 +- .../xcschemes/Markup-watchOS.xcscheme | 2 +- MarkupExample.xcodeproj/project.pbxproj | 9 ++--- Sources/MarkupTokenizer.swift | 22 ++++++------ 8 files changed, 47 insertions(+), 29 deletions(-) diff --git a/Markup.podspec b/Markup.podspec index de815e4..58c373f 100644 --- a/Markup.podspec +++ b/Markup.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Markup" - s.version = "2.1" + s.version = "2.2" s.summary = "Lightweight markup text formatting in Swift" s.description = <<-DESC Markup generates attributed strings using a familiar markup syntax: diff --git a/Markup.xcodeproj/project.pbxproj b/Markup.xcodeproj/project.pbxproj index c6790aa..acf87c9 100644 --- a/Markup.xcodeproj/project.pbxproj +++ b/Markup.xcodeproj/project.pbxproj @@ -379,45 +379,46 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0720; - LastUpgradeCheck = 1010; + LastUpgradeCheck = 1030; ORGANIZATIONNAME = Markup; TargetAttributes = { 52D6D97B1BEFF229002C0205 = { CreatedOnToolsVersion = 7.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 1030; }; 52D6D9851BEFF229002C0205 = { CreatedOnToolsVersion = 7.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 1030; }; 52D6D9E11BEFFF6E002C0205 = { CreatedOnToolsVersion = 7.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 1030; }; 52D6D9EF1BEFFFBE002C0205 = { CreatedOnToolsVersion = 7.1; - LastSwiftMigration = 0900; + LastSwiftMigration = 1030; }; 52D6DA0E1BF000BD002C0205 = { CreatedOnToolsVersion = 7.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 1030; }; DD7502791C68FCFC006590AF = { CreatedOnToolsVersion = 7.2.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 1030; }; DD75028C1C690C7A006590AF = { CreatedOnToolsVersion = 7.2.1; - LastSwiftMigration = 0900; + LastSwiftMigration = 1030; }; }; }; buildConfigurationList = 52D6D9761BEFF229002C0205 /* Build configuration list for PBXProject "Markup" */; compatibilityVersion = "Xcode 6.3"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 52D6D9721BEFF229002C0205; productRefGroup = 52D6D97D1BEFF229002C0205 /* Products */; @@ -789,6 +790,7 @@ PRODUCT_NAME = Markup; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -810,6 +812,7 @@ PRODUCT_NAME = Markup; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -822,6 +825,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.Markup.Markup-iOS-Tests"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -834,6 +838,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.Markup.Markup-iOS-Tests"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -853,6 +858,7 @@ PRODUCT_NAME = Markup; SDKROOT = watchos; SKIP_INSTALL = YES; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; WATCHOS_DEPLOYMENT_TARGET = 2.0; }; @@ -875,6 +881,7 @@ SDKROOT = watchos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; WATCHOS_DEPLOYMENT_TARGET = 2.0; }; @@ -896,6 +903,7 @@ PRODUCT_NAME = Markup; SDKROOT = appletvos; SKIP_INSTALL = YES; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; }; @@ -918,6 +926,7 @@ SDKROOT = appletvos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; }; @@ -942,6 +951,7 @@ PRODUCT_NAME = Markup; SDKROOT = macosx; SKIP_INSTALL = YES; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -965,6 +975,7 @@ SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -979,6 +990,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.Markup.Markup-macOS-Tests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -994,6 +1006,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -1005,6 +1018,8 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.Markup.Markup-tvOS-Tests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.1; }; name = Debug; @@ -1018,6 +1033,8 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.1; }; name = Release; diff --git a/Markup.xcodeproj/xcshareddata/xcschemes/Markup-iOS.xcscheme b/Markup.xcodeproj/xcshareddata/xcschemes/Markup-iOS.xcscheme index 031c437..a462cb3 100644 --- a/Markup.xcodeproj/xcshareddata/xcschemes/Markup-iOS.xcscheme +++ b/Markup.xcodeproj/xcshareddata/xcschemes/Markup-iOS.xcscheme @@ -1,6 +1,6 @@