fix style issue

olx-mena · Apr 13, 2021 · 70658f8 · 70658f8
1 parent 63eda69
commit 70658f8
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 71 deletions.
diff --git a/AirshipKit/AirshipKit.xcodeproj/project.pbxproj b/AirshipKit/AirshipKit.xcodeproj/project.pbxproj
@@ -1891,43 +1891,14 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-
-    99B6EE641F3B99AD00C4E3F1 /* Predicates */ = {
-			isa = PBXGroup;
-			children = (
-				99666D731EDF266400BAE46B /* UAActionPredicateProtocol+Internal.h */,
-				99912E8A1ECE57CE00295C67 /* UALandingPageActionPredicate+Internal.h */,
-				99912E8B1ECE57CE00295C67 /* UALandingPageActionPredicate.m */,
-				99912E921ECE57EF00295C67 /* UAOverlayInboxMessageActionPredicate+Internal.h */,
-				99912E931ECE57EF00295C67 /* UAOverlayInboxMessageActionPredicate.m */,
-				99912E8E1ECE57E100295C67 /* UAShareActionPredicate+Internal.h */,
-				99912E8F1ECE57E100295C67 /* UAShareActionPredicate.m */,
-				99912E861ECE57BD00295C67 /* UAAddCustomEventActionPredicate+Internal.h */,
-				99912E871ECE57BD00295C67 /* UAAddCustomEventActionPredicate.m */,
-				992F89881EFD99B000E4C8FE /* UARateAppActionPredicate+Internal.h */,
-				992F89891EFD99B000E4C8FE /* UARateAppActionPredicate.m */,
-				99912E7D1ECCFEA800295C67 /* UATagsActionPredicate+Internal.h */,
-				99912E7E1ECCFEA800295C67 /* UATagsActionPredicate.m */,
-				99912E821ECE575F00295C67 /* UAFetchDeviceInfoActionPredicate+Internal.h */,
-				99912E831ECE575F00295C67 /* UAFetchDeviceInfoActionPredicate.m */,
-				99B6EE651F3B9B5300C4E3F1 /* UAEnableFeatureActionPredicate+Internal.h */,
-				99B6EE661F3B9B5300C4E3F1 /* UAEnableFeatureActionPredicate.m */,
-				99B6EE6D1F3BA1DF00C4E3F1 /* UAURLActionPredicate.m */,
-				99B6EE6E1F3BA1DF00C4E3F1 /* UAURLActionPredicate+Internal.h */,
-			);
-			name = Predicates;
-			sourceTree = "<group>";
-		};
-
-    6E3942261F33DA31003D1C50 /* Data */ = {
+		6E3942261F33DA31003D1C50 /* Data */ = {
 			isa = PBXGroup;
 			children = (
 				6E3942271F33DA52003D1C50 /* UAInboxStoreTest.m */,
 			);
 			name = Data;
 			sourceTree = "<group>";
 		};
-
 		6EA1A2A11F3382DF0064CE9D /* Data */ = {
 			isa = PBXGroup;
 			children = (
@@ -1939,8 +1910,8 @@
 				CC40DB9F1D8C996900BABD4F /* UAJSONValueTransformer.m */,
 			);
 			name = Data;
-sourceTree = "<group>";
-};
+			sourceTree = "<group>";
+		};
 		99B6EE641F3B99AD00C4E3F1 /* Predicates */ = {
 			isa = PBXGroup;
 			children = (
@@ -3627,7 +3598,6 @@ sourceTree = "<group>";
 				CC64F0511D8B77E3009CEF27 /* Frameworks */,
 				CC64F0521D8B77E3009CEF27 /* Resources */,
 				D3775F1A08A9BD2223C1AC9E /* [CP] Embed Pods Frameworks */,
-				F5CEFEC0515FB1B49241A7D4 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -3905,13 +3875,18 @@ sourceTree = "<group>";
 			files = (
 			);
 			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-AirshipKitTests/Pods-AirshipKitTests-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/OCMock/OCMock.framework",
+				"${BUILT_PRODUCTS_DIR}/XcodeEdit/XcodeEdit.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/XcodeEdit.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-AirshipKitTests/Pods-AirshipKitTests-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-AirshipKitTests/Pods-AirshipKitTests-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		DF6DD5011E7A1EB8000C281A /* Generate AirshipLib.h */ = {
@@ -3934,28 +3909,16 @@ sourceTree = "<group>";
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-AirshipKitTests-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";
-			showEnvVarsInLog = 0;
-		};
-		F5CEFEC0515FB1B49241A7D4 /* [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-AirshipKitTests/Pods-AirshipKitTests-resources.sh\"\n";
+			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;
 		};
 /* End PBXShellScriptBuildPhase section */

diff --git a/AirshipKit/AirshipKit/ios/UADefaultMessageCenterListCell.m b/AirshipKit/AirshipKit/ios/UADefaultMessageCenterListCell.m
@@ -14,7 +14,7 @@ - (void)setData:(UAInboxMessage *)message {
 }
 
 - (void)setStyle:(UADefaultMessageCenterStyle *)style {
-    _style = style;
+    self.style = style;
 
     BOOL hidden = !style.iconsEnabled;
     self.listIconView.hidden = hidden;

diff --git a/AirshipKit/AirshipKit/ios/UADefaultMessageCenterSplitViewController.m b/AirshipKit/AirshipKit/ios/UADefaultMessageCenterSplitViewController.m
@@ -102,7 +102,7 @@ - (void)viewDidAppear:(BOOL)animated {
 }
 
 - (void)setStyle:(UADefaultMessageCenterStyle *)style {
-    _style = style;
+    self.style = style;
     self.listViewController.style = style;
 
     if (self.listNav && self.messageNav) {

diff --git a/Podfile.lock b/Podfile.lock
@@ -10,11 +10,17 @@ DEPENDENCIES:
   - OCMock (~> 3.4)
   - XcodeEdit (~> 1.1)
 
+SPEC REPOS:
+  trunk:
+    - KIF
+    - OCMock
+    - XcodeEdit
+
 SPEC CHECKSUMS:
   KIF: f2a6025bb3f11692df675054a134d43a9ec2d7db
   OCMock: 35ae71d6a8fcc1b59434d561d1520b9dd4f15765
   XcodeEdit: dc693a7108bd9938a52d00ad335cc7de0000302f
 
 PODFILE CHECKSUM: b1c94b99d30735d1c836bb41679d7e7adc448790
 
-COCOAPODS: 1.2.1
+COCOAPODS: 1.10.1
diff --git a/TestShip/TestShip.xcodeproj/project.pbxproj b/TestShip/TestShip.xcodeproj/project.pbxproj
@@ -237,7 +237,6 @@
 				99C619791F2FFBD400C874D6 /* Frameworks */,
 				99C6197A1F2FFBD400C874D6 /* Resources */,
 				5DD64A8FEE01471150F9E49E /* [CP] Embed Pods Frameworks */,
-				9E23EDB05AB2EC7DA2588A4B /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -395,13 +394,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-TestShipTests-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";
+			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;
 		};
 		5DD64A8FEE01471150F9E49E /* [CP] Embed Pods Frameworks */ = {
@@ -410,28 +412,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-TestShipTests/Pods-TestShipTests-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/KIF/KIF.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KIF.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-TestShipTests/Pods-TestShipTests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		9E23EDB05AB2EC7DA2588A4B /* [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-TestShipTests/Pods-TestShipTests-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-TestShipTests/Pods-TestShipTests-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */