From 98bd763c8c43ab7ff76031f710a6952b5bd3626d Mon Sep 17 00:00:00 2001 From: Christopher Hoffmann Date: Mon, 18 Dec 2023 14:10:13 -0700 Subject: [PATCH 01/13] bump min target to ios 12 and xcode to xcode 15 --- .circleci/config.yml | 34 ++++----- .github/workflows/release.yml | 12 ++-- .swift-version | 1 - .swiftlint.yml | 2 + AEPCore.podspec | 10 +-- AEPCore.xcodeproj/project.pbxproj | 110 +++++++++++++++--------------- AEPIdentity.podspec | 8 +-- AEPLifecycle.podspec | 8 +-- AEPServices.podspec | 6 +- AEPSignal.podspec | 8 +-- Package.swift | 4 +- Podfile | 4 +- 12 files changed, 105 insertions(+), 102 deletions(-) delete mode 100644 .swift-version diff --git a/.circleci/config.yml b/.circleci/config.yml index a79dab6bd..7cd4a80df 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -64,20 +64,20 @@ commands: steps: - macos/preboot-simulator: platform: "iOS" - version: "16.1" - device: "iPhone 14" + version: "17.0" + device: "iPhone 15" prestart_tvos_simulator: steps: - macos/preboot-simulator: platform: "tvOS" - version: "16.1" + version: "17.0" device: "Apple TV" jobs: validate-code: macos: - xcode: 14.1.0 # Specify the Xcode version to use + xcode: 15.0.0 # Specify the Xcode version to use steps: - checkout @@ -90,7 +90,7 @@ jobs: test-ios-core: macos: - xcode: 14.1.0 # Specify the Xcode version to use + xcode: 15.0.0 # Specify the Xcode version to use steps: - checkout @@ -112,7 +112,7 @@ jobs: test-ios-services: macos: - xcode: 14.1.0 # Specify the Xcode version to use + xcode: 15.0.0 # Specify the Xcode version to use steps: - checkout @@ -134,7 +134,7 @@ jobs: test-ios-lifecycle: macos: - xcode: 14.1.0 # Specify the Xcode version to use + xcode: 15.0.0 # Specify the Xcode version to use steps: - checkout @@ -156,7 +156,7 @@ jobs: test-ios-identity: macos: - xcode: 14.1.0 # Specify the Xcode version to use + xcode: 15.0.0 # Specify the Xcode version to use steps: - checkout @@ -178,7 +178,7 @@ jobs: test-ios-signal: macos: - xcode: 14.1.0 # Specify the Xcode version to use + xcode: 15.0.0 # Specify the Xcode version to use steps: - checkout @@ -200,7 +200,7 @@ jobs: test-ios-integration: macos: - xcode: 14.1.0 # Specify the Xcode version to use + xcode: 15.0.0 # Specify the Xcode version to use steps: - checkout @@ -215,7 +215,7 @@ jobs: test-tvos-core: macos: - xcode: 14.1.0 # Specify the Xcode version to use + xcode: 15.0.0 # Specify the Xcode version to use steps: - checkout @@ -237,7 +237,7 @@ jobs: test-tvos-services: macos: - xcode: 14.1.0 # Specify the Xcode version to use + xcode: 15.0.0 # Specify the Xcode version to use steps: - checkout @@ -259,7 +259,7 @@ jobs: test-tvos-lifecycle: macos: - xcode: 14.1.0 # Specify the Xcode version to use + xcode: 15.0.0 # Specify the Xcode version to use steps: - checkout @@ -281,7 +281,7 @@ jobs: test-tvos-identity: macos: - xcode: 14.1.0 # Specify the Xcode version to use + xcode: 15.0.0 # Specify the Xcode version to use steps: - checkout @@ -303,7 +303,7 @@ jobs: test-tvos-signal: macos: - xcode: 14.1.0 # Specify the Xcode version to use + xcode: 15.0.0 # Specify the Xcode version to use steps: - checkout @@ -325,7 +325,7 @@ jobs: test-tvos-integration: macos: - xcode: 14.1.0 # Specify the Xcode version to use + xcode: 15.0.0 # Specify the Xcode version to use steps: - checkout @@ -340,7 +340,7 @@ jobs: test-spm-podspec-archive: macos: - xcode: 14.1.0 # Specify the Xcode version to use + xcode: 15.0.0 # Specify the Xcode version to use steps: - checkout diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2b99f9ece..493d80f77 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,7 +48,7 @@ jobs: ref: main - uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '14.1' + xcode-version: '15.0' - name: Install jq run: brew install jq @@ -180,7 +180,7 @@ jobs: if: ${{ github.event.inputs.release_AEPServices == 'yes' }} run: | set -eo pipefail - pod trunk push AEPServices.podspec --allow-warnings --synchronous --swift-version=5.1 + pod trunk push AEPServices.podspec --allow-warnings --synchronous pod repo update env: COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }} @@ -189,7 +189,7 @@ jobs: if: ${{ github.event.inputs.release_AEPCore == 'yes' }} run: | set -eo pipefail - pod trunk push AEPCore.podspec --allow-warnings --synchronous --swift-version=5.1 + pod trunk push AEPCore.podspec --allow-warnings --synchronous pod repo update env: COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }} @@ -198,7 +198,7 @@ jobs: if: ${{ github.event.inputs.release_AEPIdentity == 'yes' }} run: | set -eo pipefail - pod trunk push AEPIdentity.podspec --allow-warnings --synchronous --swift-version=5.1 + pod trunk push AEPIdentity.podspec --allow-warnings --synchronous env: COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }} @@ -206,7 +206,7 @@ jobs: if: ${{ github.event.inputs.release_AEPLifecycle == 'yes' }} run: | set -eo pipefail - pod trunk push AEPLifecycle.podspec --allow-warnings --synchronous --swift-version=5.1 + pod trunk push AEPLifecycle.podspec --allow-warnings --synchronous env: COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }} @@ -214,7 +214,7 @@ jobs: if: ${{ github.event.inputs.release_AEPSignal == 'yes' }} run: | set -eo pipefail - pod trunk push AEPSignal.podspec --allow-warnings --synchronous --swift-version=5.1 + pod trunk push AEPSignal.podspec --allow-warnings --synchronous env: COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }} diff --git a/.swift-version b/.swift-version deleted file mode 100644 index a75b92f1e..000000000 --- a/.swift-version +++ /dev/null @@ -1 +0,0 @@ -5.1 diff --git a/.swiftlint.yml b/.swiftlint.yml index 7b9cb1345..f4b5293d3 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -35,6 +35,8 @@ disabled_rules: # rule identifiers to exclude from running - trailing_comma - type_body_length - trailing_whitespace + - notification_center_detachment + - for_where analyzer_rules: - unused_import diff --git a/AEPCore.podspec b/AEPCore.podspec index cf07127d6..dbec93e74 100644 --- a/AEPCore.podspec +++ b/AEPCore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "AEPCore" - s.version = "4.2.0" + s.version = "5.0.0" s.summary = "Core library for Adobe Experience Platform Mobile SDK. Written and maintained by Adobe." s.description = <<-DESC The core library provides the foundation for the Adobe Experience Platform SDK. Having the core library installed is a pre-requisite for any other Adobe Experience Platform SDK extension to work. @@ -10,15 +10,15 @@ Pod::Spec.new do |s| s.author = "Adobe Experience Platform SDK Team" s.source = { :git => "https://github.com/adobe/aepsdk-core-ios", :tag => s.version.to_s } - s.ios.deployment_target = '11.0' - s.tvos.deployment_target = '11.0' + s.ios.deployment_target = '12.0' + s.tvos.deployment_target = '12.0' s.swift_version = '5.1' s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' } - s.dependency 'AEPRulesEngine', '>= 4.0.0' - s.dependency 'AEPServices', '>= 4.2.0' + s.dependency 'AEPRulesEngine', '>= 5.0.0' + s.dependency 'AEPServices', '>= 5.0.0' s.source_files = 'AEPCore/Sources/**/*.swift' diff --git a/AEPCore.xcodeproj/project.pbxproj b/AEPCore.xcodeproj/project.pbxproj index ad426f4d7..86e324a90 100644 --- a/AEPCore.xcodeproj/project.pbxproj +++ b/AEPCore.xcodeproj/project.pbxproj @@ -3885,7 +3885,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = AEPCore/Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3900,7 +3900,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -3918,7 +3918,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = AEPCore/Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3932,7 +3932,7 @@ SUPPORTS_MACCATALYST = NO; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; @@ -3946,7 +3946,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = FKGEE875K4; INFOPLIST_FILE = AEPCore/Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3958,7 +3958,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -3972,7 +3972,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = FKGEE875K4; INFOPLIST_FILE = AEPCore/Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3983,7 +3983,7 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvos appletvsimulator"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; @@ -3999,7 +3999,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = AEPSignal/Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4014,7 +4014,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -4030,7 +4030,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = AEPSignal/Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4044,7 +4044,7 @@ SUPPORTS_MACCATALYST = NO; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; @@ -4054,7 +4054,7 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = AEPSignal/Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4065,7 +4065,7 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvos appletvsimulator"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -4075,7 +4075,7 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = AEPSignal/Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4086,7 +4086,7 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvos appletvsimulator"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; @@ -4102,7 +4102,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = AEPServices/Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4116,7 +4116,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -4132,7 +4132,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = AEPServices/Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4145,7 +4145,7 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvos appletvsimulator"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; @@ -4157,7 +4157,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = FKGEE875K4; INFOPLIST_FILE = AEPServices/Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4168,7 +4168,7 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvos appletvsimulator"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -4180,7 +4180,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = FKGEE875K4; INFOPLIST_FILE = AEPServices/Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4191,7 +4191,7 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvos appletvsimulator"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; @@ -4199,10 +4199,11 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvos appletvsimulator"; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -4210,10 +4211,11 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvos appletvsimulator"; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; @@ -4224,7 +4226,7 @@ CLANG_ENABLE_CODE_COVERAGE = NO; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = AEPIntegrationTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4235,7 +4237,7 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvos appletvsimulator"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -4246,7 +4248,7 @@ CLANG_ENABLE_CODE_COVERAGE = NO; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = AEPIntegrationTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4257,7 +4259,7 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvos appletvsimulator"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; @@ -4273,7 +4275,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = AEPServices/Mocks/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4287,7 +4289,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -4303,7 +4305,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = AEPServices/Mocks/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4316,7 +4318,7 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvos appletvsimulator"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; @@ -4332,7 +4334,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = AEPLifecycle/Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4346,7 +4348,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -4362,7 +4364,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = AEPLifecycle/Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4375,7 +4377,7 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvos appletvsimulator"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; @@ -4386,7 +4388,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = AEPLifecycle/Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4398,7 +4400,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -4409,7 +4411,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = AEPLifecycle/Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4420,7 +4422,7 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvos appletvsimulator"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; @@ -4436,7 +4438,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = AEPIdentity/Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4450,7 +4452,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -4466,7 +4468,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = AEPIdentity/Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4479,7 +4481,7 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvos appletvsimulator"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; @@ -4490,7 +4492,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = AEPIdentity/Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4502,7 +4504,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -4513,7 +4515,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = AEPIdentity/Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4524,7 +4526,7 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvos appletvsimulator"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; @@ -4540,7 +4542,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = AEPCore/Mocks/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4554,7 +4556,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -4570,7 +4572,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = AEPCore/Mocks/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4583,7 +4585,7 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvos appletvsimulator"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; - TVOS_DEPLOYMENT_TARGET = 11.0; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; diff --git a/AEPIdentity.podspec b/AEPIdentity.podspec index 9ac77f706..849e76477 100644 --- a/AEPIdentity.podspec +++ b/AEPIdentity.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "AEPIdentity" - s.version = "4.2.0" + s.version = "5.0.0" s.summary = "Identity extension for Adobe Experience Platform Mobile SDK. Written and maintained by Adobe." s.description = <<-DESC The AEPIdentity extension provides APIs that allow use of the Visitor ID services in the Adobe Experience Cloud SDK. @@ -10,14 +10,14 @@ Pod::Spec.new do |s| s.author = "Adobe Experience Platform SDK Team" s.source = { :git => "https://github.com/adobe/aepsdk-core-ios", :tag => s.version.to_s } - s.ios.deployment_target = '11.0' - s.tvos.deployment_target = '11.0' + s.ios.deployment_target = '12.0' + s.tvos.deployment_target = '12.0' s.source_files = 'AEPIdentity/Sources/**/*.swift' s.swift_version = '5.1' s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' } - s.dependency 'AEPCore', '>= 4.2.0' + s.dependency 'AEPCore', '>= 5.0.0' end diff --git a/AEPLifecycle.podspec b/AEPLifecycle.podspec index 77a55619d..e742c41ec 100644 --- a/AEPLifecycle.podspec +++ b/AEPLifecycle.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "AEPLifecycle" - s.version = "4.2.0" + s.version = "5.0.0" s.summary = "Lifecycle extension for Adobe Experience Platform Mobile SDK. Written and maintained by Adobe." s.description = <<-DESC The AEPLifecycle extension is used to track application lifecycle including session metricss and device related data. @@ -10,14 +10,14 @@ Pod::Spec.new do |s| s.author = "Adobe Experience Platform SDK Team" s.source = { :git => "https://github.com/adobe/aepsdk-core-ios", :tag => s.version.to_s } - s.ios.deployment_target = '11.0' - s.tvos.deployment_target = '11.0' + s.ios.deployment_target = '12.0' + s.tvos.deployment_target = '12.0' s.source_files = 'AEPLifecycle/Sources/**/*.swift' s.swift_version = '5.1' s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' } - s.dependency 'AEPCore', '>= 4.2.0' + s.dependency 'AEPCore', '>= 5.0.0' end diff --git a/AEPServices.podspec b/AEPServices.podspec index c0aa6bfe2..430eb1530 100644 --- a/AEPServices.podspec +++ b/AEPServices.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "AEPServices" - s.version = "4.2.0" + s.version = "5.0.0" s.summary = "Servcies library for Adobe Experience Platform Mobile SDK. Written and maintained by Adobe." s.description = <<-DESC The AEPServices library provides the platform services and utilities for the Adobe Experience Platform SDK. Having the services library installed is a pre-requisite for any other Adobe Experience Platform SDK extension to work. @@ -10,8 +10,8 @@ Pod::Spec.new do |s| s.author = "Adobe Experience Platform SDK Team" s.source = { :git => "https://github.com/adobe/aepsdk-core-ios", :tag => s.version.to_s } - s.ios.deployment_target = '11.0' - s.tvos.deployment_target = '11.0' + s.ios.deployment_target = '12.0' + s.tvos.deployment_target = '12.0' s.source_files = 'AEPServices/Sources/**/*.swift' diff --git a/AEPSignal.podspec b/AEPSignal.podspec index eb5796eee..b969eb082 100644 --- a/AEPSignal.podspec +++ b/AEPSignal.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "AEPSignal" - s.version = "4.2.0" + s.version = "5.0.0" s.summary = "Signal extension for Adobe Experience Platform Mobile SDK. Written and maintained by Adobe." s.description = <<-DESC The AEPSignal extension provides the support for Postback/PII/Open URL actions triggered by Core rules engine. @@ -10,14 +10,14 @@ Pod::Spec.new do |s| s.author = "Adobe Experience Platform SDK Team" s.source = { :git => "https://github.com/adobe/aepsdk-core-ios", :tag => s.version.to_s } - s.ios.deployment_target = '11.0' - s.tvos.deployment_target = '11.0' + s.ios.deployment_target = '12.0' + s.tvos.deployment_target = '12.0' s.source_files = 'AEPSignal/Sources/**/*.swift' s.swift_version = '5.1' s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' } - s.dependency 'AEPCore', '>= 4.2.0' + s.dependency 'AEPCore', '>= 5.0.0' end diff --git a/Package.swift b/Package.swift index 3471b00f9..caf892772 100644 --- a/Package.swift +++ b/Package.swift @@ -17,7 +17,7 @@ import PackageDescription let package = Package( name: "AEPCore", - platforms: [.iOS(.v11), .tvOS(.v11)], + platforms: [.iOS(.v12), .tvOS(.v12)], products: [ .library(name: "AEPCore", targets: ["AEPCore"]), .library(name: "AEPIdentity", targets: ["AEPIdentity"]), @@ -26,7 +26,7 @@ let package = Package( .library(name: "AEPSignal", targets: ["AEPSignal"]) ], dependencies: [ - .package(url: "https://github.com/adobe/aepsdk-rulesengine-ios.git", .upToNextMajor(from: "4.0.0")), + .package(url: "https://github.com/adobe/aepsdk-rulesengine-ios.git", .upToNextMajor(from: "5.0.0")), ], targets: [ .target(name: "AEPCore", diff --git a/Podfile b/Podfile index 51d73a8da..573f6bfe9 100644 --- a/Podfile +++ b/Podfile @@ -1,5 +1,5 @@ # Uncomment the next line to define a global platform for your project -platform :ios, '11.0' +platform :ios, '12.0' # Comment the next line if you don't want to use dynamic frameworks use_frameworks! @@ -85,7 +85,7 @@ end post_install do |pi| pi.pods_project.targets.each do |t| t.build_configurations.each do |bc| - bc.build_settings['TVOS_DEPLOYMENT_TARGET'] = '11.0' + bc.build_settings['TVOS_DEPLOYMENT_TARGET'] = '12.0' bc.build_settings['SUPPORTED_PLATFORMS'] = 'iphoneos iphonesimulator appletvos appletvsimulator' bc.build_settings['TARGETED_DEVICE_FAMILY'] = "1,2,3" end From 7e65833c658184afa43fb72b538d5260fcd03de3 Mon Sep 17 00:00:00 2001 From: Christopher Hoffmann Date: Mon, 18 Dec 2023 14:11:00 -0700 Subject: [PATCH 02/13] update readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 816323a29..fbb30f6bc 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ The `AEPCore`, `AEPServices`, and `AEPIdentity` extensions represent the foundat `AEPLifecycle` represents the Adobe Experience Platform SDK's `Lifecycle` extension that helps collect application Lifecycle metrics such as, application install or upgrade information, application launch and session information, device information, and any additional context data provided by the application developer. ## Requirements -- Xcode 14.1 (or newer) +- Xcode 15 (or newer) - Swift 5.1 (or newer) ## Installation @@ -70,7 +70,7 @@ Alternatively, if your project has a `Package.swift` file, you can add AEPCore d ``` dependencies: [ - .package(url: "https://github.com/adobe/aepsdk-core-ios.git", .upToNextMajor(from: "4.0.0")) + .package(url: "https://github.com/adobe/aepsdk-core-ios.git", .upToNextMajor(from: "5.0.0")) ] ``` From ad04556c822359345db4e1b526e7709d1fd31be2 Mon Sep 17 00:00:00 2001 From: Christopher Hoffmann Date: Mon, 18 Dec 2023 15:15:20 -0700 Subject: [PATCH 03/13] bump swift version to 5.9, which is the one included with Xcode 15 --- AEPCore.podspec | 2 +- AEPIdentity.podspec | 2 +- AEPLifecycle.podspec | 2 +- AEPServices.podspec | 2 +- AEPSignal.podspec | 2 +- Package.swift | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/AEPCore.podspec b/AEPCore.podspec index dbec93e74..d66f30012 100644 --- a/AEPCore.podspec +++ b/AEPCore.podspec @@ -13,7 +13,7 @@ Pod::Spec.new do |s| s.ios.deployment_target = '12.0' s.tvos.deployment_target = '12.0' - s.swift_version = '5.1' + s.swift_version = '5.9' s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' } diff --git a/AEPIdentity.podspec b/AEPIdentity.podspec index 849e76477..0fa6c7bee 100644 --- a/AEPIdentity.podspec +++ b/AEPIdentity.podspec @@ -15,7 +15,7 @@ Pod::Spec.new do |s| s.source_files = 'AEPIdentity/Sources/**/*.swift' - s.swift_version = '5.1' + s.swift_version = '5.9' s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' } s.dependency 'AEPCore', '>= 5.0.0' diff --git a/AEPLifecycle.podspec b/AEPLifecycle.podspec index e742c41ec..963e2fa9f 100644 --- a/AEPLifecycle.podspec +++ b/AEPLifecycle.podspec @@ -15,7 +15,7 @@ Pod::Spec.new do |s| s.source_files = 'AEPLifecycle/Sources/**/*.swift' - s.swift_version = '5.1' + s.swift_version = '5.9' s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' } s.dependency 'AEPCore', '>= 5.0.0' diff --git a/AEPServices.podspec b/AEPServices.podspec index 430eb1530..8a0fc87e5 100644 --- a/AEPServices.podspec +++ b/AEPServices.podspec @@ -16,5 +16,5 @@ Pod::Spec.new do |s| s.source_files = 'AEPServices/Sources/**/*.swift' s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' } - s.swift_version = '5.1' + s.swift_version = '5.9' end diff --git a/AEPSignal.podspec b/AEPSignal.podspec index b969eb082..34fb5dfd0 100644 --- a/AEPSignal.podspec +++ b/AEPSignal.podspec @@ -15,7 +15,7 @@ Pod::Spec.new do |s| s.source_files = 'AEPSignal/Sources/**/*.swift' - s.swift_version = '5.1' + s.swift_version = '5.9' s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' } s.dependency 'AEPCore', '>= 5.0.0' diff --git a/Package.swift b/Package.swift index caf892772..1eed22e93 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.1 +// swift-tools-version:5.9 // The swift-tools-version declares the minimum version of Swift required to build this package. /* From be81c9749c419ea33edd846998d75981b6b137e0 Mon Sep 17 00:00:00 2001 From: Christopher Hoffmann Date: Tue, 19 Dec 2023 09:42:34 -0700 Subject: [PATCH 04/13] use macos 13 for Xcode 15 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 493d80f77..fa41a06d4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,7 +41,7 @@ on: jobs: release_core_bundle: - runs-on: macos-latest + runs-on: macos-13 steps: - uses: actions/checkout@v2 with: From 754538a76e69287cafb57e5015378de50a19d14f Mon Sep 17 00:00:00 2001 From: Christopher Hoffmann Date: Thu, 11 Jan 2024 13:39:32 -0700 Subject: [PATCH 05/13] Add gemfile for cocoapods fix. --- .circleci/config.yml | 20 ++++++++- Gemfile | 3 ++ Gemfile.lock | 97 ++++++++++++++++++++++++++++++++++++++++++++ Makefile | 12 +++++- 4 files changed, 128 insertions(+), 4 deletions(-) create mode 100644 Gemfile create mode 100644 Gemfile.lock diff --git a/.circleci/config.yml b/.circleci/config.yml index 7cd4a80df..dcc48b603 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -56,9 +56,25 @@ workflows: commands: install_dependencies: steps: + # restore pods related caches + - restore_cache: + keys: + - 1-gems-{{ checksum "Gemfile.lock" }} + + # make sure we're on the right version of cocoapods + - run: + name: Verify Cocoapods Version + command: bundle check || bundle install --path vendor/bundle + + # save cocoapods version gem data + - save_cache: + key: 1-gems-{{ checksum "Gemfile.lock" }} + paths: + - vendor/bundle + - run: name: Pod install - command: pod install + command: make ci-pod-install prestart_ios_simulator: steps: @@ -349,7 +365,7 @@ jobs: name: Build XCFramework command: | if [ "${CIRCLE_BRANCH}" == "main" ]; then - make archive + make ci-archive fi # verify podspec is valid - run: diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..bb7fc028c --- /dev/null +++ b/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' + +gem 'cocoapods', '= 1.14.3' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..1e76ec945 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,97 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.6) + rexml + activesupport (6.1.7.6) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + addressable (2.8.6) + public_suffix (>= 2.0.2, < 6.0) + algoliasearch (1.27.5) + httpclient (~> 2.8, >= 2.8.3) + json (>= 1.5.1) + atomos (0.1.3) + claide (1.1.0) + cocoapods (1.14.3) + addressable (~> 2.8) + claide (>= 1.0.2, < 2.0) + cocoapods-core (= 1.14.3) + cocoapods-deintegrate (>= 1.0.3, < 2.0) + cocoapods-downloader (>= 2.1, < 3.0) + cocoapods-plugins (>= 1.0.0, < 2.0) + cocoapods-search (>= 1.0.0, < 2.0) + cocoapods-trunk (>= 1.6.0, < 2.0) + cocoapods-try (>= 1.1.0, < 2.0) + colored2 (~> 3.1) + escape (~> 0.0.4) + fourflusher (>= 2.3.0, < 3.0) + gh_inspector (~> 1.0) + molinillo (~> 0.8.0) + nap (~> 1.0) + ruby-macho (>= 2.3.0, < 3.0) + xcodeproj (>= 1.23.0, < 2.0) + cocoapods-core (1.14.3) + activesupport (>= 5.0, < 8) + addressable (~> 2.8) + algoliasearch (~> 1.0) + concurrent-ruby (~> 1.1) + fuzzy_match (~> 2.0.4) + nap (~> 1.0) + netrc (~> 0.11) + public_suffix (~> 4.0) + typhoeus (~> 1.0) + cocoapods-deintegrate (1.0.5) + cocoapods-downloader (2.1) + cocoapods-plugins (1.0.0) + nap + cocoapods-search (1.0.1) + cocoapods-trunk (1.6.0) + nap (>= 0.8, < 2.0) + netrc (~> 0.11) + cocoapods-try (1.2.0) + colored2 (3.1.2) + concurrent-ruby (1.2.2) + escape (0.0.4) + ethon (0.16.0) + ffi (>= 1.15.0) + ffi (1.16.3) + fourflusher (2.3.1) + fuzzy_match (2.0.4) + gh_inspector (1.1.3) + httpclient (2.8.3) + i18n (1.14.1) + concurrent-ruby (~> 1.0) + json (2.7.1) + minitest (5.20.0) + molinillo (0.8.0) + nanaimo (0.3.0) + nap (1.1.0) + netrc (0.11.0) + public_suffix (4.0.7) + rexml (3.2.6) + ruby-macho (2.5.1) + typhoeus (1.4.1) + ethon (>= 0.9.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + xcodeproj (1.23.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.3.0) + rexml (~> 3.2.4) + zeitwerk (2.6.12) + +PLATFORMS + ruby + +DEPENDENCIES + cocoapods (= 1.14.3) + +BUNDLED WITH + 1.17.2 diff --git a/Makefile b/Makefile index aed592a31..9efbdd835 100644 --- a/Makefile +++ b/Makefile @@ -95,10 +95,18 @@ integration-tvos-test: pod-install: pod install --repo-update +ci-pod-install: + bundle exec pod install --repo-update + # Targets - archive +archive: pod-install _archive + +ci-archive: ci-pod-install _archive + +ci-archive-ios: ci-pod-install _archive-ios -archive: clean pod-install build-ios build-tvos +_archive: clean pod-install build-ios build-tvos xcodebuild -create-xcframework -framework $(SIMULATOR_ARCHIVE_PATH)$(AEPSERVICES_TARGET_NAME).framework -debug-symbols $(SIMULATOR_ARCHIVE_DSYM_PATH)$(AEPSERVICES_TARGET_NAME).framework.dSYM \ -framework $(TVOS_SIMULATOR_ARCHIVE_PATH)$(AEPSERVICES_TARGET_NAME).framework -debug-symbols $(TVOS_SIMULATOR_ARCHIVE_DSYM_PATH)$(AEPSERVICES_TARGET_NAME).framework.dSYM \ -framework $(IOS_ARCHIVE_PATH)$(AEPSERVICES_TARGET_NAME).framework -debug-symbols $(IOS_ARCHIVE_DSYM_PATH)$(AEPSERVICES_TARGET_NAME).framework.dSYM \ @@ -124,7 +132,7 @@ archive: clean pod-install build-ios build-tvos -framework $(IOS_ARCHIVE_PATH)$(AEPRULESENGINE_TARGET_NAME).framework -debug-symbols $(IOS_ARCHIVE_DSYM_PATH)$(AEPRULESENGINE_TARGET_NAME).framework.dSYM \ -framework $(TVOS_ARCHIVE_PATH)$(AEPRULESENGINE_TARGET_NAME).framework -debug-symbols $(TVOS_ARCHIVE_DSYM_PATH)$(AEPRULESENGINE_TARGET_NAME).framework.dSYM -output ./build/$(AEPRULESENGINE_TARGET_NAME).xcframework -archive-ios: clean pod-install build-ios +_archive-ios: clean pod-install build-ios xcodebuild -create-xcframework -framework $(SIMULATOR_ARCHIVE_PATH)$(AEPSERVICES_TARGET_NAME).framework -debug-symbols $(SIMULATOR_ARCHIVE_DSYM_PATH)$(AEPSERVICES_TARGET_NAME).framework.dSYM \ -framework $(IOS_ARCHIVE_PATH)$(AEPSERVICES_TARGET_NAME).framework -debug-symbols $(IOS_ARCHIVE_DSYM_PATH)$(AEPSERVICES_TARGET_NAME).framework.dSYM -output ./build/$(AEPSERVICES_TARGET_NAME).xcframework xcodebuild -create-xcframework -framework $(SIMULATOR_ARCHIVE_PATH)$(AEPCORE_TARGET_NAME).framework -debug-symbols $(SIMULATOR_ARCHIVE_DSYM_PATH)$(AEPCORE_TARGET_NAME).framework.dSYM \ From 84f0ebae70f701fe3df0baed51f21d2ea882be66 Mon Sep 17 00:00:00 2001 From: Christopher Hoffmann Date: Thu, 11 Jan 2024 13:50:54 -0700 Subject: [PATCH 06/13] update iphone version in makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9efbdd835..982f7abbc 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ IOS_ARCHIVE_PATH = ./build/ios.xcarchive/Products/Library/Frameworks/ TVOS_ARCHIVE_PATH = ./build/tvos.xcarchive/Products/Library/Frameworks/ IOS_ARCHIVE_DSYM_PATH = $(CURR_DIR)/build/ios.xcarchive/dSYMs/ TVOS_ARCHIVE_DSYM_PATH = $(CURR_DIR)/build/tvos.xcarchive/dSYMs/ -IOS_DESTINATION = 'platform=iOS Simulator,name=iPhone 14' +IOS_DESTINATION = 'platform=iOS Simulator,name=iPhone 15' TVOS_DESTINATION = 'platform=tvOS Simulator,name=Apple TV' NC='\033[0m' RED='\033[0;31m' From c130bf322544d4c990139d2d8a084b3fbd4edf44 Mon Sep 17 00:00:00 2001 From: Christopher Hoffmann Date: Wed, 24 Jan 2024 11:52:50 -0700 Subject: [PATCH 07/13] update SPM script --- Script/test-SPM.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Script/test-SPM.sh b/Script/test-SPM.sh index 90eb699c3..96d54ea0c 100755 --- a/Script/test-SPM.sh +++ b/Script/test-SPM.sh @@ -13,14 +13,14 @@ mkdir -p $PROJECT_NAME && cd $PROJECT_NAME swift package init # Create the Package.swift. -echo "// swift-tools-version:5.3 +echo "// swift-tools-version:5.9 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription let package = Package( name: \"TestProject\", defaultLocalization: \"en-US\", platforms: [ - .iOS(.v11), .tvOS(.v11) + .iOS(.v12), .tvOS(.v12) ], products: [ .library( From 8d7563c679ead1832e6b387e12ac246c81576dba Mon Sep 17 00:00:00 2001 From: Christopher Hoffmann Date: Wed, 24 Jan 2024 14:28:20 -0700 Subject: [PATCH 08/13] revert swift version and swift tool version changes --- AEPCore.podspec | 2 +- AEPIdentity.podspec | 3 ++- AEPLifecycle.podspec | 3 ++- AEPServices.podspec | 3 ++- AEPSignal.podspec | 3 ++- Package.swift | 2 +- Script/test-SPM.sh | 2 +- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/AEPCore.podspec b/AEPCore.podspec index d66f30012..dbec93e74 100644 --- a/AEPCore.podspec +++ b/AEPCore.podspec @@ -13,7 +13,7 @@ Pod::Spec.new do |s| s.ios.deployment_target = '12.0' s.tvos.deployment_target = '12.0' - s.swift_version = '5.9' + s.swift_version = '5.1' s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' } diff --git a/AEPIdentity.podspec b/AEPIdentity.podspec index 0fa6c7bee..a2c9049c4 100644 --- a/AEPIdentity.podspec +++ b/AEPIdentity.podspec @@ -13,9 +13,10 @@ Pod::Spec.new do |s| s.ios.deployment_target = '12.0' s.tvos.deployment_target = '12.0' + s.swift_version = '5.1' + s.source_files = 'AEPIdentity/Sources/**/*.swift' - s.swift_version = '5.9' s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' } s.dependency 'AEPCore', '>= 5.0.0' diff --git a/AEPLifecycle.podspec b/AEPLifecycle.podspec index 963e2fa9f..9d2c1488f 100644 --- a/AEPLifecycle.podspec +++ b/AEPLifecycle.podspec @@ -13,9 +13,10 @@ Pod::Spec.new do |s| s.ios.deployment_target = '12.0' s.tvos.deployment_target = '12.0' + s.swift_version = '5.1' + s.source_files = 'AEPLifecycle/Sources/**/*.swift' - s.swift_version = '5.9' s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' } s.dependency 'AEPCore', '>= 5.0.0' diff --git a/AEPServices.podspec b/AEPServices.podspec index 8a0fc87e5..12323df6b 100644 --- a/AEPServices.podspec +++ b/AEPServices.podspec @@ -13,8 +13,9 @@ Pod::Spec.new do |s| s.ios.deployment_target = '12.0' s.tvos.deployment_target = '12.0' + s.swift_version = '5.1' + s.source_files = 'AEPServices/Sources/**/*.swift' s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' } - s.swift_version = '5.9' end diff --git a/AEPSignal.podspec b/AEPSignal.podspec index 34fb5dfd0..c386a3c7a 100644 --- a/AEPSignal.podspec +++ b/AEPSignal.podspec @@ -13,9 +13,10 @@ Pod::Spec.new do |s| s.ios.deployment_target = '12.0' s.tvos.deployment_target = '12.0' + s.swift_version = '5.1' + s.source_files = 'AEPSignal/Sources/**/*.swift' - s.swift_version = '5.9' s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' } s.dependency 'AEPCore', '>= 5.0.0' diff --git a/Package.swift b/Package.swift index 1eed22e93..caf892772 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.9 +// swift-tools-version:5.1 // The swift-tools-version declares the minimum version of Swift required to build this package. /* diff --git a/Script/test-SPM.sh b/Script/test-SPM.sh index 96d54ea0c..f4f0705ee 100755 --- a/Script/test-SPM.sh +++ b/Script/test-SPM.sh @@ -13,7 +13,7 @@ mkdir -p $PROJECT_NAME && cd $PROJECT_NAME swift package init # Create the Package.swift. -echo "// swift-tools-version:5.9 +echo "// swift-tools-version:5.1 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription let package = Package( From b81a0a1f6ae4476583ad861ff4919f2f73b3ddb5 Mon Sep 17 00:00:00 2001 From: Christopher Hoffmann Date: Tue, 30 Jan 2024 14:30:44 -0700 Subject: [PATCH 09/13] restrict AEPCore dependencies to greater than or equal to 5.0.0 and less than 6.0.0 --- AEPCore.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AEPCore.podspec b/AEPCore.podspec index dbec93e74..d9c980f23 100644 --- a/AEPCore.podspec +++ b/AEPCore.podspec @@ -17,8 +17,8 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' } - s.dependency 'AEPRulesEngine', '>= 5.0.0' - s.dependency 'AEPServices', '>= 5.0.0' + s.dependency 'AEPRulesEngine', '>= 5.0.0', '< 6.0.0' + s.dependency 'AEPServices', '>= 5.0.0', '< 6.0.0' s.source_files = 'AEPCore/Sources/**/*.swift' From 99204c7496cac64ce00a1ad2359767a3e780b217 Mon Sep 17 00:00:00 2001 From: Christopher Hoffmann Date: Wed, 31 Jan 2024 16:57:23 -0700 Subject: [PATCH 10/13] Restrict all extension subdependency upper bound --- AEPIdentity.podspec | 2 +- AEPLifecycle.podspec | 2 +- AEPSignal.podspec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/AEPIdentity.podspec b/AEPIdentity.podspec index a2c9049c4..f6af453ae 100644 --- a/AEPIdentity.podspec +++ b/AEPIdentity.podspec @@ -19,6 +19,6 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' } - s.dependency 'AEPCore', '>= 5.0.0' + s.dependency 'AEPCore', '>= 5.0.0', '< 6.0.0' end diff --git a/AEPLifecycle.podspec b/AEPLifecycle.podspec index 9d2c1488f..0a8e215e9 100644 --- a/AEPLifecycle.podspec +++ b/AEPLifecycle.podspec @@ -19,6 +19,6 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' } - s.dependency 'AEPCore', '>= 5.0.0' + s.dependency 'AEPCore', '>= 5.0.0', '< 6.0.0' end diff --git a/AEPSignal.podspec b/AEPSignal.podspec index c386a3c7a..78f698b22 100644 --- a/AEPSignal.podspec +++ b/AEPSignal.podspec @@ -19,6 +19,6 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' } - s.dependency 'AEPCore', '>= 5.0.0' + s.dependency 'AEPCore', '>= 5.0.0', '< 6.0.0' end From 01836adcba366dbf13f8029b71b33f8161d7d2d1 Mon Sep 17 00:00:00 2001 From: Christopher Hoffmann Date: Mon, 5 Feb 2024 14:02:55 -0700 Subject: [PATCH 11/13] use 5.3 tools version in SPM script --- Script/test-SPM.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Script/test-SPM.sh b/Script/test-SPM.sh index f4f0705ee..bc9721eff 100755 --- a/Script/test-SPM.sh +++ b/Script/test-SPM.sh @@ -13,7 +13,7 @@ mkdir -p $PROJECT_NAME && cd $PROJECT_NAME swift package init # Create the Package.swift. -echo "// swift-tools-version:5.1 +echo "// swift-tools-version:5.3 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription let package = Package( From 5d670745b9a4a5f1b740b66035121b176e3692ba Mon Sep 17 00:00:00 2001 From: Christopher Hoffmann Date: Mon, 5 Feb 2024 15:08:36 -0700 Subject: [PATCH 12/13] update version to 5.0.0 --- AEPCore.xcodeproj/project.pbxproj | 28 +++++++++---------- .../ConfigurationConstants.swift | 2 +- .../Sources/eventhub/EventHubConstants.swift | 2 +- AEPCore/Tests/MobileCoreTests.swift | 2 +- AEPIdentity/Sources/IdentityConstants.swift | 2 +- AEPLifecycle/Sources/LifecycleConstants.swift | 2 +- AEPSignal/Sources/SignalConstants.swift | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/AEPCore.xcodeproj/project.pbxproj b/AEPCore.xcodeproj/project.pbxproj index 86e324a90..e176afdb0 100644 --- a/AEPCore.xcodeproj/project.pbxproj +++ b/AEPCore.xcodeproj/project.pbxproj @@ -3891,7 +3891,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 4.2.0; + MARKETING_VERSION = 5.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.core; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -3924,7 +3924,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 4.2.0; + MARKETING_VERSION = 5.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.core; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -4005,7 +4005,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 4.2.0; + MARKETING_VERSION = 5.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.signal; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -4036,7 +4036,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 4.2.0; + MARKETING_VERSION = 5.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.signal; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -4108,7 +4108,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 4.2.0; + MARKETING_VERSION = 5.0.0; PRODUCT_BUNDLE_IDENTIFIER = come.adobe.aep.services; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -4138,7 +4138,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 4.2.0; + MARKETING_VERSION = 5.0.0; PRODUCT_BUNDLE_IDENTIFIER = come.adobe.aep.services; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -4281,7 +4281,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 4.2.0; + MARKETING_VERSION = 5.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.AEPServicesMocks; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -4311,7 +4311,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 4.2.0; + MARKETING_VERSION = 5.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.AEPServicesMocks; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -4340,7 +4340,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 4.2.0; + MARKETING_VERSION = 5.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.lifecycle; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -4370,7 +4370,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 4.2.0; + MARKETING_VERSION = 5.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.lifecycle; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -4444,7 +4444,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 4.2.0; + MARKETING_VERSION = 5.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.identity; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -4474,7 +4474,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 4.2.0; + MARKETING_VERSION = 5.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.identity; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -4548,7 +4548,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 4.2.0; + MARKETING_VERSION = 5.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.AEPCoreMocks; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -4578,7 +4578,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 4.2.0; + MARKETING_VERSION = 5.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.AEPCoreMocks; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; diff --git a/AEPCore/Sources/configuration/ConfigurationConstants.swift b/AEPCore/Sources/configuration/ConfigurationConstants.swift index eac995983..aed911f5f 100644 --- a/AEPCore/Sources/configuration/ConfigurationConstants.swift +++ b/AEPCore/Sources/configuration/ConfigurationConstants.swift @@ -15,7 +15,7 @@ import Foundation struct ConfigurationConstants { static let EXTENSION_NAME = "com.adobe.module.configuration" static let FRIENDLY_NAME = "Configuration" - static let EXTENSION_VERSION = "4.2.0" + static let EXTENSION_VERSION = "5.0.0" static let DATA_STORE_NAME = EXTENSION_NAME static let CONFIG_URL_BASE = "https://assets.adobedtm.com/" diff --git a/AEPCore/Sources/eventhub/EventHubConstants.swift b/AEPCore/Sources/eventhub/EventHubConstants.swift index b838ae30c..35e458054 100644 --- a/AEPCore/Sources/eventhub/EventHubConstants.swift +++ b/AEPCore/Sources/eventhub/EventHubConstants.swift @@ -17,7 +17,7 @@ enum EventHubConstants { static let XDM_STATE_CHANGE = "Shared state change (XDM)" static let NAME = "com.adobe.module.eventhub" static let FRIENDLY_NAME = "EventHub" - static let VERSION_NUMBER = "4.2.0" + static let VERSION_NUMBER = "5.0.0" enum EventDataKeys { static let VERSION = "version" diff --git a/AEPCore/Tests/MobileCoreTests.swift b/AEPCore/Tests/MobileCoreTests.swift index cb44cb786..28b975977 100644 --- a/AEPCore/Tests/MobileCoreTests.swift +++ b/AEPCore/Tests/MobileCoreTests.swift @@ -209,7 +209,7 @@ class MobileCoreTests: XCTestCase { "friendlyName" : "mockExtension" }, "com.adobe.module.configuration" : { - "version" : "4.2.0", + "version" : "5.0.0", "friendlyName" : "Configuration" }, "com.adobe.mockExtensionTwo" : { diff --git a/AEPIdentity/Sources/IdentityConstants.swift b/AEPIdentity/Sources/IdentityConstants.swift index a3c4e4781..0f2ee629d 100644 --- a/AEPIdentity/Sources/IdentityConstants.swift +++ b/AEPIdentity/Sources/IdentityConstants.swift @@ -14,7 +14,7 @@ import Foundation enum IdentityConstants { static let EXTENSION_NAME = "com.adobe.module.identity" static let FRIENDLY_NAME = "Identity" - static let EXTENSION_VERSION = "4.2.0" + static let EXTENSION_VERSION = "5.0.0" static let DATASTORE_NAME = EXTENSION_NAME static let API_TIMEOUT = TimeInterval(0.5) // Get API requests timeout after half a second diff --git a/AEPLifecycle/Sources/LifecycleConstants.swift b/AEPLifecycle/Sources/LifecycleConstants.swift index 1c4b22c0e..47b239f69 100644 --- a/AEPLifecycle/Sources/LifecycleConstants.swift +++ b/AEPLifecycle/Sources/LifecycleConstants.swift @@ -16,7 +16,7 @@ import Foundation enum LifecycleConstants { static let EXTENSION_NAME = "com.adobe.module.lifecycle" static let FRIENDLY_NAME = "Lifecycle" - static let EXTENSION_VERSION = "4.2.0" + static let EXTENSION_VERSION = "5.0.0" static let DATA_STORE_NAME = LifecycleConstants.EXTENSION_NAME static let START = "start" diff --git a/AEPSignal/Sources/SignalConstants.swift b/AEPSignal/Sources/SignalConstants.swift index 4ea1a820f..d87e324f4 100644 --- a/AEPSignal/Sources/SignalConstants.swift +++ b/AEPSignal/Sources/SignalConstants.swift @@ -15,7 +15,7 @@ import Foundation enum SignalConstants { static let EXTENSION_NAME = "com.adobe.module.signal" static let FRIENDLY_NAME = "Signal" - static let EXTENSION_VERSION = "4.2.0" + static let EXTENSION_VERSION = "5.0.0" static let DATASTORE_NAME = EXTENSION_NAME static let LOG_PREFIX = FRIENDLY_NAME From 2b64f4f94c205a6ee9bdc0e315ab23b4cc3ce962 Mon Sep 17 00:00:00 2001 From: Christopher Hoffmann Date: Mon, 5 Feb 2024 16:24:30 -0700 Subject: [PATCH 13/13] use codecov orb 3.3.0 which includes needed fix, and point to dev 5.0.0 branch for rules engine --- .circleci/config.yml | 2 +- Podfile | 8 ++++---- Podfile.lock | 21 +++++++++++++++------ 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dcc48b603..061cf78dc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ version: 2.1 orbs: - codecov: codecov/codecov@3.2.4 + codecov: codecov/codecov@3.3.0 macos: circleci/macos@2 # Workflows orchestrate a set of jobs to be run; diff --git a/Podfile b/Podfile index 573f6bfe9..e20049bb6 100644 --- a/Podfile +++ b/Podfile @@ -10,22 +10,22 @@ pod 'SwiftLint', '0.52.0' def core_main project 'AEPCore.xcodeproj' - pod 'AEPRulesEngine' + pod 'AEPRulesEngine', :git => 'https://github.com/adobe/aepsdk-rulesengine-ios.git', :branch => 'dev-v5.0.0' end def core_dev project 'AEPCore.xcodeproj' - pod 'AEPRulesEngine', :git => 'https://github.com/adobe/aepsdk-rulesengine-ios.git', :branch => 'main' + pod 'AEPRulesEngine', :git => 'https://github.com/adobe/aepsdk-rulesengine-ios.git', :branch => 'dev-v5.0.0' end def tests_main project 'TestApps/AEPCoreTestApp.xcodeproj' - pod 'AEPRulesEngine' + pod 'AEPRulesEngine', :git => 'https://github.com/adobe/aepsdk-rulesengine-ios.git', :branch => 'dev-v5.0.0' end def tests_dev project 'TestApps/AEPCoreTestApp.xcodeproj' - pod 'AEPRulesEngine', :git => 'https://github.com/adobe/aepsdk-rulesengine-ios.git', :branch => 'main' + pod 'AEPRulesEngine', :git => 'https://github.com/adobe/aepsdk-rulesengine-ios.git', :branch => 'dev-v5.0.0' end target 'AEPCore' do diff --git a/Podfile.lock b/Podfile.lock index 9f5b300b4..df457cabc 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,20 +1,29 @@ PODS: - - AEPRulesEngine (4.0.0) + - AEPRulesEngine (5.0.0) - SwiftLint (0.52.0) DEPENDENCIES: - - AEPRulesEngine + - AEPRulesEngine (from `https://github.com/adobe/aepsdk-rulesengine-ios.git`, branch `dev-v5.0.0`) - SwiftLint (= 0.52.0) SPEC REPOS: trunk: - - AEPRulesEngine - SwiftLint +EXTERNAL SOURCES: + AEPRulesEngine: + :branch: dev-v5.0.0 + :git: https://github.com/adobe/aepsdk-rulesengine-ios.git + +CHECKOUT OPTIONS: + AEPRulesEngine: + :commit: 01bd861e9df32b4d2dc784b2b94d87835e813c53 + :git: https://github.com/adobe/aepsdk-rulesengine-ios.git + SPEC CHECKSUMS: - AEPRulesEngine: 458450a34922823286ead045a0c2bd8c27e224c6 + AEPRulesEngine: fe5800653a4bee07b1e41e61b4d5551f0dba557b SwiftLint: 13280e21cdda6786ad908dc6e416afe5acd1fcb7 -PODFILE CHECKSUM: acb2eae490811dde6b01fe47b58f15a93d08247f +PODFILE CHECKSUM: 3060de936c692885dd60656cf33e10bf7a743c24 -COCOAPODS: 1.12.1 +COCOAPODS: 1.14.3