Merge pull request #981 from cdhoffmann/bumpMajorVersion-5

Major version 5.0.0 release bump
adobe · Feb 5, 2024 · 8416cd6 · 8416cd6
2 parents c015f49 + 2b64f4f
commit 8416cd6
Show file tree

Hide file tree

Showing 24 changed files with 285 additions and 145 deletions.
diff --git 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
@@ -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,23 +198,23 @@ 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 }}   
 
     - name: Publish Pods - AEPLifecycle
       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 }}
 
     - name: Publish Pods - AEPSignal
       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
diff --git 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
@@ -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'