Merge pull request #26 from carousell/feature/xcode-10

Xcode 10
carousell · Oct 2, 2018 · 7972c1e · 7972c1e
2 parents f265aff + 6ab1f1a
commit 7972c1e
Show file tree

Hide file tree

Showing 19 changed files with 731 additions and 485 deletions.
diff --git a/.ruby-version b/.ruby-version
diff --git a/.swift-version b/.swift-version
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9.2
+osx_image: xcode10
 podfile: Example/Podfile
 cache:
   bundler: true
@@ -9,7 +9,7 @@ cache:
     - Example/Pods/SwiftLint
 before_install:
   - xcrun instruments -s devices
-  - xcrun instruments -w "iPhone 7 (11.2) [" || true
+  - xcrun instruments -w "iPhone X (12.0) [" || true
 install:
   - bundle install --jobs=3 --retry=3 --deployment
   - bundle exec pod install --project-directory=Example

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## v1.3.1
+
+* Update the project to Xcode 10 [#26](https://github.com/carousell/pickle/pull/26)
+
 ## v1.3.0
 
 * Update to Swift 4 with Xcode 9 [#15](https://github.com/carousell/pickle/pull/15)

diff --git a/Example/.swiftlint.yml b/Example/.swiftlint.yml
@@ -1,6 +1,11 @@
 disabled_rules:
   - line_length
   - vertical_whitespace
+identifier_name:
+  excluded:
+    - id
+    - pi
+    - to
 included:
   - ../Pickle
 excluded:

diff --git a/Example/Pickle.xcodeproj/project.pbxproj b/Example/Pickle.xcodeproj/project.pbxproj
@@ -176,7 +176,6 @@
 				607FACCD1AFB9204008FA782 /* Frameworks */,
 				607FACCE1AFB9204008FA782 /* Resources */,
 				FACEF3710E5D4AC190E14F3C /* [CP] Embed Pods Frameworks */,
-				AF94885251D96D308FF9F657 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -195,8 +194,6 @@
 				B56351571F06278E00B5A46D /* Sources */,
 				B56351581F06278E00B5A46D /* Frameworks */,
 				B56351591F06278E00B5A46D /* Resources */,
-				D58BD5D34861E4557F794100 /* [CP] Embed Pods Frameworks */,
-				6602408F2886C3A7E9355419 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -215,7 +212,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 1000;
 				ORGANIZATIONNAME = Carousell;
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
@@ -287,21 +284,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		6602408F2886C3A7E9355419 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PickleUITests/Pods-PickleUITests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		A27D8487E7B02B4F1BBB4CFB /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -320,21 +302,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		AF94885251D96D308FF9F657 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PickleExample/Pods-PickleExample-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		B55833231EC1903B0061E182 /* SwiftLint */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -347,22 +314,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "${PODS_ROOT}/SwiftLint/swiftlint";
-		};
-		D58BD5D34861E4557F794100 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PickleUITests/Pods-PickleUITests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
+			shellScript = "${PODS_ROOT}/SwiftLint/swiftlint\n";
 		};
 		FACEF3710E5D4AC190E14F3C /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -437,12 +389,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;
@@ -490,12 +444,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/Example/Pickle.xcodeproj/xcshareddata/xcschemes/Pickle-Example.xcscheme b/Example/Pickle.xcodeproj/xcshareddata/xcschemes/Pickle-Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0910"
+   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/Example/Pickle.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Example/Pickle.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>
diff --git a/Example/Podfile b/Example/Podfile
@@ -3,7 +3,7 @@ use_frameworks!
 
 target 'PickleExample' do
   pod 'Pickle', :path => '../'
-  pod 'SwiftLint', '0.23.1'
+  pod 'SwiftLint', podspec: 'https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/4/0/1/SwiftLint/0.27.0/SwiftLint.podspec.json'
 
   target 'PickleUITests' do
     inherit! :search_paths

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,19 +1,21 @@
 PODS:
   - Pickle (1.3.0)
-  - SwiftLint (0.23.1)
+  - SwiftLint (0.27.0)
 
 DEPENDENCIES:
   - Pickle (from `../`)
-  - SwiftLint (= 0.23.1)
+  - SwiftLint (from `https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/4/0/1/SwiftLint/0.27.0/SwiftLint.podspec.json`)
 
 EXTERNAL SOURCES:
   Pickle:
-    :path: ../
+    :path: "../"
+  SwiftLint:
+    :podspec: https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/4/0/1/SwiftLint/0.27.0/SwiftLint.podspec.json
 
 SPEC CHECKSUMS:
-  Pickle: e845765b22fec98dc7eff51f327e7ad22834a3d2
-  SwiftLint: 1b670ce79284c76520f84060e87d645078fd32fa
+  Pickle: ac29bdd7b53f14dec1c75b7c9f35a8c1657b6b0a
+  SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073
 
-PODFILE CHECKSUM: 47f97668e0890347a0b2faf96d7471347d1e708a
+PODFILE CHECKSUM: 876096377525bec4eeb5dc771e7fdfbcdcb46898
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.5.3