diff --git a/.circleci/config.yml b/.circleci/config.yml index a79dab6bd..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; @@ -56,28 +56,44 @@ 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: - 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 +106,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 +128,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 +150,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 +172,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 +194,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 +216,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 +231,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 +253,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 +275,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 +297,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 +319,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 +341,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 +356,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 @@ -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/.github/workflows/release.yml b/.github/workflows/release.yml index 2b99f9ece..fa41a06d4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,14 +41,14 @@ on: jobs: release_core_bundle: - runs-on: macos-latest + runs-on: macos-13 steps: - uses: actions/checkout@v2 with: 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..d9c980f23 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', '< 6.0.0' + s.dependency 'AEPServices', '>= 5.0.0', '< 6.0.0' s.source_files = 'AEPCore/Sources/**/*.swift' diff --git a/AEPCore.xcodeproj/project.pbxproj b/AEPCore.xcodeproj/project.pbxproj index ad426f4d7..e176afdb0 100644 --- a/AEPCore.xcodeproj/project.pbxproj +++ b/AEPCore.xcodeproj/project.pbxproj @@ -3885,13 +3885,13 @@ 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", "@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; @@ -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,13 +3918,13 @@ 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", "@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; @@ -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,13 +3999,13 @@ 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", "@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; @@ -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,13 +4030,13 @@ 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", "@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; @@ -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,13 +4102,13 @@ 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", "@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; @@ -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,20 +4132,20 @@ 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", "@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; 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,13 +4275,13 @@ 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", "@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; @@ -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,20 +4305,20 @@ 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", "@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; 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,13 +4334,13 @@ 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", "@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; @@ -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,20 +4364,20 @@ 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", "@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; 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,13 +4438,13 @@ 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", "@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; @@ -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,20 +4468,20 @@ 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", "@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; 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,13 +4542,13 @@ 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", "@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; @@ -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,20 +4572,20 @@ 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", "@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; 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/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.podspec b/AEPIdentity.podspec index 9ac77f706..f6af453ae 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,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.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', '< 6.0.0' end 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.podspec b/AEPLifecycle.podspec index 77a55619d..0a8e215e9 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,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.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', '< 6.0.0' end 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/AEPServices.podspec b/AEPServices.podspec index c0aa6bfe2..12323df6b 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,11 +10,12 @@ 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.source_files = 'AEPServices/Sources/**/*.swift' s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' } - s.swift_version = '5.1' end diff --git a/AEPSignal.podspec b/AEPSignal.podspec index eb5796eee..78f698b22 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,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.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', '< 6.0.0' end 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 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..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' @@ -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 \ 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..e20049bb6 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! @@ -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 @@ -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 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 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")) ] ``` diff --git a/Script/test-SPM.sh b/Script/test-SPM.sh index 90eb699c3..bc9721eff 100755 --- a/Script/test-SPM.sh +++ b/Script/test-SPM.sh @@ -20,7 +20,7 @@ let package = Package( name: \"TestProject\", defaultLocalization: \"en-US\", platforms: [ - .iOS(.v11), .tvOS(.v11) + .iOS(.v12), .tvOS(.v12) ], products: [ .library(