From 69e6ee2ef9c6c26f951d2d07856d1653eadced39 Mon Sep 17 00:00:00 2001 From: Jakob Mygind Date: Mon, 25 Feb 2019 11:24:44 +0100 Subject: [PATCH 1/4] Update to swift4.2 --- Noted.xcodeproj/project.pbxproj | 47 ++++++++++++++++--- .../xcshareddata/xcschemes/Noted.xcscheme | 5 +- Noted/Classes/Noted.swift | 2 +- 3 files changed, 43 insertions(+), 11 deletions(-) diff --git a/Noted.xcodeproj/project.pbxproj b/Noted.xcodeproj/project.pbxproj index ca8b978..641fb16 100644 --- a/Noted.xcodeproj/project.pbxproj +++ b/Noted.xcodeproj/project.pbxproj @@ -188,16 +188,19 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0720; - LastUpgradeCheck = 0800; + LastUpgradeCheck = 1010; ORGANIZATIONNAME = Nodes; TargetAttributes = { 272F1E111C6A4A250098F620 = { CreatedOnToolsVersion = 7.2.1; - LastSwiftMigration = 0800; + DevelopmentTeam = M92A6H7EPZ; + LastSwiftMigration = 1010; + ProvisioningStyle = Automatic; }; 272F1E1B1C6A4A250098F620 = { CreatedOnToolsVersion = 7.2.1; - LastSwiftMigration = 0800; + DevelopmentTeam = M92A6H7EPZ; + LastSwiftMigration = 1010; }; }; }; @@ -278,14 +281,22 @@ 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; @@ -328,14 +339,22 @@ 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,8 +388,11 @@ buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = M92A6H7EPZ; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -380,9 +402,11 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.nodes.Noted; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -391,8 +415,11 @@ buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = M92A6H7EPZ; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -402,8 +429,10 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.nodes.Noted; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -411,11 +440,13 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_CODE_COVERAGE = NO; + DEVELOPMENT_TEAM = M92A6H7EPZ; INFOPLIST_FILE = NotedTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.nodes.NotedTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -423,11 +454,13 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_CODE_COVERAGE = NO; + DEVELOPMENT_TEAM = M92A6H7EPZ; INFOPLIST_FILE = NotedTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.nodes.NotedTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Default; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/Noted.xcodeproj/xcshareddata/xcschemes/Noted.xcscheme b/Noted.xcodeproj/xcshareddata/xcschemes/Noted.xcscheme index 157e71f..2d1dd87 100644 --- a/Noted.xcodeproj/xcshareddata/xcschemes/Noted.xcscheme +++ b/Noted.xcodeproj/xcshareddata/xcschemes/Noted.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> diff --git a/Noted/Classes/Noted.swift b/Noted/Classes/Noted.swift index db0f4c5..6cfbce7 100644 --- a/Noted/Classes/Noted.swift +++ b/Noted/Classes/Noted.swift @@ -21,7 +21,7 @@ public class Noted { notedQueue.sync { values = self._observers.allObjects } - return values.flatMap({ $0 as? NoteObserver }) + return values.compactMap({ $0 as? NoteObserver }) } public init() {} From 2638b20220e4451dbce935c9ce6d515b4f67e299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20B=C3=B8dskov?= Date: Wed, 27 Mar 2019 14:21:00 +0100 Subject: [PATCH 2/4] updates travis.yml to new SDK version --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index fdf3728..9ddbb7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,10 +9,10 @@ env: - PROJECT_NAME="Noted.xcodeproj" - IOS_FRAMEWORK_SCHEME="Noted" - - IOS_SDK=iphonesimulator10.1 - + - IOS_SDK=iphonesimulator12.2 + matrix: - - DESTINATION="OS=10.1,name=iPhone 6S Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" + - DESTINATION="OS=12.2,name=iPhone 6S Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" script: - set -o pipefail @@ -26,4 +26,4 @@ script: - xcodebuild -project "$PROJECT_NAME" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty; after_success: - - bash <(curl -s https://codecov.io/bash) \ No newline at end of file + - bash <(curl -s https://codecov.io/bash) From f692e46bdf6292c8b63fea3ee4593b94d95ec9e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20B=C3=B8dskov?= Date: Wed, 27 Mar 2019 14:25:40 +0100 Subject: [PATCH 3/4] downgrades sdk to 12.0 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9ddbb7c..816930f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,10 +9,10 @@ env: - PROJECT_NAME="Noted.xcodeproj" - IOS_FRAMEWORK_SCHEME="Noted" - - IOS_SDK=iphonesimulator12.2 + - IOS_SDK=iphonesimulator12.0 matrix: - - DESTINATION="OS=12.2,name=iPhone 6S Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" + - DESTINATION="OS=12.0,name=iPhone 6S Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" script: - set -o pipefail From 3a74e6852e5d925696e33b43af1928eed1460ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20B=C3=B8dskov?= Date: Wed, 27 Mar 2019 14:32:37 +0100 Subject: [PATCH 4/4] and upgrading travis.yml again --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 816930f..e8414d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: swift -osx_image: xcode8.1 +osx_image: xcode10.1 branches: only: - master @@ -9,10 +9,10 @@ env: - PROJECT_NAME="Noted.xcodeproj" - IOS_FRAMEWORK_SCHEME="Noted" - - IOS_SDK=iphonesimulator12.0 + - IOS_SDK=iphonesimulator12.1 matrix: - - DESTINATION="OS=12.0,name=iPhone 6S Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" + - DESTINATION="OS=12.1,name=iPhone 6S Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" script: - set -o pipefail