Fix building Demo, bump version to 0.2.2

avito-tech · May 29, 2019 · 0bcbdd0 · 0bcbdd0
1 parent cc1916d
commit 0bcbdd0
Show file tree

Hide file tree

Showing 31 changed files with 175 additions and 421 deletions.
diff --git a/Demo/MixboxDemo.xcodeproj/project.pbxproj b/Demo/MixboxDemo.xcodeproj/project.pbxproj
@@ -3,12 +3,12 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
-		74AC7409B65D3BCFED5175F9 /* Pods_MixboxDemoUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5566939183FAF777542978A9 /* Pods_MixboxDemoUITests.framework */; };
-		F2299881ADC33D367DF012BC /* Pods_MixboxDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28098468FD2E71D44287CFB2 /* Pods_MixboxDemo.framework */; };
+		3FFB1A78875EB28DE5161182 /* Pods_MixboxDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB61D58E1D6460870715DCCF /* Pods_MixboxDemo.framework */; };
+		8BC2554A1A3CBCD41CACEC46 /* Pods_MixboxDemoUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 156A08B9A455A5178D87A32E /* Pods_MixboxDemoUITests.framework */; };
 		F88DE62721189FED00C2AE3C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F88DE62621189FED00C2AE3C /* AppDelegate.swift */; };
 		F88DE62C21189FED00C2AE3C /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F88DE62A21189FED00C2AE3C /* Main.storyboard */; };
 		F88DE62E21189FF000C2AE3C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F88DE62D21189FF000C2AE3C /* Assets.xcassets */; };
@@ -35,11 +35,12 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		1F41B18CDE88CC687D3D5098 /* Pods-MixboxDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MixboxDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-MixboxDemo/Pods-MixboxDemo.release.xcconfig"; sourceTree = "<group>"; };
-		28098468FD2E71D44287CFB2 /* Pods_MixboxDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MixboxDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		49AACDDB7411F96265B5709E /* Pods-MixboxDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MixboxDemo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MixboxDemo/Pods-MixboxDemo.debug.xcconfig"; sourceTree = "<group>"; };
-		5566939183FAF777542978A9 /* Pods_MixboxDemoUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MixboxDemoUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		BC2D50ED745D64DBECEC175E /* Pods-MixboxDemoUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MixboxDemoUITests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MixboxDemoUITests/Pods-MixboxDemoUITests.debug.xcconfig"; sourceTree = "<group>"; };
+		156A08B9A455A5178D87A32E /* Pods_MixboxDemoUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MixboxDemoUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		24FC6430CE8DA3B27F063604 /* Pods-MixboxDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MixboxDemo.release.xcconfig"; path = "Target Support Files/Pods-MixboxDemo/Pods-MixboxDemo.release.xcconfig"; sourceTree = "<group>"; };
+		654ABB64373F74C8FC9C28FE /* Pods-MixboxDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MixboxDemo.debug.xcconfig"; path = "Target Support Files/Pods-MixboxDemo/Pods-MixboxDemo.debug.xcconfig"; sourceTree = "<group>"; };
+		7BB07A4C2BFCD57EB418764C /* Pods-MixboxDemoUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MixboxDemoUITests.debug.xcconfig"; path = "Target Support Files/Pods-MixboxDemoUITests/Pods-MixboxDemoUITests.debug.xcconfig"; sourceTree = "<group>"; };
+		AB61D58E1D6460870715DCCF /* Pods_MixboxDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MixboxDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		B43967902400B8EE22B66526 /* Pods-MixboxDemoUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MixboxDemoUITests.release.xcconfig"; path = "Target Support Files/Pods-MixboxDemoUITests/Pods-MixboxDemoUITests.release.xcconfig"; sourceTree = "<group>"; };
 		F88DE62321189FED00C2AE3C /* MixboxDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MixboxDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		F88DE62621189FED00C2AE3C /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		F88DE62B21189FED00C2AE3C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
@@ -57,45 +58,45 @@
 		F890FDBF2119C415004F1B7E /* BasePageObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BasePageObject.swift; sourceTree = "<group>"; };
 		F890FDC12119C43B004F1B7E /* BasePageObjects.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BasePageObjects.swift; sourceTree = "<group>"; };
 		F890FDC42119C74D004F1B7E /* XcuiActivityStepLogger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XcuiActivityStepLogger.swift; sourceTree = "<group>"; };
-		FA7CB4E207613D7EE8D38EFE /* Pods-MixboxDemoUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MixboxDemoUITests.release.xcconfig"; path = "Pods/Target Support Files/Pods-MixboxDemoUITests/Pods-MixboxDemoUITests.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		F88DE62021189FED00C2AE3C /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F2299881ADC33D367DF012BC /* Pods_MixboxDemo.framework in Frameworks */,
+				3FFB1A78875EB28DE5161182 /* Pods_MixboxDemo.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		F88DE63421189FF000C2AE3C /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				74AC7409B65D3BCFED5175F9 /* Pods_MixboxDemoUITests.framework in Frameworks */,
+				8BC2554A1A3CBCD41CACEC46 /* Pods_MixboxDemoUITests.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		AF381C6351C302CB2341222D /* Pods */ = {
+		825B3F431B6B1A576B11DFF7 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				49AACDDB7411F96265B5709E /* Pods-MixboxDemo.debug.xcconfig */,
-				1F41B18CDE88CC687D3D5098 /* Pods-MixboxDemo.release.xcconfig */,
-				BC2D50ED745D64DBECEC175E /* Pods-MixboxDemoUITests.debug.xcconfig */,
-				FA7CB4E207613D7EE8D38EFE /* Pods-MixboxDemoUITests.release.xcconfig */,
+				654ABB64373F74C8FC9C28FE /* Pods-MixboxDemo.debug.xcconfig */,
+				24FC6430CE8DA3B27F063604 /* Pods-MixboxDemo.release.xcconfig */,
+				7BB07A4C2BFCD57EB418764C /* Pods-MixboxDemoUITests.debug.xcconfig */,
+				B43967902400B8EE22B66526 /* Pods-MixboxDemoUITests.release.xcconfig */,
 			);
 			name = Pods;
