From 0e2e22b11291a6e3e8398b1a8b4f1049774477d3 Mon Sep 17 00:00:00 2001 From: Serhii Mamontov Date: Tue, 8 Aug 2023 17:00:12 +0300 Subject: [PATCH 1/6] feat: enable library evolution support Set `BUILD_LIBRARY_FOR_DISTRIBUTION` to `YES` for all `PubNub` module targets. --- PubNub.xcodeproj/project.pbxproj | 48 +++++++++++++++++++------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/PubNub.xcodeproj/project.pbxproj b/PubNub.xcodeproj/project.pbxproj index f85a4544..e639096c 100644 --- a/PubNub.xcodeproj/project.pbxproj +++ b/PubNub.xcodeproj/project.pbxproj @@ -3168,7 +3168,7 @@ ); HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = PubNub.xcodeproj/PubNubTests_Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@loader_path/../Frameworks", @@ -3201,7 +3201,7 @@ ); HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = PubNub.xcodeproj/PubNubTests_Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@loader_path/../Frameworks", @@ -3225,6 +3225,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + BUILD_LIBRARY_FOR_DISTRIBUTION = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; @@ -3275,6 +3276,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + BUILD_LIBRARY_FOR_DISTRIBUTION = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; @@ -3329,7 +3331,7 @@ CURRENT_PROJECT_VERSION = 1; GCC_DYNAMIC_NO_PIC = NO; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MARKETING_VERSION = 1.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -3354,7 +3356,7 @@ CURRENT_PROJECT_VERSION = 1; ENABLE_NS_ASSERTIONS = NO; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MARKETING_VERSION = 1.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; @@ -3371,6 +3373,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + BUILD_LIBRARY_FOR_DISTRIBUTION = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; @@ -3423,6 +3426,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + BUILD_LIBRARY_FOR_DISTRIBUTION = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; @@ -3479,7 +3483,7 @@ CURRENT_PROJECT_VERSION = 1; GCC_DYNAMIC_NO_PIC = NO; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3511,7 +3515,7 @@ CURRENT_PROJECT_VERSION = 1; ENABLE_NS_ASSERTIONS = NO; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3534,6 +3538,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + BUILD_LIBRARY_FOR_DISTRIBUTION = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; @@ -3585,6 +3590,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + BUILD_LIBRARY_FOR_DISTRIBUTION = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; @@ -3639,7 +3645,7 @@ CURRENT_PROJECT_VERSION = 1; GCC_DYNAMIC_NO_PIC = NO; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3672,7 +3678,7 @@ CURRENT_PROJECT_VERSION = 1; ENABLE_NS_ASSERTIONS = NO; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3720,7 +3726,7 @@ CURRENT_PROJECT_VERSION = 1; GCC_DYNAMIC_NO_PIC = NO; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MARKETING_VERSION = 1.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -3745,7 +3751,7 @@ CURRENT_PROJECT_VERSION = 1; ENABLE_NS_ASSERTIONS = NO; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MARKETING_VERSION = 1.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; @@ -3769,7 +3775,7 @@ CURRENT_PROJECT_VERSION = 1; GCC_DYNAMIC_NO_PIC = NO; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3801,7 +3807,7 @@ CURRENT_PROJECT_VERSION = 1; ENABLE_NS_ASSERTIONS = NO; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3831,7 +3837,7 @@ CURRENT_PROJECT_VERSION = 1; GCC_DYNAMIC_NO_PIC = NO; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3864,7 +3870,7 @@ CURRENT_PROJECT_VERSION = 1; ENABLE_NS_ASSERTIONS = NO; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3900,7 +3906,7 @@ ); HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = PubNub.xcodeproj/PubNubContractTests_Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@loader_path/../Frameworks", @@ -3941,7 +3947,7 @@ ); HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = PubNub.xcodeproj/PubNubContractTests_Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@loader_path/../Frameworks", @@ -3982,7 +3988,7 @@ ); HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = PubNub.xcodeproj/PubNubContractTests_Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@loader_path/../Frameworks", @@ -4024,7 +4030,7 @@ ); HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = PubNub.xcodeproj/PubNubContractTests_Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@loader_path/../Frameworks", @@ -4053,6 +4059,7 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; + BUILD_LIBRARY_FOR_DISTRIBUTION = YES; CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; @@ -4092,6 +4099,7 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; + BUILD_LIBRARY_FOR_DISTRIBUTION = YES; CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; @@ -4254,7 +4262,7 @@ ); HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = PubNub.xcodeproj/PubNubTests_Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@loader_path/../Frameworks", @@ -4288,7 +4296,7 @@ ); HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = PubNub.xcodeproj/PubNubTests_Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@loader_path/../Frameworks", From 988c2da152ed5e1d6888beb560692174e77085bd Mon Sep 17 00:00:00 2001 From: Serhii Mamontov Date: Wed, 9 Aug 2023 21:39:28 +0300 Subject: [PATCH 2/6] feat: add library evolution to Package --- Package.swift | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/Package.swift b/Package.swift index 4dc1c322..47f00f38 100644 --- a/Package.swift +++ b/Package.swift @@ -68,22 +68,34 @@ let package = Package( // Targets can depend on other targets in this package, and on products in packages which this package depends on. .target( name: "PubNub", - path: "Sources/PubNub" + path: "Sources/PubNub", + cSettings: [ + .define("BUILD_LIBRARY_FOR_DISTRIBUTION", to: "YES") + ] ), .target( name: "PubNubUser", dependencies: ["PubNub"], - path: "PubNubUser/Sources" + path: "PubNubUser/Sources", + cSettings: [ + .define("BUILD_LIBRARY_FOR_DISTRIBUTION", to: "YES") + ] ), .target( name: "PubNubSpace", dependencies: ["PubNub"], - path: "PubNubSpace/Sources" + path: "PubNubSpace/Sources", + cSettings: [ + .define("BUILD_LIBRARY_FOR_DISTRIBUTION", to: "YES") + ] ), .target( name: "PubNubMembership", dependencies: ["PubNub", "PubNubUser", "PubNubSpace"], - path: "PubNubMembership/Sources" + path: "PubNubMembership/Sources", + cSettings: [ + .define("BUILD_LIBRARY_FOR_DISTRIBUTION", to: "YES") + ] ), .testTarget( name: "PubNubTests", From dee62009a048c424eecb55cf65edab3af0ed3687 Mon Sep 17 00:00:00 2001 From: Serhii Mamontov Date: Wed, 9 Aug 2023 21:51:47 +0300 Subject: [PATCH 3/6] refactor: use unsafaeFlags for evolution support --- Package.swift | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Package.swift b/Package.swift index 47f00f38..478383a2 100644 --- a/Package.swift +++ b/Package.swift @@ -69,32 +69,32 @@ let package = Package( .target( name: "PubNub", path: "Sources/PubNub", - cSettings: [ - .define("BUILD_LIBRARY_FOR_DISTRIBUTION", to: "YES") + swiftSettings: [ + .unsafeFlags(["-enable-library-evolution"]), ] ), .target( name: "PubNubUser", dependencies: ["PubNub"], path: "PubNubUser/Sources", - cSettings: [ - .define("BUILD_LIBRARY_FOR_DISTRIBUTION", to: "YES") + swiftSettings: [ + .unsafeFlags(["-enable-library-evolution"]), ] ), .target( name: "PubNubSpace", dependencies: ["PubNub"], path: "PubNubSpace/Sources", - cSettings: [ - .define("BUILD_LIBRARY_FOR_DISTRIBUTION", to: "YES") + swiftSettings: [ + .unsafeFlags(["-enable-library-evolution"]), ] ), .target( name: "PubNubMembership", dependencies: ["PubNub", "PubNubUser", "PubNubSpace"], path: "PubNubMembership/Sources", - cSettings: [ - .define("BUILD_LIBRARY_FOR_DISTRIBUTION", to: "YES") + swiftSettings: [ + .unsafeFlags(["-enable-library-evolution"]), ] ), .testTarget( From 24f6e29fff9b51f456c4112b90ffb2251d6ef837 Mon Sep 17 00:00:00 2001 From: Serhii Mamontov Date: Thu, 10 Aug 2023 15:26:07 +0300 Subject: [PATCH 4/6] test(cucumberish): fix integration into project --- Podfile | 17 ++++++++-- Podfile.lock | 16 +++------ PubNub.xcodeproj/project.pbxproj | 58 ++++++++++++++++---------------- 3 files changed, 49 insertions(+), 42 deletions(-) diff --git a/Podfile b/Podfile index ebc82ba0..c5bb84c9 100644 --- a/Podfile +++ b/Podfile @@ -2,9 +2,22 @@ workspace 'PubNub' use_frameworks! target 'PubNubContractTests' do - pod 'Cucumberish', :git => 'https://github.com/parfeon/Cucumberish.git', :branch => 'master', :inhibit_warnings => true + platform :ios, '11.0' + + pod 'Cucumberish', :inhibit_warnings => true end target 'PubNubContractTestsBeta' do - pod 'Cucumberish', :git => 'https://github.com/parfeon/Cucumberish.git', :branch => 'master', :inhibit_warnings => true + platform :ios, '11.0' + + pod 'Cucumberish', :inhibit_warnings => true +end + +post_install do |installer_representation| + installer_representation.pods_project.targets.each do |target| + next unless target.name =~ /Cucumberish/ + target.build_configurations.each do |config| + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0' + end + end end \ No newline at end of file diff --git a/Podfile.lock b/Podfile.lock index 8db976fb..6df78bf6 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -2,21 +2,15 @@ PODS: - Cucumberish (1.4.0) DEPENDENCIES: - - Cucumberish (from `https://github.com/parfeon/Cucumberish.git`, branch `master`) + - Cucumberish -EXTERNAL SOURCES: - Cucumberish: - :branch: master - :git: https://github.com/parfeon/Cucumberish.git - -CHECKOUT OPTIONS: - Cucumberish: - :commit: 6a9a44002b8ba9be6edc957357c244f9f9c7f94e - :git: https://github.com/parfeon/Cucumberish.git +SPEC REPOS: + trunk: + - Cucumberish SPEC CHECKSUMS: Cucumberish: 6cbd0c1f50306b369acebfe7d9f514c9c287d26c -PODFILE CHECKSUM: 61a40240486621bb01f596fdd5bc632504940fab +PODFILE CHECKSUM: 5408083cbe59f4e1178a644077bf694aee2a9bd8 COCOAPODS: 1.11.3 diff --git a/PubNub.xcodeproj/project.pbxproj b/PubNub.xcodeproj/project.pbxproj index e639096c..dc4c821a 100644 --- a/PubNub.xcodeproj/project.pbxproj +++ b/PubNub.xcodeproj/project.pbxproj @@ -134,7 +134,7 @@ 3558068A230F4C99005CDD92 /* InstanceIdOperatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35580687230F4B75005CDD92 /* InstanceIdOperatorTests.swift */; }; 3558069A2311F968005CDD92 /* SubscriptionStreamTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 355806992311F968005CDD92 /* SubscriptionStreamTests.swift */; }; 3558069C231303D9005CDD92 /* AutomaticRetryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3558069B231303D9005CDD92 /* AutomaticRetryTests.swift */; }; - 355806DB23145749005CDD92 /* PubNub.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "PubNub::PubNub::Product" /* PubNub.framework */; }; + 355806DB23145749005CDD92 /* PubNub.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = PubNub::PubNub::Product /* PubNub.framework */; }; 3559977B23073D53000BCFD1 /* WeakBoxTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3559977A23073D53000BCFD1 /* WeakBoxTests.swift */; }; 3559977F23078A7C000BCFD1 /* message_counts_error_invalid_arguments.json in Resources */ = {isa = PBXBuildFile; fileRef = 3559977E230787E7000BCFD1 /* message_counts_error_invalid_arguments.json */; }; 3559978223079070000BCFD1 /* forbidden_Message.json in Resources */ = {isa = PBXBuildFile; fileRef = 3559978023078F85000BCFD1 /* forbidden_Message.json */; }; @@ -399,9 +399,9 @@ 79407BE5271D4CFA0032076C /* PubNubFilesContractTestSteps.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79407BD1271D4CFA0032076C /* PubNubFilesContractTestSteps.swift */; }; 79407C00271D519F0032076C /* Features in Resources */ = {isa = PBXBuildFile; fileRef = 79407BFF271D519F0032076C /* Features */; }; 79407C01271D519F0032076C /* Features in Resources */ = {isa = PBXBuildFile; fileRef = 79407BFF271D519F0032076C /* Features */; }; - 7941EEA9270E433F0054D9EF /* PubNub.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "PubNub::PubNub::Product" /* PubNub.framework */; platformFilter = ios; }; + 7941EEA9270E433F0054D9EF /* PubNub.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = PubNub::PubNub::Product /* PubNub.framework */; platformFilter = ios; }; 7951954E26C955CE001E308C /* PAMToken.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7951954D26C955CE001E308C /* PAMToken.swift */; }; - 79657AA3271A13F700BACEC5 /* PubNub.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "PubNub::PubNub::Product" /* PubNub.framework */; platformFilter = ios; }; + 79657AA3271A13F700BACEC5 /* PubNub.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = PubNub::PubNub::Product /* PubNub.framework */; platformFilter = ios; }; A5115F2529195AF400F6ADA1 /* PubNubObjectsMembersContractTestSteps.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5115F2429195AF400F6ADA1 /* PubNubObjectsMembersContractTestSteps.swift */; }; A5115F2629195AF400F6ADA1 /* PubNubObjectsMembersContractTestSteps.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5115F2429195AF400F6ADA1 /* PubNubObjectsMembersContractTestSteps.swift */; }; A5115F28291D54F500F6ADA1 /* PubNubObjectsMembershipsContractTestSteps.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5115F27291D54F500F6ADA1 /* PubNubObjectsMembershipsContractTestSteps.swift */; }; @@ -418,7 +418,7 @@ D2635DFB22FCCF080097CF64 /* message_counts_success.json in Resources */ = {isa = PBXBuildFile; fileRef = D2635DFA22FCCF080097CF64 /* message_counts_success.json */; }; OBJ_31 /* PubNub.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_11 /* PubNub.swift */; }; OBJ_49 /* PubNubTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_15 /* PubNubTests.swift */; }; - OBJ_51 /* PubNub.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "PubNub::PubNub::Product" /* PubNub.framework */; }; + OBJ_51 /* PubNub.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = PubNub::PubNub::Product /* PubNub.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -932,8 +932,8 @@ OBJ_24 /* PubNubSwift.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = PubNubSwift.podspec; sourceTree = ""; }; OBJ_6 /* Package.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = Package.swift; sourceTree = ""; }; OBJ_9 /* PubNub.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PubNub.h; sourceTree = ""; }; - "PubNub::PubNub::Product" /* PubNub.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PubNub.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - "PubNub::PubNubTests::Product" /* PubNubTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; path = PubNubTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + PubNub::PubNub::Product /* PubNub.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PubNub.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + PubNub::PubNubTests::Product /* PubNubTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; path = PubNubTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -2048,8 +2048,8 @@ OBJ_17 /* Products */ = { isa = PBXGroup; children = ( - "PubNub::PubNubTests::Product" /* PubNubTests.xctest */, - "PubNub::PubNub::Product" /* PubNub.framework */, + PubNub::PubNubTests::Product /* PubNubTests.xctest */, + PubNub::PubNub::Product /* PubNub.framework */, 3558073723145749005CDD92 /* PubNubIntTests.xctest */, 7941EF40270E433F0054D9EF /* PubNubContractTests.xctest */, 79657AAB271A13F700BACEC5 /* PubNubContractTestsBeta.xctest */, @@ -2350,7 +2350,7 @@ productReference = 79657AAB271A13F700BACEC5 /* PubNubContractTestsBeta.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - "PubNub::PubNub" /* PubNub */ = { + PubNub::PubNub /* PubNub */ = { isa = PBXNativeTarget; buildConfigurationList = OBJ_27 /* Build configuration list for PBXNativeTarget "PubNub" */; buildPhases = ( @@ -2363,10 +2363,10 @@ ); name = PubNub; productName = PubNub; - productReference = "PubNub::PubNub::Product" /* PubNub.framework */; + productReference = PubNub::PubNub::Product /* PubNub.framework */; productType = "com.apple.product-type.framework"; }; - "PubNub::PubNubTests" /* PubNubTests */ = { + PubNub::PubNubTests /* PubNubTests */ = { isa = PBXNativeTarget; buildConfigurationList = OBJ_45 /* Build configuration list for PBXNativeTarget "PubNubTests" */; buildPhases = ( @@ -2381,7 +2381,7 @@ ); name = PubNubTests; productName = PubNubTests; - productReference = "PubNub::PubNubTests::Product" /* PubNubTests.xctest */; + productReference = PubNub::PubNubTests::Product /* PubNubTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -2434,8 +2434,8 @@ projectDirPath = ""; projectRoot = ""; targets = ( - "PubNub::PubNub" /* PubNub */, - "PubNub::PubNubTests" /* PubNubTests */, + PubNub::PubNub /* PubNub */, + PubNub::PubNubTests /* PubNubTests */, 7941EE6B270E433F0054D9EF /* PubNubContractTests */, 79657A93271A13F700BACEC5 /* PubNubContractTestsBeta */, 3558069D23145749005CDD92 /* PubNubIntegration */, @@ -3077,7 +3077,7 @@ /* Begin PBXTargetDependency section */ 3558069E23145749005CDD92 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = "PubNub::PubNub" /* PubNub */; + target = PubNub::PubNub /* PubNub */; targetProxy = 3558069F23145749005CDD92 /* PBXContainerItemProxy */; }; 358B8917284D206B00DB0F3D /* PBXTargetDependency */ = { @@ -3097,17 +3097,17 @@ }; 358B8962284D22B100DB0F3D /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = "PubNub::PubNub" /* PubNub */; + target = PubNub::PubNub /* PubNub */; targetProxy = 358B8961284D22B100DB0F3D /* PBXContainerItemProxy */; }; 358B8966284D22D800DB0F3D /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = "PubNub::PubNub" /* PubNub */; + target = PubNub::PubNub /* PubNub */; targetProxy = 358B8965284D22D800DB0F3D /* PBXContainerItemProxy */; }; 358B8968284D22E200DB0F3D /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = "PubNub::PubNub" /* PubNub */; + target = PubNub::PubNub /* PubNub */; targetProxy = 358B8967284D22E200DB0F3D /* PBXContainerItemProxy */; }; 358B896A284D22E200DB0F3D /* PBXTargetDependency */ = { @@ -3138,18 +3138,18 @@ 7941EE6C270E433F0054D9EF /* PBXTargetDependency */ = { isa = PBXTargetDependency; platformFilter = ios; - target = "PubNub::PubNub" /* PubNub */; + target = PubNub::PubNub /* PubNub */; targetProxy = 7941EE6D270E433F0054D9EF /* PBXContainerItemProxy */; }; 79657A94271A13F700BACEC5 /* PBXTargetDependency */ = { isa = PBXTargetDependency; platformFilter = ios; - target = "PubNub::PubNub" /* PubNub */; + target = PubNub::PubNub /* PubNub */; targetProxy = 79657A95271A13F700BACEC5 /* PBXContainerItemProxy */; }; OBJ_52 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = "PubNub::PubNub" /* PubNub */; + target = PubNub::PubNub /* PubNub */; targetProxy = 35EA73F422B1916100D97BF0 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -3251,7 +3251,7 @@ GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 PubNub. All rights reserved."; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3299,7 +3299,7 @@ GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 PubNub. All rights reserved."; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3400,7 +3400,7 @@ GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 PubNub. All rights reserved."; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3450,7 +3450,7 @@ GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 PubNub. All rights reserved."; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3564,7 +3564,7 @@ GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 PubNub. All rights reserved."; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3613,7 +3613,7 @@ GENERATE_INFOPLIST_FILE = YES; INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 PubNub. All rights reserved."; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4071,7 +4071,7 @@ ); HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Sources/PubNub/PubNub_Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx", @@ -4111,7 +4111,7 @@ ); HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Sources/PubNub/PubNub_Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx", From 93ad9cb9ec5c0b7cc788b9f30c6f5d2206fa9731 Mon Sep 17 00:00:00 2001 From: Serhii Mamontov Date: Thu, 10 Aug 2023 15:55:38 +0300 Subject: [PATCH 5/6] test: update dependencies Update Ruby dependencies which is used for tests run with fastlane. --- Gemfile.lock | 100 ++++++++++++++-------------- Podfile | 1 + PubNub.xcodeproj/project.pbxproj | 110 +++++++++++++++++++++++++++++++ fastlane/.env.contract | 4 +- fastlane/.env.contract-beta | 4 +- 5 files changed, 164 insertions(+), 55 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4daa63c1..1ebfb75b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://github.com/cocoapods/cocoapods.git - revision: 4a3159879a29d076d16a20b763f61eb96406a6c1 + revision: 53893a2de0d09827fcdaaf089ac25a98d85ed074 branch: master specs: - cocoapods (1.11.3) + cocoapods (1.12.1) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.11.3) + cocoapods-core (= 1.12.1) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.6.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -25,15 +25,14 @@ GIT GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.5) + CFPropertyList (3.0.6) rexml - activesupport (6.1.7) + activesupport (7.0.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) - addressable (2.8.1) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) @@ -41,26 +40,26 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.676.0) - aws-sdk-core (3.168.4) + aws-partitions (1.801.0) + aws-sdk-core (3.180.3) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.61.0) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-kms (1.71.0) + aws-sdk-core (~> 3, >= 3.177.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.117.2) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-s3 (1.132.1) + aws-sdk-core (~> 3, >= 3.179.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.2) + aws-sigv4 (~> 1.6) + aws-sigv4 (1.6.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) claide (1.1.0) clamp (1.3.2) - cocoapods-core (1.11.3) - activesupport (>= 5.0, < 7) + cocoapods-core (1.12.1) + activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) @@ -82,9 +81,9 @@ GEM colored2 (3.1.2) commander (4.6.0) highline (~> 2.0.0) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) declarative (0.0.20) - digest-crc (0.6.4) + digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) @@ -93,8 +92,8 @@ GEM escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) - excon (0.95.0) - faraday (1.10.2) + excon (0.100.0) + faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -122,8 +121,8 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.2.0) faraday (~> 1.0) - fastimage (2.2.6) - fastlane (2.211.0) + fastimage (2.2.7) + fastlane (2.214.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -147,7 +146,7 @@ GEM json (< 3.0.0) jwt (>= 2.1.0, < 3) mini_magick (>= 4.9.4, < 5.0.0) - multipart-post (~> 2.0.0) + multipart-post (>= 2.0.0, < 3.0.0) naturally (~> 2.2) optparse (~> 0.1.1) plist (>= 3.1.0, < 4.0.0) @@ -166,9 +165,9 @@ GEM fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.32.0) - google-apis-core (>= 0.9.1, < 2.a) - google-apis-core (0.9.2) + google-apis-androidpublisher_v3 (0.47.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-core (0.11.1) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -177,10 +176,10 @@ GEM retriable (>= 2.0, < 4.a) rexml webrick - google-apis-iamcredentials_v1 (0.16.0) - google-apis-core (>= 0.9.1, < 2.a) - google-apis-playcustomapp_v1 (0.12.0) - google-apis-core (>= 0.9.1, < 2.a) + google-apis-iamcredentials_v1 (0.17.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-playcustomapp_v1 (0.13.0) + google-apis-core (>= 0.11.0, < 2.a) google-apis-storage_v1 (0.19.0) google-apis-core (>= 0.9.0, < 2.a) google-cloud-core (1.6.0) @@ -188,7 +187,7 @@ GEM google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.3.0) + google-cloud-errors (1.3.1) google-cloud-storage (1.44.0) addressable (~> 2.8) digest-crc (~> 0.4) @@ -197,7 +196,7 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.3.0) + googleauth (1.7.0) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) memoist (~> 0.16) @@ -208,7 +207,7 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) jazzy (0.14.3) cocoapods (~> 1.5) @@ -222,38 +221,38 @@ GEM xcinvoke (~> 0.3.0) jmespath (1.6.2) json (2.6.3) - jwt (2.5.0) + jwt (2.7.1) liferaft (0.0.6) memoist (0.16.2) mini_magick (4.12.0) - mini_mime (1.1.2) - minitest (5.16.3) + mini_mime (1.1.5) + minitest (5.19.0) molinillo (0.8.0) multi_json (1.15.0) - multipart-post (2.0.0) + multipart-post (2.3.0) mustache (1.1.1) nanaimo (0.3.0) nap (1.1.0) naturally (2.2.1) netrc (0.11.0) - nokogiri (1.13.10-arm64-darwin) + nokogiri (1.15.3-arm64-darwin) racc (~> 1.4) - nokogiri (1.13.10-x86_64-darwin) + nokogiri (1.15.3-x86_64-darwin) racc (~> 1.4) open4 (1.3.4) optparse (0.1.1) os (1.1.4) - plist (3.6.0) + plist (3.7.0) public_suffix (4.0.7) - racc (1.6.1) + racc (1.7.1) rake (13.0.6) - redcarpet (3.5.1) + redcarpet (3.6.0) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.5) + rexml (3.2.6) rouge (2.0.7) ruby-macho (2.5.1) ruby2_keywords (0.0.5) @@ -266,17 +265,17 @@ GEM faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simctl (1.6.8) + simctl (1.6.10) CFPropertyList naturally - slather (2.7.3) + slather (2.7.4) CFPropertyList (>= 2.2, < 4) activesupport clamp (~> 1.3) nokogiri (>= 1.13.9) xcodeproj (~> 1.21) - sqlite3 (1.5.4-arm64-darwin) - sqlite3 (1.5.4-x86_64-darwin) + sqlite3 (1.6.3-arm64-darwin) + sqlite3 (1.6.3-x86_64-darwin) terminal-notifier (2.0.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) @@ -287,14 +286,14 @@ GEM tty-cursor (~> 0.7) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (2.0.5) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) uber (0.1.0) unf (0.1.4) unf_ext unf_ext (0.0.8.2) unicode-display_width (1.8.0) - webrick (1.7.0) + webrick (1.8.1) word_wrap (1.0.0) xcinvoke (0.3.0) liferaft (~> 0.0.6) @@ -309,7 +308,6 @@ GEM rouge (~> 2.0.7) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) - zeitwerk (2.6.6) PLATFORMS arm64-darwin-21 diff --git a/Podfile b/Podfile index c5bb84c9..86cfd48f 100644 --- a/Podfile +++ b/Podfile @@ -18,6 +18,7 @@ post_install do |installer_representation| next unless target.name =~ /Cucumberish/ target.build_configurations.each do |config| config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0' + config.build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = 'YES' end end end \ No newline at end of file diff --git a/PubNub.xcodeproj/project.pbxproj b/PubNub.xcodeproj/project.pbxproj index dc4c821a..997e5c1d 100644 --- a/PubNub.xcodeproj/project.pbxproj +++ b/PubNub.xcodeproj/project.pbxproj @@ -22,6 +22,7 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ + 189B68E4FC02AD0B17AE466E /* Pods_PubNubContractTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD05FCB038DFD6858F3DA3C4 /* Pods_PubNubContractTests.framework */; }; 35012EB22850039D00CF7E0A /* PubNubUser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 358B8975284D323300DB0F3D /* PubNubUser.swift */; }; 35012EB3285003A100CF7E0A /* Patcher+PubNubUser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 358B8974284D323300DB0F3D /* Patcher+PubNubUser.swift */; }; 35012EB5285003EC00CF7E0A /* PubNubUserEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35012EB4285003EC00CF7E0A /* PubNubUserEvent.swift */; }; @@ -402,6 +403,7 @@ 7941EEA9270E433F0054D9EF /* PubNub.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = PubNub::PubNub::Product /* PubNub.framework */; platformFilter = ios; }; 7951954E26C955CE001E308C /* PAMToken.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7951954D26C955CE001E308C /* PAMToken.swift */; }; 79657AA3271A13F700BACEC5 /* PubNub.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = PubNub::PubNub::Product /* PubNub.framework */; platformFilter = ios; }; + 9A00213F57BFCB1FD8A78032 /* Pods_PubNubContractTestsBeta.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8921D127B4688AD68183F6CF /* Pods_PubNubContractTestsBeta.framework */; }; A5115F2529195AF400F6ADA1 /* PubNubObjectsMembersContractTestSteps.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5115F2429195AF400F6ADA1 /* PubNubObjectsMembersContractTestSteps.swift */; }; A5115F2629195AF400F6ADA1 /* PubNubObjectsMembersContractTestSteps.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5115F2429195AF400F6ADA1 /* PubNubObjectsMembersContractTestSteps.swift */; }; A5115F28291D54F500F6ADA1 /* PubNubObjectsMembershipsContractTestSteps.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5115F27291D54F500F6ADA1 /* PubNubObjectsMembershipsContractTestSteps.swift */; }; @@ -530,6 +532,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 07088DE8F1DB2D0AFF58A437 /* Pods-PubNubContractTestsBeta.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PubNubContractTestsBeta.debug.xcconfig"; path = "Target Support Files/Pods-PubNubContractTestsBeta/Pods-PubNubContractTestsBeta.debug.xcconfig"; sourceTree = ""; }; 35012EB4285003EC00CF7E0A /* PubNubUserEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PubNubUserEvent.swift; sourceTree = ""; }; 35012EB9285004E300CF7E0A /* PubNubMembershipEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PubNubMembershipEvent.swift; sourceTree = ""; }; 35012EBB2850052500CF7E0A /* PubNubSpaceEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PubNubSpaceEvent.swift; sourceTree = ""; }; @@ -917,6 +920,9 @@ 7941EF47270E46B40054D9EF /* PubNubContractTests_Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = PubNubContractTests_Info.plist; path = PubNub.xcodeproj/PubNubContractTests_Info.plist; sourceTree = SOURCE_ROOT; }; 7951954D26C955CE001E308C /* PAMToken.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PAMToken.swift; sourceTree = ""; }; 79657AAB271A13F700BACEC5 /* PubNubContractTestsBeta.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PubNubContractTestsBeta.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 8250D0ECA70B93C96B802637 /* Pods-PubNubContractTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PubNubContractTests.release.xcconfig"; path = "Target Support Files/Pods-PubNubContractTests/Pods-PubNubContractTests.release.xcconfig"; sourceTree = ""; }; + 8921D127B4688AD68183F6CF /* Pods_PubNubContractTestsBeta.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PubNubContractTestsBeta.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + A3ED084D8E76E2C2C0A4F8F5 /* Pods-PubNubContractTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PubNubContractTests.debug.xcconfig"; path = "Target Support Files/Pods-PubNubContractTests/Pods-PubNubContractTests.debug.xcconfig"; sourceTree = ""; }; A5115F2429195AF400F6ADA1 /* PubNubObjectsMembersContractTestSteps.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PubNubObjectsMembersContractTestSteps.swift; sourceTree = ""; }; A5115F27291D54F500F6ADA1 /* PubNubObjectsMembershipsContractTestSteps.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PubNubObjectsMembershipsContractTestSteps.swift; sourceTree = ""; }; A5115F2A291D5C2700F6ADA1 /* PubNubObjectsContractTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PubNubObjectsContractTests.swift; sourceTree = ""; }; @@ -924,6 +930,8 @@ A56445F12907D9FD0085B310 /* PubNubObjectsChannelMetadataContractTestSteps.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PubNubObjectsChannelMetadataContractTestSteps.swift; sourceTree = ""; }; A5A574D329C309750065D333 /* leave_success.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = leave_success.json; sourceTree = ""; }; A5F19EE229126D8200F185A9 /* PubNubObjectsUUIDMetadataContractTestSteps.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PubNubObjectsUUIDMetadataContractTestSteps.swift; sourceTree = ""; }; + AA559CC5BD2297671FE53309 /* Pods-PubNubContractTestsBeta.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PubNubContractTestsBeta.release.xcconfig"; path = "Target Support Files/Pods-PubNubContractTestsBeta/Pods-PubNubContractTestsBeta.release.xcconfig"; sourceTree = ""; }; + CD05FCB038DFD6858F3DA3C4 /* Pods_PubNubContractTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PubNubContractTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D2635DFA22FCCF080097CF64 /* message_counts_success.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = message_counts_success.json; sourceTree = ""; }; OBJ_11 /* PubNub.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PubNub.swift; sourceTree = ""; }; OBJ_15 /* PubNubTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PubNubTests.swift; sourceTree = ""; }; @@ -1019,6 +1027,7 @@ buildActionMask = 0; files = ( 7941EEA9270E433F0054D9EF /* PubNub.framework in Frameworks */, + 189B68E4FC02AD0B17AE466E /* Pods_PubNubContractTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1027,6 +1036,7 @@ buildActionMask = 0; files = ( 79657AA3271A13F700BACEC5 /* PubNub.framework in Frameworks */, + 9A00213F57BFCB1FD8A78032 /* Pods_PubNubContractTestsBeta.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1887,6 +1897,10 @@ 3DBD7CDD58292DFFDF108B95 /* Pods */ = { isa = PBXGroup; children = ( + A3ED084D8E76E2C2C0A4F8F5 /* Pods-PubNubContractTests.debug.xcconfig */, + 8250D0ECA70B93C96B802637 /* Pods-PubNubContractTests.release.xcconfig */, + 07088DE8F1DB2D0AFF58A437 /* Pods-PubNubContractTestsBeta.debug.xcconfig */, + AA559CC5BD2297671FE53309 /* Pods-PubNubContractTestsBeta.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -2025,6 +2039,15 @@ path = MessageCounts; sourceTree = ""; }; + F9C1693B788C954B01A5318B /* Frameworks */ = { + isa = PBXGroup; + children = ( + CD05FCB038DFD6858F3DA3C4 /* Pods_PubNubContractTests.framework */, + 8921D127B4688AD68183F6CF /* Pods_PubNubContractTestsBeta.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; OBJ_12 /* Tests */ = { isa = PBXGroup; children = ( @@ -2078,6 +2101,7 @@ OBJ_12 /* Tests */, OBJ_17 /* Products */, 3DBD7CDD58292DFFDF108B95 /* Pods */, + F9C1693B788C954B01A5318B /* Frameworks */, ); sourceTree = ""; }; @@ -2318,9 +2342,11 @@ isa = PBXNativeTarget; buildConfigurationList = 7941EF3D270E433F0054D9EF /* Build configuration list for PBXNativeTarget "PubNubContractTests" */; buildPhases = ( + 3CCD53DF8F9B74F684203005 /* [CP] Check Pods Manifest.lock */, 7941EE6E270E433F0054D9EF /* Sources */, 7941EEA8270E433F0054D9EF /* Frameworks */, 7941EEAA270E433F0054D9EF /* Resources */, + 7FB399EBB228CCEE60614706 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -2336,9 +2362,11 @@ isa = PBXNativeTarget; buildConfigurationList = 79657AA8271A13F700BACEC5 /* Build configuration list for PBXNativeTarget "PubNubContractTestsBeta" */; buildPhases = ( + DCE0EF8D92E94B186E531760 /* [CP] Check Pods Manifest.lock */, 79657A97271A13F700BACEC5 /* Sources */, 79657AA2271A13F700BACEC5 /* Frameworks */, 79657AA5271A13F700BACEC5 /* Resources */, + 0FF4E97A7741637319E3AA72 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -2697,6 +2725,23 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 0FF4E97A7741637319E3AA72 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-PubNubContractTestsBeta/Pods-PubNubContractTestsBeta-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-PubNubContractTestsBeta/Pods-PubNubContractTestsBeta-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PubNubContractTestsBeta/Pods-PubNubContractTestsBeta-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; 359152A822BA9F5B0048842D /* Swift Format */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -2733,6 +2778,67 @@ shellPath = /bin/sh; shellScript = "swiftlint\n"; }; + 3CCD53DF8F9B74F684203005 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-PubNubContractTests-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; + }; + 7FB399EBB228CCEE60614706 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-PubNubContractTests/Pods-PubNubContractTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-PubNubContractTests/Pods-PubNubContractTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PubNubContractTests/Pods-PubNubContractTests-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + DCE0EF8D92E94B186E531760 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-PubNubContractTestsBeta-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; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -3893,6 +3999,7 @@ }; 7941EF3E270E433F0054D9EF /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = A3ED084D8E76E2C2C0A4F8F5 /* Pods-PubNubContractTests.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ENABLE_MODULES = YES; @@ -3934,6 +4041,7 @@ }; 7941EF3F270E433F0054D9EF /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 8250D0ECA70B93C96B802637 /* Pods-PubNubContractTests.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ENABLE_MODULES = YES; @@ -3974,6 +4082,7 @@ }; 79657AA9271A13F700BACEC5 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 07088DE8F1DB2D0AFF58A437 /* Pods-PubNubContractTestsBeta.debug.xcconfig */; buildSettings = { ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; @@ -4016,6 +4125,7 @@ }; 79657AAA271A13F700BACEC5 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AA559CC5BD2297671FE53309 /* Pods-PubNubContractTestsBeta.release.xcconfig */; buildSettings = { ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; diff --git a/fastlane/.env.contract b/fastlane/.env.contract index 159064b5..b8b8cddc 100644 --- a/fastlane/.env.contract +++ b/fastlane/.env.contract @@ -1,6 +1,6 @@ -DEVICE="iPhone 11 (14.0)" +DEVICE="iPhone 11 (16.2)" -DESTINATION_EXAMPLE="OS=14.0,name=iPhone 11" +DESTINATION_EXAMPLE="OS=16.2,name=iPhone 11" TEST_OUTPUT_DIR="fastlane/test_output/iOS" SCHEME_SDK=PubNubContractTests PLATFORM=ios diff --git a/fastlane/.env.contract-beta b/fastlane/.env.contract-beta index a37ebddd..105fbe36 100644 --- a/fastlane/.env.contract-beta +++ b/fastlane/.env.contract-beta @@ -1,6 +1,6 @@ -DEVICE="iPhone 11 (14.0)" +DEVICE="iPhone 11 (16.2)" -DESTINATION_EXAMPLE="OS=14.0,name=iPhone 11" +DESTINATION_EXAMPLE="OS=16.2,name=iPhone 11" TEST_OUTPUT_DIR="fastlane/test_output/iOS" SCHEME_SDK=PubNubContractTestsBeta PLATFORM=ios From 5dd17ba6c7475d9d21d5824060f13025fab5e6dd Mon Sep 17 00:00:00 2001 From: Serhii Mamontov Date: Thu, 10 Aug 2023 16:01:06 +0300 Subject: [PATCH 6/6] build: update minimum Ruby version --- .github/workflows/run-tests.yml | 8 ++++---- .github/workflows/run-validations.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index c567aa54..bfcaebe2 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -22,10 +22,10 @@ jobs: uses: actions/checkout@v3 with: token: ${{ secrets.GH_TOKEN }} - - name: Setup Ruby 2.6.6 + - name: Setup Ruby 2.7.0 uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6.6 + ruby-version: 2.7.0 bundler-cache: true - name: Cache installed Pods uses: actions/cache@v3 @@ -57,10 +57,10 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v3 - - name: Setup Ruby 2.6.6 + - name: Setup Ruby 2.7.0 uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6.6 + ruby-version: 2.7.0 bundler-cache: true - name: Cache installed Pods uses: actions/cache@v3 diff --git a/.github/workflows/run-validations.yml b/.github/workflows/run-validations.yml index ff2b4af4..7183ee82 100644 --- a/.github/workflows/run-validations.yml +++ b/.github/workflows/run-validations.yml @@ -49,10 +49,10 @@ jobs: ref: v1 token: ${{ secrets.GH_TOKEN }} path: .github/.release/actions - - name: Setup Ruby 2.6.6 + - name: Setup Ruby 2.7.0 uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6.6 + ruby-version: 2.7.0 bundler-cache: true - name: Cache Swift Package Manager uses: actions/cache@v3 @@ -83,10 +83,10 @@ jobs: ref: v1 token: ${{ secrets.GH_TOKEN }} path: .github/.release/actions - - name: Setup Ruby 2.6.6 + - name: Setup Ruby 2.7.0 uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6.6 + ruby-version: 2.7.0 bundler-cache: true - name: Cache Swift Package Manager uses: actions/cache@v3