3.5准备提交

JohnWong · Mar 20, 2019 · 54c589f · 54c589f
1 parent 0e5a16f
commit 54c589f
Show file tree

Hide file tree

Showing 5 changed files with 566 additions and 535 deletions.
diff --git a/BusRider.xcodeproj/project.pbxproj b/BusRider.xcodeproj/project.pbxproj
@@ -814,8 +814,8 @@
 				52AB7A0A1A2E1982001904CA /* Embed App Extensions */,
 				52B84A5B1BE1480800BC81F6 /* Embed Watch Content */,
 				523AC2111C1338FF00B6043F /* Crashlytics */,
-				3BA41C4E502590D3E5799487 /* [CP] Embed Pods Frameworks */,
-				EAB16EA83AE44EB3DFC30D27 /* [CP] Copy Pods Resources */,
+				03CC67E09759DCE4D0C97450 /* [CP] Embed Pods Frameworks */,
+				31586142FCB4B1A74E858ABB /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -972,40 +972,58 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		39FF5DD43CE61A8FC21379A1 /* [CP] Check Pods Manifest.lock */ = {
+		03CC67E09759DCE4D0C97450 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
+				"${SRCROOT}/Pods/Target Support Files/Pods-BusRider/Pods-BusRider-frameworks.sh",
+				"${PODS_ROOT}/Reveal-SDK/RevealServer-11/iOS/RevealServer.framework",
 			);
-			name = "[CP] Check Pods Manifest.lock";
+			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-BusRider-checkManifestLockResult.txt",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RevealServer.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			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";
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-BusRider/Pods-BusRider-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		3BA41C4E502590D3E5799487 /* [CP] Embed Pods Frameworks */ = {
+		31586142FCB4B1A74E858ABB /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-BusRider/Pods-BusRider-frameworks.sh",
-				"${PODS_ROOT}/Reveal-SDK/RevealServer-11/iOS/RevealServer.framework",
+				"${SRCROOT}/Pods/Target Support Files/Pods-BusRider/Pods-BusRider-resources.sh",
+				$PODS_CONFIGURATION_BUILD_DIR/Appirater/Appirater.bundle,
+				"${PODS_ROOT}/SVProgressHUD/SVProgressHUD/SVProgressHUD.bundle",
 			);
-			name = "[CP] Embed Pods Frameworks";
+			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RevealServer.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-BusRider/Pods-BusRider-frameworks.sh\"\n";
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-BusRider/Pods-BusRider-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		39FF5DD43CE61A8FC21379A1 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-BusRider-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			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;
 		};
 		523AC2111C1338FF00B6043F /* Crashlytics */ = {
@@ -1103,25 +1121,6 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-BusRider WatchKit Extension/Pods-BusRider WatchKit Extension-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		EAB16EA83AE44EB3DFC30D27 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-BusRider/Pods-BusRider-resources.sh",
-				$PODS_CONFIGURATION_BUILD_DIR/Appirater/Appirater.bundle,
-				"${PODS_ROOT}/SVProgressHUD/SVProgressHUD/SVProgressHUD.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-BusRider/Pods-BusRider-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -1392,8 +1391,8 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				JW_BUILD = 16;
-				JW_VERSION = 3.4;
+				JW_BUILD = 22;
+				JW_VERSION = 3.5;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -1435,8 +1434,8 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				JW_BUILD = 16;
-				JW_VERSION = 3.4;
+				JW_BUILD = 22;
+				JW_VERSION = 3.5;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

diff --git a/BusRider.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/BusRider.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/Podfile.lock b/Podfile.lock
@@ -1,14 +1,14 @@
 PODS:
-  - AHKActionSheet (0.5.3)
-  - Appirater (2.0.5)
+  - AHKActionSheet (0.5.4)
+  - Appirater (2.3.1)
   - CBStoreHouseRefreshControl (1.0)
-  - Crashlytics (3.8.6):
-    - Fabric (~> 1.6.3)
-  - Fabric (1.6.13)
+  - Crashlytics (3.12.0):
+    - Fabric (~> 1.9.0)
+  - Fabric (1.9.0)
   - Reveal-SDK (11)
   - SGNavigationProgress (1.2)
   - STHTTPRequest2 (1.0.4)
-  - SVProgressHUD (1.1.3)
+  - SVProgressHUD (2.2.5)
   - UIViewAdditions (1.0.0)
 
 DEPENDENCIES:
@@ -31,15 +31,15 @@ EXTERNAL SOURCES:
     :podspec: https://raw.githubusercontent.com/JohnWong/STHTTPRequest/master/STHTTPRequest2/STHTTPRequest2.podspec
 
 SPEC CHECKSUMS:
-  AHKActionSheet: 0b7d3bc6467dd934441fd82beb3911fc1f7bdfd2
-  Appirater: e7c0a47fb67ee5041ce8479e6ba960927fb40264
+  AHKActionSheet: f0b312b5c689f72924d231c39dae140ecd5c1d46
+  Appirater: 44a4651f7912a17dc906b655f0c215d5bb768b84
   CBStoreHouseRefreshControl: 15966a5e4b26b66c272795553cefe4aba77e567e
-  Crashlytics: 95d05f4e4c19a771250c4bd9ce344d996de32bbf
-  Fabric: 2fb5676bc811af011a04513451f463dac6803206
+  Crashlytics: 07fb167b1694128c1c9a5a5cc319b0e9c3ca0933
+  Fabric: f988e33c97f08930a413e08123064d2e5f68d655
   Reveal-SDK: 7fa13d04bb55db61ff2342a990cf731d5159361d
   SGNavigationProgress: 6620db991cfd7611f8de036f4d6536c903cf0557
   STHTTPRequest2: 3c787d5b54401c51a6552ea6a3fad474a0053807
-  SVProgressHUD: 748080e4f36e603f6c02aec292664239df5279c1
+  SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   UIViewAdditions: b35c38dd787949168f56c429cd341a55fbaba917
 
 PODFILE CHECKSUM: baf421dd2cbad9e8b562c69cd585aee3bb6f0010

diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock