From 4913cb2853ae742c16984ee1ae5f774830ef21fd Mon Sep 17 00:00:00 2001 From: lobodart Date: Wed, 25 Oct 2017 17:29:30 +0200 Subject: [PATCH 1/5] Fixing warnings for Swift 4 --- .travis.yml | 10 +++- CheatyXML.xcodeproj/project.pbxproj | 47 +++++++++++++++---- .../xcshareddata/xcschemes/CheatyXML.xcscheme | 4 +- CheatyXML/CXMLTag.swift | 2 +- CheatyXMLTests/Info.plist | 6 +-- scripts/push.sh | 5 ++ 6 files changed, 57 insertions(+), 17 deletions(-) create mode 100644 scripts/push.sh diff --git a/.travis.yml b/.travis.yml index aa19da3..45448d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,5 +3,11 @@ language: objective-c osx_image: xcode8 xcode_sdk: iphonesimulator9.0 -script: -- xcodebuild -project CheatyXML.xcodeproj -scheme "CheatyXML" -destination "platform=iOS Simulator,name=iPhone 6" test \ No newline at end of file +script: ./scripts/ci.sh + +deploy: + provider: script + script: ./scripts/push.sh + on: + branch: master + tags: true \ No newline at end of file diff --git a/CheatyXML.xcodeproj/project.pbxproj b/CheatyXML.xcodeproj/project.pbxproj index b3c7f18..8cc3405 100644 --- a/CheatyXML.xcodeproj/project.pbxproj +++ b/CheatyXML.xcodeproj/project.pbxproj @@ -45,7 +45,6 @@ 48B018DC1D3B643800E31BE4 /* CXMLAttribute.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CXMLAttribute.swift; sourceTree = ""; }; 48B018DE1D3B6E3500E31BE4 /* CXMLNullAttribute.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CXMLNullAttribute.swift; sourceTree = ""; }; 48CD10F51CCFEAD800A8CFAD /* Test.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Test.xml; sourceTree = ""; }; - 48F5B5041AB4ADAB00E68B10 /* Test.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = Test.playground; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -70,7 +69,6 @@ 486D48711AB4A19D004F6258 = { isa = PBXGroup; children = ( - 48F5B5041AB4ADAB00E68B10 /* Test.playground */, 486D487D1AB4A19D004F6258 /* CheatyXML */, 486D488A1AB4A19D004F6258 /* CheatyXMLTests */, 486D487C1AB4A19D004F6258 /* Products */, @@ -186,17 +184,17 @@ attributes = { LastSwiftMigration = 0700; LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 0620; + LastUpgradeCheck = 0900; ORGANIZATIONNAME = "Louis BODART"; TargetAttributes = { 486D487A1AB4A19D004F6258 = { CreatedOnToolsVersion = 6.2; DevelopmentTeam = 58G6JMC92R; - LastSwiftMigration = 0800; + LastSwiftMigration = 0900; }; 486D48851AB4A19D004F6258 = { CreatedOnToolsVersion = 6.2; - LastSwiftMigration = 0800; + LastSwiftMigration = 0900; }; }; }; @@ -278,21 +276,31 @@ 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_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_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; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -310,6 +318,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -324,13 +333,21 @@ 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_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_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; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -339,6 +356,7 @@ ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -348,6 +366,8 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.2; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -359,7 +379,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 58G6JMC92R; DYLIB_COMPATIBILITY_VERSION = 1; @@ -373,7 +393,8 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -381,6 +402,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 58G6JMC92R; DYLIB_COMPATIBILITY_VERSION = 1; @@ -393,7 +415,8 @@ PRODUCT_BUNDLE_IDENTIFIER = fr.louisbodart.CheatyXML; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; + SWIFT_VERSION = 4.0; }; name = Release; }; @@ -410,8 +433,10 @@ ); INFOPLIST_FILE = CheatyXMLTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "RealmTeam.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -424,8 +449,10 @@ ); INFOPLIST_FILE = CheatyXMLTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "RealmTeam.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; + SWIFT_VERSION = 4.0; }; name = Release; }; diff --git a/CheatyXML.xcodeproj/xcshareddata/xcschemes/CheatyXML.xcscheme b/CheatyXML.xcodeproj/xcshareddata/xcschemes/CheatyXML.xcscheme index f2c2e9f..0501cb6 100644 --- a/CheatyXML.xcodeproj/xcshareddata/xcschemes/CheatyXML.xcscheme +++ b/CheatyXML.xcodeproj/xcshareddata/xcschemes/CheatyXML.xcscheme @@ -1,6 +1,6 @@ [String: String] in var newDict = dict diff --git a/CheatyXMLTests/Info.plist b/CheatyXMLTests/Info.plist index 1657f2a..caee3da 100644 --- a/CheatyXMLTests/Info.plist +++ b/CheatyXMLTests/Info.plist @@ -2,14 +2,12 @@ - NSPrincipalClass - CheatyXMLTests CFBundleDevelopmentRegion en CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - RealmTeam.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -22,5 +20,7 @@ ???? CFBundleVersion 1 + NSPrincipalClass + CheatyXMLTests diff --git a/scripts/push.sh b/scripts/push.sh new file mode 100644 index 0000000..90ef3b3 --- /dev/null +++ b/scripts/push.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +source ~/.rvm/scripts/rvm +rvm use default +pod trunk push \ No newline at end of file From 827cbd044db971b50f26b2ba81347dbb632f2361 Mon Sep 17 00:00:00 2001 From: lobodart Date: Wed, 25 Oct 2017 17:36:09 +0200 Subject: [PATCH 2/5] Version 2.1.0 --- CheatyXML.podspec | 4 ++-- CheatyXML/Info.plist | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CheatyXML.podspec b/CheatyXML.podspec index c9103c9..9590cc7 100644 --- a/CheatyXML.podspec +++ b/CheatyXML.podspec @@ -16,7 +16,7 @@ Pod::Spec.new do |s| # s.name = "CheatyXML" - s.version = "2.0.0" + s.version = "2.1.0" s.summary = "CheatyXML" s.description = <<-DESC @@ -66,7 +66,7 @@ Pod::Spec.new do |s| # Supports git, hg, bzr, svn and HTTP. # - s.source = { :git => "https://github.com/lobodart/CheatyXML.git", :tag => "v2.0.0" } + s.source = { :git => "https://github.com/lobodart/CheatyXML.git", :tag => "v2.1.0" } # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # diff --git a/CheatyXML/Info.plist b/CheatyXML/Info.plist index 24ee2dd..71395b6 100644 --- a/CheatyXML/Info.plist +++ b/CheatyXML/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.0.0 + 2.1.0 CFBundleSignature ???? CFBundleVersion From 9ee6a7287eb1e54df0d1a093985013c5eede91c8 Mon Sep 17 00:00:00 2001 From: lobodart Date: Wed, 25 Oct 2017 17:43:38 +0200 Subject: [PATCH 3/5] Updating .travis.yml --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 45448d1..aa9674d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ -language: objective-c +language: swift -osx_image: xcode8 -xcode_sdk: iphonesimulator9.0 +osx_image: xcode9 +xcode_sdk: iphonesimulator11.0 script: ./scripts/ci.sh From 4d19c4797c6c84b5f9b6e3e7f3cb25e66a5f46de Mon Sep 17 00:00:00 2001 From: lobodart Date: Wed, 25 Oct 2017 17:53:03 +0200 Subject: [PATCH 4/5] Switching Swift version from 3 to 4 --- .swift-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.swift-version b/.swift-version index f398a20..389f774 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -3.0 \ No newline at end of file +4.0 \ No newline at end of file From fe2f18f261fe3b5e8d2daadb05928908180db790 Mon Sep 17 00:00:00 2001 From: Louis Bodart Date: Wed, 25 Oct 2017 20:05:11 +0200 Subject: [PATCH 5/5] Make scripts executable --- scripts/ci.sh | 0 scripts/push.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/ci.sh mode change 100644 => 100755 scripts/push.sh diff --git a/scripts/ci.sh b/scripts/ci.sh old mode 100644 new mode 100755 diff --git a/scripts/push.sh b/scripts/push.sh old mode 100644 new mode 100755