Merge pull request #168 from kishikawakatsumi/xcode10

Update Xcode 10
kishikawakatsumi · Oct 7, 2018 · 9adb1b3 · 9adb1b3
2 parents 37bcab6 + 29fa5a9
commit 9adb1b3
Show file tree

Hide file tree

Showing 13 changed files with 134 additions and 28 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,6 +14,24 @@ branches:
   - master
 matrix:
   include:
+  - osx_image: xcode10
+    env: ACTION=build
+  - osx_image: xcode10
+    env: ACTION='test:iphonesimulator'
+  - osx_image: xcode10
+    env: ACTION='test:appletvsimulator'
+  - osx_image: xcode10
+    env: ACTION='test:macosx'
+
+  - osx_image: xcode9.4
+    env: ACTION=build
+  - osx_image: xcode9.4
+    env: ACTION='test:iphonesimulator'
+  - osx_image: xcode9.4
+    env: ACTION='test:appletvsimulator'
+  - osx_image: xcode9.4
+    env: ACTION='test:macosx'
+
   - osx_image: xcode9
     env: ACTION=build
   - osx_image: xcode9

diff --git a/Examples/Example-iOS/Example-iOS.xcodeproj/project.pbxproj b/Examples/Example-iOS/Example-iOS.xcodeproj/project.pbxproj
@@ -131,7 +131,7 @@
 		145BF3EC1A66C24500D01D0D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 1000;
 				ORGANIZATIONNAME = "kishikawa katsumi";
 				TargetAttributes = {
 					145BF3F31A66C24500D01D0D = {
@@ -196,12 +196,14 @@
 				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;
@@ -247,12 +249,14 @@
 				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;

diff --git a/Examples/Example-iOS/Example-iOS.xcodeproj/xcshareddata/xcschemes/Example-iOS.xcscheme b/Examples/Example-iOS/Example-iOS.xcodeproj/xcshareddata/xcschemes/Example-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -40,7 +40,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -70,7 +69,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/Lib/Configurations/Base.xcconfig b/Lib/Configurations/Base.xcconfig
@@ -11,6 +11,7 @@ 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_DOCUMENTATION_COMMENTS = YES;
 CLANG_WARN_EMPTY_BODY = YES;
@@ -19,6 +20,7 @@ CLANG_WARN_INFINITE_RECURSION = YES;
 CLANG_WARN_INT_CONVERSION = YES;
 CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 CLANG_WARN_NULLABLE_TO_NONNULL_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;
@@ -38,7 +40,7 @@ GCC_WARN_UNUSED_VARIABLE = YES;
 VERSION_INFO_PREFIX = ;
 VERSIONING_SYSTEM = apple-generic;
 
-CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer;
+CODE_SIGN_IDENTITY = ;
 DEVELOPMENT_TEAM = ;
 
 MACOSX_DEPLOYMENT_TARGET = 10.9;

diff --git a/Lib/Configurations/TestHost.xcconfig b/Lib/Configurations/TestHost.xcconfig
@@ -2,7 +2,6 @@ SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator appletvos appletvsimulator
 TARGETED_DEVICE_FAMILY = 1,2,3;
 
 COMBINE_HIDPI_IMAGES = YES;
-LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;
 COPY_PHASE_STRIP = NO;
 INFOPLIST_FILE = TestHost/Info.plist;
 PRODUCT_NAME = $(TARGET_NAME);
@@ -12,14 +11,11 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 PRODUCT_BUNDLE_IDENTIFIER = com.kishikawakatsumi.KeychainAccess.TestHost;
 
 CODE_SIGN_ENTITLEMENTS = TestHost/TestHost.entitlements;
-PROVISIONING_PROFILE_SPECIFIER[sdk=iphone*] = iOS Development;
 
-CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer;
+CODE_SIGN_IDENTITY[sdk=iphone*] = iPhone Developer;
 CODE_SIGN_IDENTITY[sdk=macosx*] = Developer ID Application;
-PROVISIONING_PROFILE[sdk=iphone*] = 1d02fe15-29e3-4be3-9b0c-1904a8f1d04c;
-PROVISIONING_PROFILE[sdk=macosx*] = 66f6a67f-a20f-46eb-b1b8-ab5d17fd8d0b;
+PROVISIONING_PROFILE_SPECIFIER[sdk=iphone*] = iOS Development;
 PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] = KeychainAccess Tests;
-OTHER_CODE_SIGN_FLAGS[sdk=macosx*] = --deep;
 
 DEVELOPMENT_TEAM = 27AEDK3C9F;
 
@@ -30,3 +26,8 @@ OTHER_LDFLAGS[sdk=macosx*] = -framework Cocoa;
 PRINCIPAL_CLASS[sdk=iphone*] = UIApplication;
 PRINCIPAL_CLASS[sdk=appletv*] = UIApplication;
 PRINCIPAL_CLASS[sdk=macosx*] = NSApplication;
+
+LD_RUNPATH_SEARCH_PATHS[sdk=iphone*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;
+LD_RUNPATH_SEARCH_PATHS[sdk=watch*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;
+LD_RUNPATH_SEARCH_PATHS[sdk=appletv*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;
+LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks;
diff --git a/Lib/Configurations/Tests.xcconfig b/Lib/Configurations/Tests.xcconfig
@@ -1,12 +1,11 @@
+SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator appletvos appletvsimulator;
+
 COMBINE_HIDPI_IMAGES = YES;
 FRAMEWORK_SEARCH_PATHS = $(inherited);
 INFOPLIST_FILE = UICKeyChainStoreTests/Info.plist;
 PRODUCT_BUNDLE_IDENTIFIER = com.kishikawakatsumi.$(PRODUCT_NAME:rfc1034identifier);
 PRODUCT_NAME = $(TARGET_NAME);
 
-SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator appletvos appletvsimulator;
-DEVELOPMENT_TEAM = 27AEDK3C9F;
-
 TEST_HOST[sdk=iphone*] = $(BUILT_PRODUCTS_DIR)/TestHost.app/TestHost;
 TEST_HOST[sdk=appletv*] = $(BUILT_PRODUCTS_DIR)/TestHost.app/TestHost;
 TEST_HOST[sdk=macosx*] = $(BUILT_PRODUCTS_DIR)/TestHost.app/Contents/MacOS/TestHost;
@@ -15,3 +14,5 @@ LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Framewor
 LD_RUNPATH_SEARCH_PATHS[sdk=iphone*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;
 LD_RUNPATH_SEARCH_PATHS[sdk=watch*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;
 LD_RUNPATH_SEARCH_PATHS[sdk=appletv*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;
+
+DEVELOPMENT_TEAM = 27AEDK3C9F;
diff --git a/Lib/Configurations/libUICKeyChainStore.xcconfig b/Lib/Configurations/libUICKeyChainStore.xcconfig
@@ -15,7 +15,7 @@ SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator watchos watchsimulator app
 TARGETED_DEVICE_FAMILY = 1,2,3,4;
 
 MACOSX_DEPLOYMENT_TARGET = 10.6;
-IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 
 LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks;
 LD_RUNPATH_SEARCH_PATHS[sdk=iphone*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks;

diff --git a/Lib/Rakefile b/Lib/Rakefile
@@ -2,7 +2,45 @@ require 'xcjobs'
 
 xcode_version = `xcodebuild -version`.split("\n").first.scan(/\d+/).join('.')
 
-if xcode_version.start_with?('9.0')
+if xcode_version.start_with?('10')
+  def destinations(platform: 'iphonesimulator')
+    if platform == 'iphonesimulator'
+      [ 'name=iPhone X,OS=12.0'
+      ]
+    elsif platform == 'watchsimulator'
+      [ 'name=Apple Watch Series 4 - 40mm,OS=5.0',
+        'name=Apple Watch Series 4 - 44mm,OS=5.0'
+      ]
+    elsif platform == 'appletvsimulator'
+      [ 'name=Apple TV 4K,OS=12.0'
+      ]
+    else
+      [
+        'platform=OS X,arch=x86_64'
+      ]
+    end
+  end
+elsif xcode_version.start_with?('9.4')
+  def destinations(platform: 'iphonesimulator')
+    if platform == 'iphonesimulator'
+      [ 'name=iPhone 7,OS=11.4',
+        'name=iPhone 8,OS=11.4',
+        'name=iPhone X,OS=11.4'
+      ]
+    elsif platform == 'watchsimulator'
+      [ 'name=Apple Watch - 38mm,OS=4.0',
+        'name=Apple Watch - 42mm,OS=4.0'
+      ]
+    elsif platform == 'appletvsimulator'
+      [ 'name=Apple TV 4K,OS=11.0'
+      ]
+    else
+      [
+        'platform=OS X,arch=x86_64'
+      ]
+    end
+  end
+elsif xcode_version.start_with?('9')
   def destinations(platform: 'iphonesimulator')
     if platform == 'iphonesimulator'
       [ 'name=iPhone 6s Plus,OS=11.0',
@@ -254,7 +292,31 @@ namespace :build do
         t.scheme = scheme
         t.sdk = platform
         t.configuration = configuration
-        if xcode_version.start_with?('8.0')
+        if xcode_version.start_with?('10')
+          if platform == 'iphonesimulator'
+            t.add_destination('name=iPhone X,OS=12.0')
+          elsif platform == 'watchsimulator'
+            t.add_destination('name=Apple Watch Series 4 - 44mm,OS=5.0')
+          elsif platform == 'appletvsimulator'
+            t.add_destination('name=Apple TV 4K,OS=12.0')
+          end
+        elsif xcode_version.start_with?('9.4')
+          if platform == 'iphonesimulator'
+            t.add_destination('name=iPhone 7,OS=11.4')
+          elsif platform == 'watchsimulator'
+            t.add_destination('name=Apple Watch - 42mm,OS=3.2')
+          elsif platform == 'appletvsimulator'
+            t.add_destination('name=Apple TV 4K,OS=11.0')
+          end
+        elsif xcode_version.start_with?('9.0')
+          if platform == 'iphonesimulator'
+            t.add_destination('name=iPhone 6,OS=11.0')
+          elsif platform == 'watchsimulator'
+            t.add_destination('name=Apple Watch - 42mm,OS=3.1')
+          elsif platform == 'appletvsimulator'
+            t.add_destination('name=Apple TV 1080p,OS=11.0')
+          end
+        elsif xcode_version.start_with?('8.0')
           if platform == 'iphonesimulator'
             t.add_destination('name=iPhone 6,OS=10.0')
           elsif platform == 'watchsimulator'

diff --git a/Lib/UICKeyChainStore.xcodeproj/project.pbxproj b/Lib/UICKeyChainStore.xcodeproj/project.pbxproj
@@ -17,6 +17,16 @@
 		148993D31D8F2515000132F7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 148993D21D8F2515000132F7 /* main.m */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXContainerItemProxy section */
+		14021B942169FD00006AD6AE /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 14A59C941A62CF6E006561CC /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 148993CE1D8F2515000132F7;
+			remoteInfo = TestHost;
+		};
+/* End PBXContainerItemProxy section */
+
 /* Begin PBXCopyFilesBuildPhase section */
 		14796A651C1CD9C900169D09 /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
@@ -222,6 +232,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				14021B952169FD00006AD6AE /* PBXTargetDependency */,
 			);
 			name = UICKeyChainStoreTests;
 			productName = UICKeyChainStoreTests;
@@ -268,15 +279,14 @@
 		14A59C941A62CF6E006561CC /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 1000;
 				ORGANIZATIONNAME = "kishikawa katsumi";
 				TargetAttributes = {
 					14796A461C1CD9A500169D09 = {
 						ProvisioningStyle = Automatic;
 					};
 					14796A521C1CD9B500169D09 = {
 						DevelopmentTeam = 27AEDK3C9F;
-						ProvisioningStyle = Automatic;
 					};
 					148993CE1D8F2515000132F7 = {
 						CreatedOnToolsVersion = 8.0;
@@ -372,6 +382,14 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXTargetDependency section */
+		14021B952169FD00006AD6AE /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 148993CE1D8F2515000132F7 /* TestHost */;
+			targetProxy = 14021B942169FD00006AD6AE /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
 /* Begin XCBuildConfiguration section */
 		14796A4E1C1CD9A500169D09 /* Debug */ = {
 			isa = XCBuildConfiguration;

diff --git a/Lib/UICKeyChainStore.xcodeproj/xcshareddata/xcschemes/TestHost.xcscheme b/Lib/UICKeyChainStore.xcodeproj/xcshareddata/xcschemes/TestHost.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -46,7 +45,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/Lib/UICKeyChainStore.xcodeproj/xcshareddata/xcschemes/UICKeyChainStore.xcscheme b/Lib/UICKeyChainStore.xcodeproj/xcshareddata/xcschemes/UICKeyChainStore.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -40,7 +40,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -70,7 +69,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/Lib/UICKeyChainStore.xcodeproj/xcshareddata/xcschemes/libUICKeyChainStore.xcscheme b/Lib/UICKeyChainStore.xcodeproj/xcshareddata/xcschemes/libUICKeyChainStore.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -40,7 +40,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -70,7 +69,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/UICKeyChainStore.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/UICKeyChainStore.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>