+			path = Pods;
 			sourceTree = "<group>";
 		};
-		C37C689DA591D847347828DC /* Frameworks */ = {
+		D2C3CDFB358BDCA853EF5463 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				28098468FD2E71D44287CFB2 /* Pods_MixboxDemo.framework */,
-				5566939183FAF777542978A9 /* Pods_MixboxDemoUITests.framework */,
+				AB61D58E1D6460870715DCCF /* Pods_MixboxDemo.framework */,
+				156A08B9A455A5178D87A32E /* Pods_MixboxDemoUITests.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -106,8 +107,8 @@
 				F88DE62521189FED00C2AE3C /* MixboxDemo */,
 				F88DE63A21189FF000C2AE3C /* MixboxDemoUITests */,
 				F88DE62421189FED00C2AE3C /* Products */,
-				AF381C6351C302CB2341222D /* Pods */,
-				C37C689DA591D847347828DC /* Frameworks */,
+				D2C3CDFB358BDCA853EF5463 /* Frameworks */,
+				825B3F431B6B1A576B11DFF7 /* Pods */,
 			);
 			sourceTree = "<group>";
 		};
@@ -196,11 +197,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = F88DE64021189FF000C2AE3C /* Build configuration list for PBXNativeTarget "MixboxDemo" */;
 			buildPhases = (
-				29F5F14101BCD60887E44914 /* [CP] Check Pods Manifest.lock */,
+				790EC0DFA233B469202FB587 /* [CP] Check Pods Manifest.lock */,
 				F88DE61F21189FED00C2AE3C /* Sources */,
 				F88DE62021189FED00C2AE3C /* Frameworks */,
 				F88DE62121189FED00C2AE3C /* Resources */,
-				ABAAACC3A14F745FB1F8B325 /* [CP] Embed Pods Frameworks */,
+				2F5E6E403BF9978A51E59C1A /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -215,11 +216,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = F88DE64321189FF000C2AE3C /* Build configuration list for PBXNativeTarget "MixboxDemoUITests" */;
 			buildPhases = (
-				062B12E00D56CE144C3C5FEE /* [CP] Check Pods Manifest.lock */,
+				45C02984DDE00A0117774EAC /* [CP] Check Pods Manifest.lock */,
 				F88DE63321189FF000C2AE3C /* Sources */,
 				F88DE63421189FF000C2AE3C /* Frameworks */,
 				F88DE63521189FF000C2AE3C /* Resources */,
-				7F02A6FC850D5F6B409EC235 /* [CP] Embed Pods Frameworks */,
+				C81F88A7BF1D994EEBFEADE0 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -290,7 +291,24 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		062B12E00D56CE144C3C5FEE /* [CP] Check Pods Manifest.lock */ = {
+		2F5E6E403BF9978A51E59C1A /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-MixboxDemo/Pods-MixboxDemo-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-MixboxDemo/Pods-MixboxDemo-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MixboxDemo/Pods-MixboxDemo-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		45C02984DDE00A0117774EAC /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -312,7 +330,7 @@
 			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;
 		};
-		29F5F14101BCD60887E44914 /* [CP] Check Pods Manifest.lock */ = {
+		790EC0DFA233B469202FB587 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -334,7 +352,7 @@
 			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;
 		};
-		7F02A6FC850D5F6B409EC235 /* [CP] Embed Pods Frameworks */ = {
+		C81F88A7BF1D994EEBFEADE0 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -351,23 +369,6 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MixboxDemoUITests/Pods-MixboxDemoUITests-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		ABAAACC3A14F745FB1F8B325 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-MixboxDemo/Pods-MixboxDemo-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-MixboxDemo/Pods-MixboxDemo-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MixboxDemo/Pods-MixboxDemo-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -542,7 +543,7 @@
 		};
 		F88DE64121189FF000C2AE3C /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 49AACDDB7411F96265B5709E /* Pods-MixboxDemo.debug.xcconfig */;
+			baseConfigurationReference = 654ABB64373F74C8FC9C28FE /* Pods-MixboxDemo.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
@@ -560,7 +561,7 @@
 		};
 		F88DE64221189FF000C2AE3C /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1F41B18CDE88CC687D3D5098 /* Pods-MixboxDemo.release.xcconfig */;
+			baseConfigurationReference = 24FC6430CE8DA3B27F063604 /* Pods-MixboxDemo.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
@@ -578,7 +579,7 @@
 		};
 		F88DE64421189FF000C2AE3C /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = BC2D50ED745D64DBECEC175E /* Pods-MixboxDemoUITests.debug.xcconfig */;
+			baseConfigurationReference = 7BB07A4C2BFCD57EB418764C /* Pods-MixboxDemoUITests.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
@@ -598,7 +599,7 @@
 		};
 		F88DE64521189FF000C2AE3C /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = FA7CB4E207613D7EE8D38EFE /* Pods-MixboxDemoUITests.release.xcconfig */;
+			baseConfigurationReference = B43967902400B8EE22B66526 /* Pods-MixboxDemoUITests.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;

diff --git a/Demo/MixboxDemo/AppDelegate.swift b/Demo/MixboxDemo/AppDelegate.swift
@@ -1,32 +1,31 @@
-//
-//  AppDelegate.swift
-//  MixboxDemo
-//
-//  Created by Artem Razinov on 06.08.2018.
-//  Copyright © 2018 Mixbox. All rights reserved.
-//
-
 import UIKit
+
+#if DEBUG
 import MixboxInAppServices
+#endif
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
+
+    #if DEBUG
     var mixboxInAppServices: MixboxInAppServices?
+    #endif
 
     func application(
         _ application: UIApplication,
         didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?)
         -> Bool
     {
+        #if DEBUG
         if ProcessInfo.processInfo.environment["MIXBOX_ENABLE_IN_APP_SERVICES"] == "true" {
             let mixboxInAppServices = MixboxInAppServices()
 
             self.mixboxInAppServices = mixboxInAppServices
 
             mixboxInAppServices?.start()
-            mixboxInAppServices?.handleUiBecomeVisible()
         }
+        #endif
 
         return true
     }

diff --git a/Demo/Podfile b/Demo/Podfile
@@ -1,9 +1,3 @@
-# TODO: Improve local debug of podspecs
-if ENV['LOCAL_SPEC_REPO'] == "true" 
-  source ENV['HOME'] + '/.cocoapods/repos/MixboxSpecRepo'
-  source 'https://github.com/CocoaPods/Specs'
-end
-
 project 'MixboxDemo.xcodeproj'
 workspace 'MixboxDemo.xcworkspace'
 
@@ -12,25 +6,26 @@ platform :ios, :deployment_target => '9.0'
 inhibit_all_warnings!
 use_frameworks!
 
-### TARGETS
-
 target 'MixboxDemo' do
-  pod 'MixboxInAppServices', '0.2.0'
+  pod 'MixboxInAppServices', '0.2.2'
 end
 
 target 'MixboxDemoUITests' do
-  inherit! :search_paths
-
-  pod 'MixboxXcuiDriver', '0.2.0'
-  pod 'MixboxIpcSbtuiClient', '0.2.0'
+  pod 'MixboxXcuiDriver', '0.2.2'
 end
-
+  
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
-      config.build_settings['OTHER_SWIFT_FLAGS'] ||= ['$(inherited)', '-Onone', '-D', 'DEBUG', '-D', 'MIXBOX_ENABLE_IN_APP_SERVICES']
-      config.build_settings['ENABLE_TESTABILITY'] = 'YES'
-      config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', 'DEBUG=1', 'ENABLE_UITUNNEL=1', 'MIXBOX_ENABLE_IN_APP_SERVICES=1']
+      if config.name == 'Debug'
+        # NOTE: You may want to add add '-Onone' for your debug builds so they will be compiled faster.
+
+        # MIXBOX_ENABLE_IN_APP_SERVICES enables code for testing. You should not include that code in release builds.
+        config.build_settings['OTHER_SWIFT_FLAGS'] ||= ['$(inherited)', '-D', 'MIXBOX_ENABLE_IN_APP_SERVICES']
+
+        # ENABLE_UITUNNEL is a same thing, but for SBTUITestTunnel library. We're planning to stop using it. If there is no such dependency now, remove this definition.
+        config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', 'ENABLE_UITUNNEL=1', 'MIXBOX_ENABLE_IN_APP_SERVICES=1']
+      end
     end
   end
 end