From 0bcbdd022a7e144c4231521ca5421eaf82ea1773 Mon Sep 17 00:00:00 2001 From: "Artyom Y. Razinov" Date: Wed, 29 May 2019 04:19:24 +0300 Subject: [PATCH] Fix building Demo, bump version to 0.2.2 --- Demo/MixboxDemo.xcodeproj/project.pbxproj | 99 ++++++------ Demo/MixboxDemo/AppDelegate.swift | 17 +- Demo/Podfile | 29 ++-- .../SBTUITestTunnel+Dummy.swift | 145 ------------------ .../SBTUITestTunnelServer+Dummy.swift | 8 - .../SbtuiNetworkRecordsProvider.swift | 4 - .../Stubbing/Model/SbtuiStubRequest.swift | 4 - .../Stubbing/Model/SbtuiStubResponse.swift | 4 - .../SbtuiStubApplierImpl.swift | 4 - MixboxAllure.podspec | 9 +- MixboxArtifacts.podspec | 9 +- MixboxBuiltinIpc.podspec | 9 +- MixboxFakeSettingsAppMain.podspec | 9 +- MixboxFoundation.podspec | 9 +- MixboxGray.podspec | 8 +- MixboxInAppServices.podspec | 9 +- MixboxIpc.podspec | 9 +- MixboxIpcCommon.podspec | 9 +- MixboxIpcSbtuiClient.podspec | 9 +- MixboxIpcSbtuiHost.podspec | 9 +- MixboxReporting.podspec | 9 +- MixboxTestability.podspec | 9 +- MixboxTestsFoundation.podspec | 9 +- MixboxUiKit.podspec | 9 +- MixboxUiTestsFoundation.podspec | 9 +- MixboxXcuiDriver.podspec | 9 +- Tests/Podfile | 4 - Tests/Podfile.lock | 64 ++++---- ci/builds/check_bumping_version | 32 +++- ci/builds/push_specs | 28 +++- .../AllTests/Tests/Simctl/SimctlTests.swift | 2 +- 31 files changed, 175 insertions(+), 421 deletions(-) delete mode 100644 Frameworks/IpcSbtuiClient/SBTUITestTunnel+Dummy.swift delete mode 100644 Frameworks/IpcSbtuiHost/SBTUITestTunnelServer+Dummy.swift diff --git a/Demo/MixboxDemo.xcodeproj/project.pbxproj b/Demo/MixboxDemo.xcodeproj/project.pbxproj index 396982e6c..598d135ea 100644 --- 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 = ""; }; - 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 = ""; }; - 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 = ""; }; + 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 = ""; }; + 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 = ""; }; + 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 = ""; }; + 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 = ""; }; 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 = ""; }; F88DE62B21189FED00C2AE3C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; @@ -57,7 +58,6 @@ F890FDBF2119C415004F1B7E /* BasePageObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BasePageObject.swift; sourceTree = ""; }; F890FDC12119C43B004F1B7E /* BasePageObjects.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BasePageObjects.swift; sourceTree = ""; }; F890FDC42119C74D004F1B7E /* XcuiActivityStepLogger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XcuiActivityStepLogger.swift; sourceTree = ""; }; - 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 = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -65,7 +65,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F2299881ADC33D367DF012BC /* Pods_MixboxDemo.framework in Frameworks */, + 3FFB1A78875EB28DE5161182 /* Pods_MixboxDemo.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -73,29 +73,30 @@ 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 = ""; }; - 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 = ""; @@ -106,8 +107,8 @@ F88DE62521189FED00C2AE3C /* MixboxDemo */, F88DE63A21189FF000C2AE3C /* MixboxDemoUITests */, F88DE62421189FED00C2AE3C /* Products */, - AF381C6351C302CB2341222D /* Pods */, - C37C689DA591D847347828DC /* Frameworks */, + D2C3CDFB358BDCA853EF5463 /* Frameworks */, + 825B3F431B6B1A576B11DFF7 /* Pods */, ); sourceTree = ""; }; @@ -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 index f2b33af82..07f6efa51 100644 --- 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 index eee64baae..6a2ce2829 100644 --- 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 diff --git a/Frameworks/IpcSbtuiClient/SBTUITestTunnel+Dummy.swift b/Frameworks/IpcSbtuiClient/SBTUITestTunnel+Dummy.swift deleted file mode 100644 index 76e3a6f7d..000000000 --- a/Frameworks/IpcSbtuiClient/SBTUITestTunnel+Dummy.swift +++ /dev/null @@ -1,145 +0,0 @@ -// To suppress warning when linting podspec -#if MIXBOX_CI_IS_LINTING_PODSPECS - -import Foundation -import XCTest - -open class SBTUITunneledApplication : XCUIApplication { - open func launchTunnel() {} - open func launchTunnel(startupBlock: (() -> Void)? = nil) {} - open func launchTunnel(withOptions options: [String], startupBlock: (() -> Void)? = nil) {} - open func launchConnectionless(_ command: @escaping (String, [String : String]) -> String) {} - open class func setConnectionTimeout(_ timeout: TimeInterval) {} - open func quit() {} - open func stubRequests(matching match: SBTRequestMatch, response: SBTStubResponse) -> String? { return nil } - open func stubRequests(matching match: SBTRequestMatch, response: SBTStubResponse, removeAfterIterations iterations: UInt) -> String? { return nil } - open func stubRequestsRemove(withId stubId: String) -> Bool { return false } - open func stubRequestsRemove(withIds stubIds: [String]) -> Bool { return false } - open func stubRequestsRemoveAll() -> Bool { return false } - open func rewriteRequests(matching match: SBTRequestMatch, rewrite: SBTRewrite) -> String? { return nil } - open func rewriteRequests(matching match: SBTRequestMatch, rewrite: SBTRewrite, removeAfterIterations iterations: UInt) -> String? { return nil } - open func rewriteRequestsRemove(withId rewriteId: String) -> Bool { return false } - open func rewriteRequestsRemove(withIds rewriteIds: [String]) -> Bool { return false } - open func rewriteRequestsRemoveAll() -> Bool { return false } - open func monitorRequests(matching match: SBTRequestMatch) -> String? { return nil } - open func monitoredRequestsPeekAll() -> [SBTMonitoredNetworkRequest] { return [] } - open func monitoredRequestsFlushAll() -> [SBTMonitoredNetworkRequest] { return [] } - open func monitorRequestRemove(withId reqId: String) -> Bool { return false } - open func monitorRequestRemove(withIds reqIds: [String]) -> Bool { return false } - open func monitorRequestRemoveAll() -> Bool { return false } - open func waitForMonitoredRequests(matching match: SBTRequestMatch, timeout: TimeInterval) -> Bool { return false } - open func waitForMonitoredRequests(matching match: SBTRequestMatch, timeout: TimeInterval, iterations: UInt) -> Bool { return false } - open func throttleRequests(matching match: SBTRequestMatch, responseTime: TimeInterval) -> String? { return nil } - open func throttleRequestRemove(withId reqId: String) -> Bool { return false } - open func throttleRequestRemove(withIds reqIds: [String]) -> Bool { return false } - open func throttleRequestRemoveAll() -> Bool { return false } - open func blockCookiesInRequests(matching match: SBTRequestMatch) -> String? { return nil } - open func blockCookiesInRequests(matching match: SBTRequestMatch, iterations: UInt) -> String? { return nil } - open func blockCookiesRequestsRemove(withId reqId: String) -> Bool { return false } - open func blockCookiesRequestsRemove(withIds reqIds: [String]) -> Bool { return false } - open func blockCookiesRequestsRemoveAll() -> Bool { return false } - open func userDefaultsSetObject(_ object: NSCoding, forKey key: String) -> Bool { return false } - open func userDefaultsRemoveObject(forKey key: String) -> Bool { return false } - open func userDefaultsObject(forKey key: String) -> Any? { return nil } - open func userDefaultsReset() -> Bool { return false } - open func userDefaultsSetObject(_ object: NSCoding, forKey key: String, suiteName: String) -> Bool { return false } - open func userDefaultsRemoveObject(forKey key: String, suiteName: String) -> Bool { return false } - open func userDefaultsObject(forKey key: String, suiteName: String) -> Any? { return nil } - open func userDefaultsResetSuiteName(_ suiteName: String) -> Bool { return false } - open func mainBundleInfoDictionary() -> [String : Any]? { return nil } - open func uploadItem(atPath srcPath: String, toPath destPath: String?, relativeTo baseFolder: FileManager.SearchPathDirectory) -> Bool { return false } - open func downloadItems(fromPath path: String, relativeTo baseFolder: FileManager.SearchPathDirectory) -> [Data]? { return nil } - open func performCustomCommandNamed(_ commandName: String, object: Any?) -> Any? { return nil } - open func setUserInterfaceAnimationsEnabled(_ enabled: Bool) -> Bool { return false } - open func userInterfaceAnimationsEnabled() -> Bool { return false } - open func setUserInterfaceAnimationSpeed(_ speed: Int) -> Bool { return false } - open func userInterfaceAnimationSpeed() -> Int { return 0 } -} - -open class SBTRequestMatch : NSObject/*, NSCoding*/ { - open var url: String? { return nil } - open var query: [String]? { return nil } - open var method: String? { return nil } - public init(url: String) {} - public init(url: String, query: [String]) {} - public init(url: String, query: [String], method: String) {} - public init(url: String, method: String) {} - public init(query: [String]) {} - public init(query: [String], method: String) {} - public init(method: String) {} -} - -open class SBTMonitoredNetworkRequest : NSObject/*, NSCoding*/ { - public override init() {} - open func responseString() -> String? { return nil } - open func responseJSON() -> Any? { return nil } - open func requestString() -> String? { return nil } - open func requestJSON() -> Any? { return nil } - open func matches(_ match: SBTRequestMatch) -> Bool { return false } - open var timestamp: TimeInterval { return 0 } - open var requestTime: TimeInterval { return 0 } - open var request: URLRequest? { return nil } - open var originalRequest: URLRequest? { return nil } - open var response: HTTPURLResponse? { return nil } - open var responseData: Data? { return nil } - open var isStubbed: Bool { return false } - open var isRewritten: Bool { return false } -} - -open class SBTRewriteReplacement : NSObject/*, NSCoding*/ { - public init(find: String, replace: String) {} - open func replace(_ string: String) -> String { return "" } -} - -open class SBTRewrite : NSObject/*, NSCoding*/ { - public convenience init(responseReplacement: [SBTRewriteReplacement], headersReplacement responseHeadersReplacement: [String : String], responseCode: Int) { self.init() } - public convenience init(responseReplacement: [SBTRewriteReplacement], headersReplacement responseHeadersReplacement: [String : String]) { self.init() } - public convenience init(responseReplacement: [SBTRewriteReplacement]) { self.init() } - public convenience init(responseHeadersReplacement: [String : String]) { self.init() } - public convenience init(responseStatusCode statusCode: Int) { self.init() } - public convenience init(requestReplacement: [SBTRewriteReplacement], requestHeadersReplacement: [String : String]) { self.init() } - public convenience init(requestReplacement: [SBTRewriteReplacement]) { self.init() } - public convenience init(requestHeadersReplacement: [String : String]) { self.init() } - public convenience init(requestUrlReplacement urlReplacement: [SBTRewriteReplacement]) { self.init() } - public convenience init(urlReplacement: [SBTRewriteReplacement]?, requestReplacement: [SBTRewriteReplacement]?, requestHeadersReplacement: [String : String]?, responseReplacement: [SBTRewriteReplacement]?, responseHeadersReplacement: [String : String]?, responseCode: Int) { self.init() } - public override init() {} - open func rewrite(_ url: URL) -> URL { return URL(fileURLWithPath: "") } - open func rewriteRequestHeaders(_ requestHeaders: [AnyHashable : Any]) -> [AnyHashable : Any] { return [:] } - open func rewriteResponseHeaders(_ responseHeaders: [AnyHashable : Any]) -> [AnyHashable : Any] { return [:] } - open func rewriteRequestBody(_ requestBody: Data) -> Data { return Data() } - open func rewriteResponseBody(_ responseBody: Data) -> Data { return Data() } - open func rewriteStatusCode(_ statusCode: Int) -> Int { return 0 } -} - -open class SBTStubResponse : NSObject/*, NSCoding*/ { - open class func failure(withCustomErrorCode code: Int, responseTime: TimeInterval) -> SBTStubResponse { return SBTStubResponse() } - public override init() {} - public convenience init(response: Any, headers: [String : String], contentType: String, returnCode: Int, responseTime: TimeInterval) { self.init() } - public convenience init(response: Any) { self.init() } - public convenience init(response: Any, responseTime: TimeInterval) { self.init() } - public convenience init(response: Any, returnCode: Int) { self.init() } - public convenience init(response: Any, returnCode: Int, responseTime: TimeInterval) { self.init() } - public convenience init(response: Any, contentType: String, returnCode: Int) { self.init() } - public convenience init(response: Any, headers: [String : String]?, returnCode: Int, responseTime: TimeInterval) { self.init() } - public convenience init(fileNamed filename: String) { self.init() } - public convenience init(fileNamed filename: String, responseTime: TimeInterval) { self.init() } - public convenience init(fileNamed filename: String, returnCode: Int) { self.init() } - public convenience init(fileNamed filename: String, returnCode: Int, responseTime: TimeInterval) { self.init() } - public convenience init(fileNamed filename: String, headers: [String : String]?, returnCode: Int, responseTime: TimeInterval) { self.init() } - - open var data: Data { return Data() } - open var contentType: String { return "" } - open var headers: [AnyHashable : Any] { return [:] } - open var returnCode: Int { return 0 } - open var responseTime: TimeInterval { return 0 } - open var failureCode: Int { return 0 } - open class func setDefaultResponseTime(_ responseTime: TimeInterval) {} - open class func setDefaultReturnCode(_ returnCode: Int) {} - open class func setDictionaryDefaultContentType(_ contentType: String) {} - open class func setDataDefaultContentType(_ contentType: String) {} - open class func setStringDefaultContentType(_ contentType: String) {} - open class func resetUnspecifiedDefaults() {} -} - - -#endif diff --git a/Frameworks/IpcSbtuiHost/SBTUITestTunnelServer+Dummy.swift b/Frameworks/IpcSbtuiHost/SBTUITestTunnelServer+Dummy.swift deleted file mode 100644 index 27e59e565..000000000 --- a/Frameworks/IpcSbtuiHost/SBTUITestTunnelServer+Dummy.swift +++ /dev/null @@ -1,8 +0,0 @@ -#if MIXBOX_CI_IS_LINTING_PODSPECS - public final class SBTUITestTunnelServer { - public static func takeOff() {} - public static func takeOffCompleted(_ completed: Bool) {} - public static func registerCustomCommandNamed(_ commandName: String, block: ((NSObject?) -> NSObject?)) {} - public static func unregisterCommandNamed(_ commandName: String) {} - } -#endif diff --git a/Frameworks/XcuiDriver/Application/Launching/LaunchableApplication/Sbtui/Mocking/Recording/SbtuiNetworkRecordsProvider.swift b/Frameworks/XcuiDriver/Application/Launching/LaunchableApplication/Sbtui/Mocking/Recording/SbtuiNetworkRecordsProvider.swift index 32c3e0ca2..dcb5b0e68 100644 --- a/Frameworks/XcuiDriver/Application/Launching/LaunchableApplication/Sbtui/Mocking/Recording/SbtuiNetworkRecordsProvider.swift +++ b/Frameworks/XcuiDriver/Application/Launching/LaunchableApplication/Sbtui/Mocking/Recording/SbtuiNetworkRecordsProvider.swift @@ -2,10 +2,6 @@ import SBTUITestTunnel import MixboxUiTestsFoundation import MixboxReporting -#if MIXBOX_CI_IS_LINTING_PODSPECS -import MixboxIpcSbtuiClient -#endif - // TODO: Нормально абстрагироваться от SBTMonitoredNetworkRequest public final class SbtuiNetworkRecordsProvider: NetworkRecordsProvider, diff --git a/Frameworks/XcuiDriver/Application/Launching/LaunchableApplication/Sbtui/Mocking/Stubbing/Model/SbtuiStubRequest.swift b/Frameworks/XcuiDriver/Application/Launching/LaunchableApplication/Sbtui/Mocking/Stubbing/Model/SbtuiStubRequest.swift index b88e704a1..14fb8d444 100644 --- a/Frameworks/XcuiDriver/Application/Launching/LaunchableApplication/Sbtui/Mocking/Stubbing/Model/SbtuiStubRequest.swift +++ b/Frameworks/XcuiDriver/Application/Launching/LaunchableApplication/Sbtui/Mocking/Stubbing/Model/SbtuiStubRequest.swift @@ -1,10 +1,6 @@ import SBTUITestTunnel import MixboxUiTestsFoundation -#if MIXBOX_CI_IS_LINTING_PODSPECS -import MixboxIpcSbtuiClient -#endif - public final class SbtuiStubRequest: Hashable { public let urlPattern: String public let query: [String]? diff --git a/Frameworks/XcuiDriver/Application/Launching/LaunchableApplication/Sbtui/Mocking/Stubbing/Model/SbtuiStubResponse.swift b/Frameworks/XcuiDriver/Application/Launching/LaunchableApplication/Sbtui/Mocking/Stubbing/Model/SbtuiStubResponse.swift index fafc25b7f..7a5740b13 100644 --- a/Frameworks/XcuiDriver/Application/Launching/LaunchableApplication/Sbtui/Mocking/Stubbing/Model/SbtuiStubResponse.swift +++ b/Frameworks/XcuiDriver/Application/Launching/LaunchableApplication/Sbtui/Mocking/Stubbing/Model/SbtuiStubResponse.swift @@ -1,10 +1,6 @@ import SBTUITestTunnel import MixboxUiTestsFoundation -#if MIXBOX_CI_IS_LINTING_PODSPECS -import MixboxIpcSbtuiClient -#endif - public final class SbtuiStubResponse { public let value: StubResponseBuilderResponseValue public let headers: [String: String] diff --git a/Frameworks/XcuiDriver/Application/Launching/LaunchableApplication/Sbtui/Mocking/Stubbing/SbtuiStubApplier/SbtuiStubApplierImpl.swift b/Frameworks/XcuiDriver/Application/Launching/LaunchableApplication/Sbtui/Mocking/Stubbing/SbtuiStubApplier/SbtuiStubApplierImpl.swift index a1712f2cc..293df4c99 100644 --- a/Frameworks/XcuiDriver/Application/Launching/LaunchableApplication/Sbtui/Mocking/Stubbing/SbtuiStubApplier/SbtuiStubApplierImpl.swift +++ b/Frameworks/XcuiDriver/Application/Launching/LaunchableApplication/Sbtui/Mocking/Stubbing/SbtuiStubApplier/SbtuiStubApplierImpl.swift @@ -1,10 +1,6 @@ import SBTUITestTunnel import MixboxFoundation -#if MIXBOX_CI_IS_LINTING_PODSPECS -import MixboxIpcSbtuiClient -#endif - public final class SbtuiStubApplierImpl: SbtuiStubApplier, ApplicationLifecycleObserver { private let tunneledApplication: SBTUITunneledApplication private var stubsToApply: [SbtuiStub] = [] { diff --git a/MixboxAllure.podspec b/MixboxAllure.podspec index 059862fec..69bc30fa1 100644 --- a/MixboxAllure.podspec +++ b/MixboxAllure.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'MixboxAllure' s.module_name = s.name - s.version = '0.2.0' + s.version = '0.2.2' s.summary = s.name s.homepage = 'https://github.com/avito-tech/Mixbox' s.license = 'MIT' @@ -15,11 +15,4 @@ Pod::Spec.new do |s| s.dependency 'MixboxArtifacts' s.dependency 'MixboxFoundation' - - xcconfig = {} - if ENV['MIXBOX_CI_IS_LINTING_PODSPECS'] == 'true' - xcconfig['OTHER_SWIFT_FLAGS'] = '$(inherited) -D MIXBOX_CI_IS_LINTING_PODSPECS -D MIXBOX_ENABLE_IN_APP_SERVICES' - xcconfig['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) MIXBOX_CI_IS_LINTING_PODSPECS=1 MIXBOX_ENABLE_IN_APP_SERVICES=1' - end - s.xcconfig = xcconfig end diff --git a/MixboxArtifacts.podspec b/MixboxArtifacts.podspec index 0710ccd28..257196eb5 100644 --- a/MixboxArtifacts.podspec +++ b/MixboxArtifacts.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'MixboxArtifacts' s.module_name = s.name - s.version = '0.2.0' + s.version = '0.2.2' s.summary = s.name s.homepage = 'https://github.com/avito-tech/Mixbox' s.license = 'MIT' @@ -12,11 +12,4 @@ Pod::Spec.new do |s| s.swift_version = '4.0' s.requires_arc = true s.source_files = 'Frameworks/Artifacts/**/*.{swift,h,m,md}' - - xcconfig = {} - if ENV['MIXBOX_CI_IS_LINTING_PODSPECS'] == 'true' - xcconfig['OTHER_SWIFT_FLAGS'] = '$(inherited) -D MIXBOX_CI_IS_LINTING_PODSPECS -D MIXBOX_ENABLE_IN_APP_SERVICES' - xcconfig['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) MIXBOX_CI_IS_LINTING_PODSPECS=1 MIXBOX_ENABLE_IN_APP_SERVICES=1' - end - s.xcconfig = xcconfig end \ No newline at end of file diff --git a/MixboxBuiltinIpc.podspec b/MixboxBuiltinIpc.podspec index 6be6e36b2..0a514c785 100644 --- a/MixboxBuiltinIpc.podspec +++ b/MixboxBuiltinIpc.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'MixboxBuiltinIpc' s.module_name = s.name - s.version = '0.2.0' + s.version = '0.2.2' s.summary = s.name s.homepage = 'https://github.com/avito-tech/Mixbox' s.license = 'MIT' @@ -15,11 +15,4 @@ Pod::Spec.new do |s| s.dependency 'MixboxIpc' s.dependency 'GCDWebServer' - - xcconfig = {} - if ENV['MIXBOX_CI_IS_LINTING_PODSPECS'] == 'true' - xcconfig['OTHER_SWIFT_FLAGS'] = '$(inherited) -D MIXBOX_CI_IS_LINTING_PODSPECS -D MIXBOX_ENABLE_IN_APP_SERVICES' - xcconfig['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) MIXBOX_CI_IS_LINTING_PODSPECS=1 MIXBOX_ENABLE_IN_APP_SERVICES=1' - end - s.xcconfig = xcconfig end \ No newline at end of file diff --git a/MixboxFakeSettingsAppMain.podspec b/MixboxFakeSettingsAppMain.podspec index f8ecdb787..fb017472b 100644 --- a/MixboxFakeSettingsAppMain.podspec +++ b/MixboxFakeSettingsAppMain.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'MixboxFakeSettingsAppMain' s.module_name = s.name - s.version = '0.2.0' + s.version = '0.2.2' s.summary = s.name s.homepage = 'https://github.com/avito-tech/Mixbox' s.license = 'MIT' @@ -12,11 +12,4 @@ Pod::Spec.new do |s| s.swift_version = '4.0' s.requires_arc = true s.source_files = 'Frameworks/FakeSettingsAppMain/**/*.{swift,h,m,md}' - - xcconfig = {} - if ENV['MIXBOX_CI_IS_LINTING_PODSPECS'] == 'true' - xcconfig['OTHER_SWIFT_FLAGS'] = '$(inherited) -D MIXBOX_CI_IS_LINTING_PODSPECS -D MIXBOX_ENABLE_IN_APP_SERVICES' - xcconfig['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) MIXBOX_CI_IS_LINTING_PODSPECS=1 MIXBOX_ENABLE_IN_APP_SERVICES=1' - end - s.xcconfig = xcconfig end \ No newline at end of file diff --git a/MixboxFoundation.podspec b/MixboxFoundation.podspec index ca5209081..dc5a8795f 100644 --- a/MixboxFoundation.podspec +++ b/MixboxFoundation.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'MixboxFoundation' s.module_name = s.name - s.version = '0.2.0' + s.version = '0.2.2' s.summary = 'Shared simple general purpose utilities' s.homepage = 'https://github.com/avito-tech/Mixbox' s.license = 'MIT' @@ -12,11 +12,4 @@ Pod::Spec.new do |s| s.swift_version = '4.0' s.requires_arc = true s.source_files = 'Frameworks/Foundation/**/*.{swift,h,m,md}' - - xcconfig = {} - if ENV['MIXBOX_CI_IS_LINTING_PODSPECS'] == 'true' - xcconfig['OTHER_SWIFT_FLAGS'] = '$(inherited) -D MIXBOX_CI_IS_LINTING_PODSPECS -D MIXBOX_ENABLE_IN_APP_SERVICES' - xcconfig['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) MIXBOX_CI_IS_LINTING_PODSPECS=1 MIXBOX_ENABLE_IN_APP_SERVICES=1' - end - s.xcconfig = xcconfig end \ No newline at end of file diff --git a/MixboxGray.podspec b/MixboxGray.podspec index fa2d8a8ed..d430519f0 100644 --- a/MixboxGray.podspec +++ b/MixboxGray.podspec @@ -19,14 +19,8 @@ Pod::Spec.new do |s| s.frameworks = 'XCTest', 'IOKit', 'XCTAutomationSupport' - xcconfig = { + s.xcconfig = { 'LD_RUNPATH_SEARCH_PATHS' => '$(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks" "$(PLATFORM_DIR)/Developer/Library/PrivateFrameworks"', 'FRAMEWORK_SEARCH_PATHS' => '$(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks" "$(PLATFORM_DIR)/Developer/Library/PrivateFrameworks"' } - if ENV['MIXBOX_CI_IS_LINTING_PODSPECS'] == 'true' - xcconfig['OTHER_SWIFT_FLAGS'] = '$(inherited) -D MIXBOX_CI_IS_LINTING_PODSPECS -D MIXBOX_ENABLE_IN_APP_SERVICES' - xcconfig['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) MIXBOX_CI_IS_LINTING_PODSPECS=1 MIXBOX_ENABLE_IN_APP_SERVICES=1' - end - s.xcconfig = xcconfig - end diff --git a/MixboxInAppServices.podspec b/MixboxInAppServices.podspec index dd9902345..eaf9855c1 100644 --- a/MixboxInAppServices.podspec +++ b/MixboxInAppServices.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'MixboxInAppServices' s.module_name = s.name - s.version = '0.2.0' + s.version = '0.2.2' s.summary = s.name s.homepage = 'https://github.com/avito-tech/Mixbox' s.license = 'MIT' @@ -21,12 +21,7 @@ Pod::Spec.new do |s| s.frameworks = 'IOKit', 'UIKit' - xcconfig = { + s.xcconfig = { 'FRAMEWORK_SEARCH_PATHS' => '$(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks"' } - if ENV['MIXBOX_CI_IS_LINTING_PODSPECS'] == 'true' - xcconfig['OTHER_SWIFT_FLAGS'] = '$(inherited) -D MIXBOX_CI_IS_LINTING_PODSPECS -D MIXBOX_ENABLE_IN_APP_SERVICES' - xcconfig['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) MIXBOX_CI_IS_LINTING_PODSPECS=1 MIXBOX_ENABLE_IN_APP_SERVICES=1' - end - s.xcconfig = xcconfig end diff --git a/MixboxIpc.podspec b/MixboxIpc.podspec index d15ba867e..8cd66eae2 100644 --- a/MixboxIpc.podspec +++ b/MixboxIpc.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'MixboxIpc' s.module_name = s.name - s.version = '0.2.0' + s.version = '0.2.2' s.summary = s.name s.homepage = 'https://github.com/avito-tech/Mixbox' s.license = 'MIT' @@ -14,11 +14,4 @@ Pod::Spec.new do |s| s.source_files = 'Frameworks/Ipc/**/*.{swift,h,m,md}' s.dependency 'MixboxFoundation' - - xcconfig = {} - if ENV['MIXBOX_CI_IS_LINTING_PODSPECS'] == 'true' - xcconfig['OTHER_SWIFT_FLAGS'] = '$(inherited) -D MIXBOX_CI_IS_LINTING_PODSPECS -D MIXBOX_ENABLE_IN_APP_SERVICES' - xcconfig['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) MIXBOX_CI_IS_LINTING_PODSPECS=1 MIXBOX_ENABLE_IN_APP_SERVICES=1' - end - s.xcconfig = xcconfig end \ No newline at end of file diff --git a/MixboxIpcCommon.podspec b/MixboxIpcCommon.podspec index 5a9ae9678..c5232eb61 100644 --- a/MixboxIpcCommon.podspec +++ b/MixboxIpcCommon.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'MixboxIpcCommon' s.module_name = s.name - s.version = '0.2.0' + s.version = '0.2.2' s.summary = s.name s.homepage = 'https://github.com/avito-tech/Mixbox' s.license = 'MIT' @@ -14,11 +14,4 @@ Pod::Spec.new do |s| s.source_files = 'Frameworks/IpcCommon/**/*.{swift,h,m,md}' s.dependency 'MixboxIpc' - - xcconfig = {} - if ENV['MIXBOX_CI_IS_LINTING_PODSPECS'] == 'true' - xcconfig['OTHER_SWIFT_FLAGS'] = '$(inherited) -D MIXBOX_CI_IS_LINTING_PODSPECS -D MIXBOX_ENABLE_IN_APP_SERVICES' - xcconfig['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) MIXBOX_CI_IS_LINTING_PODSPECS=1 MIXBOX_ENABLE_IN_APP_SERVICES=1' - end - s.xcconfig = xcconfig end \ No newline at end of file diff --git a/MixboxIpcSbtuiClient.podspec b/MixboxIpcSbtuiClient.podspec index 4113358ea..ee18b3ff1 100644 --- a/MixboxIpcSbtuiClient.podspec +++ b/MixboxIpcSbtuiClient.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'MixboxIpcSbtuiClient' s.module_name = s.name - s.version = '0.2.0' + s.version = '0.2.2' s.summary = s.name s.homepage = 'https://github.com/avito-tech/Mixbox' s.license = 'MIT' @@ -22,11 +22,4 @@ Pod::Spec.new do |s| s.framework = "XCTest" s.user_target_xcconfig = { 'FRAMEWORK_SEARCH_PATHS' => '$(PLATFORM_DIR)/Developer/Library/Frameworks' } - - xcconfig = {} - if ENV['MIXBOX_CI_IS_LINTING_PODSPECS'] == 'true' - xcconfig['OTHER_SWIFT_FLAGS'] = '$(inherited) -D MIXBOX_CI_IS_LINTING_PODSPECS -D MIXBOX_ENABLE_IN_APP_SERVICES' - xcconfig['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) MIXBOX_CI_IS_LINTING_PODSPECS=1 MIXBOX_ENABLE_IN_APP_SERVICES=1' - end - s.xcconfig = xcconfig end \ No newline at end of file diff --git a/MixboxIpcSbtuiHost.podspec b/MixboxIpcSbtuiHost.podspec index 96eb5f882..afd31bee3 100644 --- a/MixboxIpcSbtuiHost.podspec +++ b/MixboxIpcSbtuiHost.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'MixboxIpcSbtuiHost' s.module_name = s.name - s.version = '0.2.0' + s.version = '0.2.2' s.summary = s.name s.homepage = 'https://github.com/avito-tech/Mixbox' s.license = 'MIT' @@ -15,11 +15,4 @@ Pod::Spec.new do |s| s.dependency 'MixboxIpc' s.dependency 'SBTUITestTunnel/Server', '~> 3.0.6' - - xcconfig = {} - if ENV['MIXBOX_CI_IS_LINTING_PODSPECS'] == 'true' - xcconfig['OTHER_SWIFT_FLAGS'] = '$(inherited) -D MIXBOX_CI_IS_LINTING_PODSPECS -D MIXBOX_ENABLE_IN_APP_SERVICES' - xcconfig['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) MIXBOX_CI_IS_LINTING_PODSPECS=1 MIXBOX_ENABLE_IN_APP_SERVICES=1' - end - s.xcconfig = xcconfig end \ No newline at end of file diff --git a/MixboxReporting.podspec b/MixboxReporting.podspec index 7cb6bebcd..136460482 100644 --- a/MixboxReporting.podspec +++ b/MixboxReporting.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'MixboxReporting' s.module_name = s.name - s.version = '0.2.0' + s.version = '0.2.2' s.summary = s.name s.homepage = 'https://github.com/avito-tech/Mixbox' s.license = 'MIT' @@ -15,12 +15,5 @@ Pod::Spec.new do |s| s.dependency 'MixboxArtifacts' s.dependency 'MixboxFoundation' - - xcconfig = {} - if ENV['MIXBOX_CI_IS_LINTING_PODSPECS'] == 'true' - xcconfig['OTHER_SWIFT_FLAGS'] = '$(inherited) -D MIXBOX_CI_IS_LINTING_PODSPECS -D MIXBOX_ENABLE_IN_APP_SERVICES' - xcconfig['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) MIXBOX_CI_IS_LINTING_PODSPECS=1 MIXBOX_ENABLE_IN_APP_SERVICES=1' - end - s.xcconfig = xcconfig end diff --git a/MixboxTestability.podspec b/MixboxTestability.podspec index 0e629ad03..ac0512514 100644 --- a/MixboxTestability.podspec +++ b/MixboxTestability.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'MixboxTestability' s.module_name = 'MixboxTestability' - s.version = '0.2.0' + s.version = '0.2.2' s.summary = 'MixboxTestability makes your UI more testable' s.homepage = 'https://github.com/avito-tech/Mixbox' s.license = 'MIT' @@ -12,11 +12,4 @@ Pod::Spec.new do |s| s.swift_version = '4.0' s.requires_arc = true s.source_files = 'Frameworks/Testability/**/*.{swift,h,m,md}' - - xcconfig = {} - if ENV['MIXBOX_CI_IS_LINTING_PODSPECS'] == 'true' - xcconfig['OTHER_SWIFT_FLAGS'] = '$(inherited) -D MIXBOX_CI_IS_LINTING_PODSPECS -D MIXBOX_ENABLE_IN_APP_SERVICES' - xcconfig['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) MIXBOX_CI_IS_LINTING_PODSPECS=1 MIXBOX_ENABLE_IN_APP_SERVICES=1' - end - s.xcconfig = xcconfig end diff --git a/MixboxTestsFoundation.podspec b/MixboxTestsFoundation.podspec index 8608fae6d..c7eb2eb0e 100644 --- a/MixboxTestsFoundation.podspec +++ b/MixboxTestsFoundation.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'MixboxTestsFoundation' s.module_name = s.name - s.version = '0.2.0' + s.version = '0.2.2' s.summary = s.name s.homepage = 'https://github.com/avito-tech/Mixbox' s.license = 'MIT' @@ -23,13 +23,8 @@ Pod::Spec.new do |s| s.frameworks = 'XCTest', 'XCTAutomationSupport' - xcconfig = { + s.xcconfig = { 'LD_RUNPATH_SEARCH_PATHS' => '$(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks" "$(PLATFORM_DIR)/Developer/Library/PrivateFrameworks"', 'FRAMEWORK_SEARCH_PATHS' => '$(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks" "$(PLATFORM_DIR)/Developer/Library/PrivateFrameworks"' } - if ENV['MIXBOX_CI_IS_LINTING_PODSPECS'] == 'true' - xcconfig['OTHER_SWIFT_FLAGS'] = '$(inherited) -D MIXBOX_CI_IS_LINTING_PODSPECS -D MIXBOX_ENABLE_IN_APP_SERVICES' - xcconfig['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) MIXBOX_CI_IS_LINTING_PODSPECS=1 MIXBOX_ENABLE_IN_APP_SERVICES=1' - end - s.xcconfig = xcconfig end diff --git a/MixboxUiKit.podspec b/MixboxUiKit.podspec index 88a67efeb..e272f0466 100644 --- a/MixboxUiKit.podspec +++ b/MixboxUiKit.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'MixboxUiKit' s.module_name = s.name - s.version = '0.2.0' + s.version = '0.2.2' s.summary = s.name s.homepage = 'https://github.com/avito-tech/Mixbox' s.license = 'MIT' @@ -14,11 +14,4 @@ Pod::Spec.new do |s| s.source_files = 'Frameworks/UiKit/**/*.{swift,h,m,md}' s.dependency 'MixboxFoundation' - - xcconfig = {} - if ENV['MIXBOX_CI_IS_LINTING_PODSPECS'] == 'true' - xcconfig['OTHER_SWIFT_FLAGS'] = '$(inherited) -D MIXBOX_CI_IS_LINTING_PODSPECS -D MIXBOX_ENABLE_IN_APP_SERVICES' - xcconfig['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) MIXBOX_CI_IS_LINTING_PODSPECS=1 MIXBOX_ENABLE_IN_APP_SERVICES=1' - end - s.xcconfig = xcconfig end \ No newline at end of file diff --git a/MixboxUiTestsFoundation.podspec b/MixboxUiTestsFoundation.podspec index 3f91f42ee..5f6f8657f 100644 --- a/MixboxUiTestsFoundation.podspec +++ b/MixboxUiTestsFoundation.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'MixboxUiTestsFoundation' s.module_name = s.name - s.version = '0.2.0' + s.version = '0.2.2' s.summary = s.name s.homepage = 'https://github.com/avito-tech/Mixbox' s.license = 'MIT' @@ -22,11 +22,4 @@ Pod::Spec.new do |s| s.frameworks = 'XCTest' s.user_target_xcconfig = { 'FRAMEWORK_SEARCH_PATHS' => '$(PLATFORM_DIR)/Developer/Library/Frameworks' } - - xcconfig = {} - if ENV['MIXBOX_CI_IS_LINTING_PODSPECS'] == 'true' - xcconfig['OTHER_SWIFT_FLAGS'] = '$(inherited) -D MIXBOX_CI_IS_LINTING_PODSPECS -D MIXBOX_ENABLE_IN_APP_SERVICES' - xcconfig['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) MIXBOX_CI_IS_LINTING_PODSPECS=1 MIXBOX_ENABLE_IN_APP_SERVICES=1' - end - s.xcconfig = xcconfig end diff --git a/MixboxXcuiDriver.podspec b/MixboxXcuiDriver.podspec index 729600089..51f09a564 100644 --- a/MixboxXcuiDriver.podspec +++ b/MixboxXcuiDriver.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'MixboxXcuiDriver' s.module_name = s.name - s.version = '0.2.0' + s.version = '0.2.2' s.summary = s.name s.homepage = 'https://github.com/avito-tech/Mixbox' s.license = 'MIT' @@ -18,13 +18,8 @@ Pod::Spec.new do |s| s.frameworks = 'XCTest', 'XCTAutomationSupport' - xcconfig = { + s.xcconfig = { 'LD_RUNPATH_SEARCH_PATHS' => '$(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks" "$(PLATFORM_DIR)/Developer/Library/PrivateFrameworks"', 'FRAMEWORK_SEARCH_PATHS' => '$(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks" "$(PLATFORM_DIR)/Developer/Library/PrivateFrameworks"' } - if ENV['MIXBOX_CI_IS_LINTING_PODSPECS'] == 'true' - xcconfig['OTHER_SWIFT_FLAGS'] = '$(inherited) -D MIXBOX_CI_IS_LINTING_PODSPECS -D MIXBOX_ENABLE_IN_APP_SERVICES' - xcconfig['GCC_PREPROCESSOR_DEFINITIONS'] = '$(inherited) MIXBOX_CI_IS_LINTING_PODSPECS=1 MIXBOX_ENABLE_IN_APP_SERVICES=1' - end - s.xcconfig = xcconfig end diff --git a/Tests/Podfile b/Tests/Podfile index 4da6291b2..e367e6bbc 100644 --- a/Tests/Podfile +++ b/Tests/Podfile @@ -149,10 +149,6 @@ post_install do |installer| config.build_settings['ENABLE_TESTABILITY'] = 'YES' # To support @testable import config.build_settings['OTHER_SWIFT_FLAGS'] ||= ['$(inherited)', '-D', 'MIXBOX_ENABLE_IN_APP_SERVICES', '-Onone'] config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', 'MIXBOX_ENABLE_IN_APP_SERVICES=1', 'ENABLE_UITUNNEL=1'] - elsif config.name == 'Release' and target.name.match(/^Mixbox/) - # 'Release' configuration is used to lint podspecs. Also it is a kind of a release thing. - config.build_settings['OTHER_SWIFT_FLAGS'] ||= ['$(inherited)', '-D', 'MIXBOX_CI_IS_LINTING_PODSPECS', '-D', 'MIXBOX_ENABLE_IN_APP_SERVICES', '-Onone'] - config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', 'MIXBOX_CI_IS_LINTING_PODSPECS=1', 'MIXBOX_ENABLE_IN_APP_SERVICES=1'] end end end diff --git a/Tests/Podfile.lock b/Tests/Podfile.lock index bb2e40ef7..fb579650d 100644 --- a/Tests/Podfile.lock +++ b/Tests/Podfile.lock @@ -5,57 +5,57 @@ PODS: - GCDWebServer (3.4.2): - GCDWebServer/Core (= 3.4.2) - GCDWebServer/Core (3.4.2) - - MixboxAllure (0.2.0): + - MixboxAllure (0.2.1): - MixboxArtifacts - MixboxFoundation - - MixboxArtifacts (0.2.0) - - MixboxBuiltinIpc (0.2.0): + - MixboxArtifacts (0.2.1) + - MixboxBuiltinIpc (0.2.1): - GCDWebServer - MixboxIpc - - MixboxFakeSettingsAppMain (0.2.0) - - MixboxFoundation (0.2.0) + - MixboxFakeSettingsAppMain (0.2.1) + - MixboxFoundation (0.2.1) - MixboxGray (0.2.0): - MixboxInAppServices - MixboxUiKit - MixboxUiTestsFoundation - - MixboxInAppServices (0.2.0): + - MixboxInAppServices (0.2.1): - MixboxBuiltinIpc - MixboxIpcCommon - MixboxIpcSbtuiHost - MixboxTestability - MixboxUiKit - - MixboxIpc (0.2.0): + - MixboxIpc (0.2.1): - MixboxFoundation - - MixboxIpcCommon (0.2.0): + - MixboxIpcCommon (0.2.1): - MixboxIpc - - MixboxIpcSbtuiClient (0.2.0): + - MixboxIpcSbtuiClient (0.2.1): - MixboxIpc - MixboxTestsFoundation - MixboxUiTestsFoundation - SBTUITestTunnel/Client (~> 3.0.6) - - MixboxIpcSbtuiHost (0.2.0): + - MixboxIpcSbtuiHost (0.2.1): - MixboxIpc - SBTUITestTunnel/Server (~> 3.0.6) - - MixboxReporting (0.2.0): + - MixboxReporting (0.2.1): - MixboxArtifacts - MixboxFoundation - - MixboxTestability (0.2.0) - - MixboxTestsFoundation (0.2.0): + - MixboxTestability (0.2.1) + - MixboxTestsFoundation (0.2.1): - MixboxArtifacts - MixboxFoundation - MixboxReporting - MixboxUiKit - SQLite.swift - - MixboxUiKit (0.2.0): + - MixboxUiKit (0.2.1): - MixboxFoundation - - MixboxUiTestsFoundation (0.2.0): + - MixboxUiTestsFoundation (0.2.1): - CocoaImageHashing - DynamicCodable - MixboxIpcCommon - MixboxReporting - MixboxTestsFoundation - MixboxUiKit - - MixboxXcuiDriver (0.2.0): + - MixboxXcuiDriver (0.2.1): - MixboxIpcSbtuiClient - MixboxUiTestsFoundation - SBTUITestTunnel/Client (3.0.14) @@ -153,23 +153,23 @@ SPEC CHECKSUMS: Cuckoo: 2f10364798baa4b0d4aacabfa475249cf29977bc DynamicCodable: 2cf558d057b3e6540552943254e1c9eeb706dde2 GCDWebServer: 8d67ee9f634b4bb91eb4b8aee440318a5fc6debd - MixboxAllure: 17a233f8a96af19cd2ba58a69259397e3a089aac - MixboxArtifacts: ebd1a9d49a688c2c1d061e5ff9380c0f3903132a - MixboxBuiltinIpc: 38c316bb49e091faaff02ef22d0d3964e32e4464 - MixboxFakeSettingsAppMain: 73f4c97d3cc91bba54378fffe70906405c838e51 - MixboxFoundation: fc7cf078396178dd7562acdb5fa562ef04140408 + MixboxAllure: ab7d387592a9ba2cec7d7d1ac27fbf303538153f + MixboxArtifacts: b74569201970cdef785248f6993c3bf0f49d10a1 + MixboxBuiltinIpc: 33612f23d9641e02ac5ca408ad3cc65f669f4bdf + MixboxFakeSettingsAppMain: fb7b16b84c3b6cb8da292888ab4e13766861098d + MixboxFoundation: b099c2054c9e18f4d7bb93e44ec638ea0ee083d5 MixboxGray: 550e8e3d27ee2a6e88a07db79ccd03bd5623e30c - MixboxInAppServices: d707b8109393b997be7f196840533ebac6d6bc88 - MixboxIpc: bcb3eabd6a6d45274c19835d043782a46a8d2dd4 - MixboxIpcCommon: 9eb89db8f59964f45d71f6ee2e7cf9cc46b7f6e2 - MixboxIpcSbtuiClient: d7a192957f5ba6f71bfd53fdc7b72e846d66565e - MixboxIpcSbtuiHost: 137e3f25e5091dc236696b0ce0789609661fd832 - MixboxReporting: 4ae1c01e508d482bf87a80bd42a16d95e08acbe8 - MixboxTestability: e064c09191d652f34859eb38b268c91ddf40835a - MixboxTestsFoundation: d3ffcfe393909cea16a6d6c6d83ecc3fe2b21294 - MixboxUiKit: 38d240b182644a25cb0cef40edf678b339de97c7 - MixboxUiTestsFoundation: eea34cb1349b8d1190f4abc257bc30292b2361c8 - MixboxXcuiDriver: dd6f9ec6510288e6f9df8139cb59a829044f2f3d + MixboxInAppServices: ab2db830431717552627721d9322085faad0a87b + MixboxIpc: dbfe3e80c5773134c003f8910c677f8e709e9cfa + MixboxIpcCommon: bb2461bdc41031316e0c3d99a142162aeede274d + MixboxIpcSbtuiClient: 415f9bd750810c7104f9ace4d84874a1bf00ca7d + MixboxIpcSbtuiHost: 950adbb43375ebace0321a8fe0aa37a8b1372fbd + MixboxReporting: 7815a9f9279c00910377e3ed417270bde58aef7e + MixboxTestability: 37a6b097aefd8ee043fba6b8c82012e476df9394 + MixboxTestsFoundation: 5394cf2917109ed50105646719ccfbc2357163e5 + MixboxUiKit: 1d49273b69343e3e2a82fc15ba71bd27b9bfcb5d + MixboxUiTestsFoundation: 9987df2e3869426f916f2612f689ead200527db1 + MixboxXcuiDriver: a424b88c8ad62b2348c9a8ee76177a7a6eb052cc SBTUITestTunnel: 50c315f2fd1bfd144be8e0eb4c0a1e35ccbe5e9f SimulatorRemoteNotifications: 1610643e0582b2af67bc254b071ace4077e8ef86 SQLite.swift: 6e5356850bb1791459f8c16d6ee9195b28714a2e diff --git a/ci/builds/check_bumping_version b/ci/builds/check_bumping_version index 58886b39b..d28cdd679 100755 --- a/ci/builds/check_bumping_version +++ b/ci/builds/check_bumping_version @@ -4,7 +4,7 @@ # MIXBOX_PUSHSPEC_VERSION (e.g. "0.0.1") # MIXBOX_PUSHSPEC_ORIGIN (e.g. "origin") -set -e +set -x for include in "$(dirname $0)/../include/"*; do source "$include"; done @@ -18,14 +18,34 @@ then tag="Mixbox-$MIXBOX_PUSHSPEC_VERSION" git tag -d "$tag" git tag "$tag" - git push --force "$MIXBOX_PUSHSPEC_ORIGIN" "$tag" - - pod repo add MixboxSpecRepo "file:///$MIXBOX_CI_REPO_ROOT" - + git push --force "$MIXBOX_PUSHSPEC_ORIGIN" "$tag" || exit 1 + + pod repo add MixboxSpecRepo "file:///$MIXBOX_CI_REPO_ROOT" || exit 1 + echo "Caches were cleared" fi -MIXBOX_PUSHSPEC_STYLE=debug "$MIXBOX_CI_REPO_ROOT/ci/builds/push_specs" +MIXBOX_PUSHSPEC_STYLE=debug "$MIXBOX_CI_REPO_ROOT/ci/builds/push_specs" || exit 1 cd "$MIXBOX_CI_REPO_ROOT/Demo" + +podfile_path="Podfile" +podfile_backup_path="Podfile.backup.ignored" + +sed -i ".backup.ignored" "s/\(Mixbox.*\), '.*'/\1, '"$MIXBOX_PUSHSPEC_VERSION"'/g" "$podfile_path" +cp "$podfile_path" "$podfile_backup_path" + +echo '# 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 + +' > "$podfile_path" + +cat "$podfile_backup_path" >> "$podfile_path" + LOCAL_SPEC_REPO=true pod update + +rm "$podfile_path" +mv"$podfile_backup_path" "$podfile_path" diff --git a/ci/builds/push_specs b/ci/builds/push_specs index 724463a31..34b7384d5 100755 --- a/ci/builds/push_specs +++ b/ci/builds/push_specs @@ -20,18 +20,42 @@ function patchPodspecFile() { } function pushSpec() { + setLintingPodspecsEnabled false + case "$MIXBOX_PUSHSPEC_STYLE" in debug) - MIXBOX_CI_IS_LINTING_PODSPECS=true pod repo push MixboxSpecRepo "$@" --verbose --local-only --allow-warnings || exit 1 + pod repo push MixboxSpecRepo "$@" --verbose --local-only --allow-warnings || exit 1 ;; release) - MIXBOX_CI_IS_LINTING_PODSPECS=true pod trunk push "$@" --verbose --allow-warnings || exit 1 + pod trunk push "$@" --verbose --allow-warnings || exit 1 ;; *) + setLintingPodspecsEnabled true echo "Unknown MIXBOX_PUSHSPEC_STYLE ($MIXBOX_PUSHSPEC_STYLE)" exit 1 ;; esac + + setLintingPodspecsEnabled true +} + +function setLintingPodspecsEnabled() { + local enabled=$1 + local ruby="$(realpath "$(dirname "$(which pod)")/..")" + local regex + + if [ "$enabled" == "true" ] + then + regex='s/#validate_podspec\(_files\)*/validate_podspec\1/g' + elif [ "$enabled" == "false" ] + then + regex='s/ validate_podspec\(_files\)*/ #validate_podspec\1/g' + else + echo "Error in setLintingPodspecsEnabled $@" + exit 1 + fi + + find "$ruby"/gems/cocoapods* -name push.rb|xargs sed -i '.backup_before_push_specs' "$regex" } IFS=$'\n' diff --git a/ci/swift/Sources/AllTests/Tests/Simctl/SimctlTests.swift b/ci/swift/Sources/AllTests/Tests/Simctl/SimctlTests.swift index c71010bd0..abcbb0dd2 100644 --- a/ci/swift/Sources/AllTests/Tests/Simctl/SimctlTests.swift +++ b/ci/swift/Sources/AllTests/Tests/Simctl/SimctlTests.swift @@ -69,7 +69,7 @@ final class SimctlTests: XCTestCase { func test___list___works_for_xcode_10_2_1() { XCTAssertNoThrow(try { _ = try simctl("list_xc_10_2_1.json").list() - }()) + }()) } func test___list___works_for_xcode_10_0_0() {