From ddcac73805df9742c8b86830222c154a27c097af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8A=89=E9=9B=A8=E8=BE=B0?= Date: Tue, 7 May 2019 16:22:50 +0900 Subject: [PATCH 1/3] migrate to swift5 --- .../Pods/Pods.xcodeproj/project.pbxproj | 9 ++++---- .../project.pbxproj | 21 ++++++++++--------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/SmileLock-Example/Pods/Pods.xcodeproj/project.pbxproj b/SmileLock-Example/Pods/Pods.xcodeproj/project.pbxproj index 5e8dd5d..ef22b9e 100644 --- a/SmileLock-Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/SmileLock-Example/Pods/Pods.xcodeproj/project.pbxproj @@ -298,17 +298,18 @@ LastSwiftMigration = 0800; }; ADDCF128C9FD122E6F900A0175BCC718 = { - LastSwiftMigration = 1010; + LastSwiftMigration = 1020; }; }; }; buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, ja, + Base, ); mainGroup = 7DB346D0F39D3F0E887471402A8071AB; productRefGroup = 82C452AF10C4675854B4E9B9C27E479A /* Products */; @@ -433,7 +434,7 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -500,7 +501,7 @@ PRODUCT_NAME = SmileLock; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; diff --git a/SmileLock-Example/SmileLock-Example.xcodeproj/project.pbxproj b/SmileLock-Example/SmileLock-Example.xcodeproj/project.pbxproj index 21d41cf..107ed7f 100644 --- a/SmileLock-Example/SmileLock-Example.xcodeproj/project.pbxproj +++ b/SmileLock-Example/SmileLock-Example.xcodeproj/project.pbxproj @@ -236,27 +236,28 @@ TargetAttributes = { B7E3A1A91CCC6448005F680E = { CreatedOnToolsVersion = 7.3; - LastSwiftMigration = 1010; + LastSwiftMigration = 1020; }; B7E3A1BD1CCC6449005F680E = { CreatedOnToolsVersion = 7.3; - LastSwiftMigration = 1010; + LastSwiftMigration = 1020; TestTargetID = B7E3A1A91CCC6448005F680E; }; B7E3A1C81CCC6449005F680E = { CreatedOnToolsVersion = 7.3; - LastSwiftMigration = 1010; + LastSwiftMigration = 1020; TestTargetID = B7E3A1A91CCC6448005F680E; }; }; }; buildConfigurationList = B7E3A1A51CCC6448005F680E /* Build configuration list for PBXProject "SmileLock-Example" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, Base, + ja, ); mainGroup = B7E3A1A11CCC6448005F680E; productRefGroup = B7E3A1AB1CCC6448005F680E /* Products */; @@ -523,7 +524,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "edu.self.SmileLock-Example"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -538,7 +539,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "edu.self.SmileLock-Example"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -550,7 +551,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "edu.self.SmileLock-ExampleTests"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SmileLock-Example.app/SmileLock-Example"; }; name = Debug; @@ -563,7 +564,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "edu.self.SmileLock-ExampleTests"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SmileLock-Example.app/SmileLock-Example"; }; name = Release; @@ -575,7 +576,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "edu.self.SmileLock-ExampleUITests"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TEST_TARGET_NAME = "SmileLock-Example"; }; name = Debug; @@ -587,7 +588,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "edu.self.SmileLock-ExampleUITests"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TEST_TARGET_NAME = "SmileLock-Example"; }; name = Release; From 026badbb91de07e872bc8c0ab8c3f10106c5c5b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8A=89=E9=9B=A8=E8=BE=B0?= Date: Tue, 7 May 2019 16:28:36 +0900 Subject: [PATCH 2/3] update Xcode10.2.1 recommended settings --- .../Pods/Pods.xcodeproj/project.pbxproj | 40 ++++++++++++++++++- .../Pods-SmileLock-Example/Info.plist | 40 +++++++++---------- .../Target Support Files/SmileLock/Info.plist | 40 +++++++++---------- .../project.pbxproj | 2 +- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++ 5 files changed, 88 insertions(+), 42 deletions(-) create mode 100644 SmileLock-Example/SmileLock-Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/SmileLock-Example/Pods/Pods.xcodeproj/project.pbxproj b/SmileLock-Example/Pods/Pods.xcodeproj/project.pbxproj index ef22b9e..c3a33a8 100644 --- a/SmileLock-Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/SmileLock-Example/Pods/Pods.xcodeproj/project.pbxproj @@ -292,7 +292,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 0700; + LastUpgradeCheck = 1020; TargetAttributes = { 76A818E44E7CDDAE10E2493F346963C3 = { LastSwiftMigration = 0800; @@ -384,6 +384,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = 84CE7D0A365111E2B061A9A265FDD5A4 /* Pods-SmileLock-Example.debug.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -401,6 +403,7 @@ OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = Pods_SmileLock_Example; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -416,6 +419,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = E38552F76952B8C7F08BFF635C3DD111 /* SmileLock.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -430,6 +434,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = "Target Support Files/SmileLock/SmileLock.modulemap"; MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = SmileLock; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -445,22 +450,36 @@ 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; 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; + 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; COPY_PHASE_STRIP = NO; + 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", @@ -484,6 +503,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = E38552F76952B8C7F08BFF635C3DD111 /* SmileLock.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -498,6 +518,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = "Target Support Files/SmileLock/SmileLock.modulemap"; MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = SmileLock; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -512,22 +533,35 @@ 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; 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; + 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; COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = "RELEASE=1"; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -537,6 +571,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 9.0; STRIP_INSTALLED_PRODUCT = NO; + SWIFT_COMPILATION_MODE = wholemodule; SYMROOT = "${SRCROOT}/../build"; VALIDATE_PRODUCT = YES; }; @@ -546,6 +581,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = 25AFF6969B408F2206B0CBB8A74DBA8B /* Pods-SmileLock-Example.release.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -563,6 +600,7 @@ OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = Pods_SmileLock_Example; SDKROOT = iphoneos; SKIP_INSTALL = YES; diff --git a/SmileLock-Example/Pods/Target Support Files/Pods-SmileLock-Example/Info.plist b/SmileLock-Example/Pods/Target Support Files/Pods-SmileLock-Example/Info.plist index 6974542..11db4b7 100644 --- a/SmileLock-Example/Pods/Target Support Files/Pods-SmileLock-Example/Info.plist +++ b/SmileLock-Example/Pods/Target Support Files/Pods-SmileLock-Example/Info.plist @@ -2,25 +2,25 @@ - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - org.cocoapods.${PRODUCT_NAME:rfc1034identifier} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0.0 - CFBundleSignature - ???? - CFBundleVersion - ${CURRENT_PROJECT_VERSION} - NSPrincipalClass - + CFBundleDevelopmentRegion + en + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0.0 + CFBundleSignature + ???? + CFBundleVersion + ${CURRENT_PROJECT_VERSION} + NSPrincipalClass + diff --git a/SmileLock-Example/Pods/Target Support Files/SmileLock/Info.plist b/SmileLock-Example/Pods/Target Support Files/SmileLock/Info.plist index 01903d7..e417ac3 100644 --- a/SmileLock-Example/Pods/Target Support Files/SmileLock/Info.plist +++ b/SmileLock-Example/Pods/Target Support Files/SmileLock/Info.plist @@ -2,25 +2,25 @@ - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - org.cocoapods.${PRODUCT_NAME:rfc1034identifier} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.1.0 - CFBundleSignature - ???? - CFBundleVersion - ${CURRENT_PROJECT_VERSION} - NSPrincipalClass - + CFBundleDevelopmentRegion + en + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.1.0 + CFBundleSignature + ???? + CFBundleVersion + ${CURRENT_PROJECT_VERSION} + NSPrincipalClass + diff --git a/SmileLock-Example/SmileLock-Example.xcodeproj/project.pbxproj b/SmileLock-Example/SmileLock-Example.xcodeproj/project.pbxproj index 107ed7f..51660b5 100644 --- a/SmileLock-Example/SmileLock-Example.xcodeproj/project.pbxproj +++ b/SmileLock-Example/SmileLock-Example.xcodeproj/project.pbxproj @@ -231,7 +231,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 1010; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = rain; TargetAttributes = { B7E3A1A91CCC6448005F680E = { diff --git a/SmileLock-Example/SmileLock-Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/SmileLock-Example/SmileLock-Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/SmileLock-Example/SmileLock-Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + From daca275a5390f2245e047f5451c5a76e9a0d8a3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8A=89=E9=9B=A8=E8=BE=B0?= Date: Tue, 7 May 2019 16:53:32 +0900 Subject: [PATCH 3/3] Bump version to 3.0.8 --- SmileLock.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SmileLock.podspec b/SmileLock.podspec index 572c722..824e092 100644 --- a/SmileLock.podspec +++ b/SmileLock.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "SmileLock" - s.version = "3.0.7" + s.version = "3.0.8" s.summary = "A library for make a beautiful Passcode Lock View." s.description = <<-DESC 1. Create a beautiful passcode lock view simply. @@ -16,7 +16,7 @@ Pod::Spec.new do |s| s.author = { 'Rain' => 'liu044100@gmail.com' } - s.swift_version = "4.2" + s.swift_version = "5" s.platform = :ios, '9.0' s.requires_arc = true s.source = { :git => "https://github.com/recruit-lifestyle/Smile-Lock.git", :tag => s.version.to_s}