Merge pull request #351 from adobe/dev

Merge to Staging for 4.0.0 release

.circleci/config.yml

@@ -4,12 +4,11 @@
 version: 2.1
 
 orbs:
-  codecov: codecov/codecov@3.2.4
+  codecov: codecov/codecov@3.2.5
   macos: circleci/macos@2
 
 # Workflows orchestrate a set of jobs to be run;
 workflows:
-  version: 2
   build-test:
     jobs:
       - validate-code
@@ -70,18 +69,20 @@ commands:
     steps:
       - macos/preboot-simulator:
           platform: "iOS"
-          device: "iPhone 8"
+          version: "16.1"
+          device: "iPhone 14"
 
   prestart_tvos_simulator:
     steps:
       - macos/preboot-simulator:
           platform: "tvOS"
+          version: "16.1"
           device: "Apple TV"
 
 jobs:
   validate-code:
     macos:
-      xcode: 13.4.0 # Specify the Xcode version to use
+      xcode: 14.1.0 # Specify the Xcode version to use
 
     steps:
       - checkout
@@ -94,7 +95,7 @@ jobs:
 
   test-ios:
     macos:
-      xcode: 13.4.0 # Specify the Xcode version to use
+      xcode: 14.1.0 # Specify the Xcode version to use
 
     steps:
       - checkout
@@ -116,7 +117,7 @@ jobs:
 
   test-tvos:
     macos:
-      xcode: 13.4.0 # Specify the Xcode version to use
+      xcode: 14.1.0 # Specify the Xcode version to use
 
     steps:
       - checkout
@@ -138,7 +139,7 @@ jobs:
 
   build_xcframework_and_app:  
     macos:
-      xcode: 13.4.0 # Specify the Xcode version to use
+      xcode: 14.1.0 # Specify the Xcode version to use
 
     steps:
       - checkout

.github/workflows/release.yml

@@ -25,6 +25,9 @@ jobs:
     - uses: actions/checkout@v2
       with:
         ref: main
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: '14.1'
 
     - name: Install jq
       run: brew install jq
@@ -51,8 +54,16 @@ jobs:
         set -eo pipefail
         echo podspec file verification starts:
         make test-podspec
+        
+    - name: Build Artifacts
+      if: ${{ github.event.inputs.action_tag == 'yes' }}
+      run: |
+        make archive
+        make zip
 
-    - uses: release-drafter/release-drafter@v5
+    - name: Create GH Release
+      id: create_release
+      uses: release-drafter/release-drafter@v5
       if: ${{ github.event.inputs.action_tag == 'yes' }}
       with:
         name: v${{ github.event.inputs.tag }}
@@ -62,6 +73,17 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+    - name: Upload - AEPEdge
+      uses: actions/upload-release-asset@v1
+      if: ${{ github.event.inputs.action_tag == 'yes' }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: ./build/AEPEdge.xcframework.zip
+        asset_name: AEPEdge-${{ github.event.inputs.tag }}.xcframework.zip
+        asset_content_type: application/zip
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
     - name: Publish Pods - AEPEdge
       if: ${{ github.event.inputs.release_AEPEdge == 'yes' }}
       run: |

.github/workflows/update_versions.yml

@@ -0,0 +1,47 @@
+# This is a basic workflow that is manually triggered
+
+name: Update Versions
+
+# Controls when the action will run. Workflow runs when manually triggered using the UI
+# or API.
+on:
+  workflow_dispatch:
+    # Inputs the workflow accepts.
+    inputs:
+      version:
+        description: 'New version to use for the extension.  Example: 1.5.2'
+        required: true
+
+      branch:
+        description: 'Branch to be used when updating versions'
+        required: true
+
+      core-dependency:
+        description: 'If a version is provided, update AEPCore dependency in podspec and Package.swift'
+        required: false
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  update-versions:
+    runs-on: macos-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v3.1.0
+      with:
+        ref: ${{ github.event.inputs.branch }}
+
+    - name: Update AEPEdge (with core dependency update)
+      run: (sh ./Script/update-versions.sh -n Edge -v ${{ github.event.inputs.version }} -d "AEPCore ${{ github.event.inputs.core-dependency }}")
+
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@v4.2.3
+      with:
+        token: ${{ github.token }}
+        commit-message: Updating version to ${{ github.event.inputs.version }}.
+        branch: version-${{ github.event.inputs.version }}-update
+        delete-branch: true
+        title: Updating version to ${{ github.event.inputs.version }}
+        body: Updating version to ${{ github.event.inputs.version }}

.swiftlint.yml

@@ -15,7 +15,6 @@ opt_in_rules: # some rules are opt-in only
 - sorted_imports
 - toggle_bool
 - unneeded_parentheses_in_closure_argument
-- unused_import
 - vertical_parameter_alignment_on_call
 excluded: # paths to ignore during linting
 - Carthage
@@ -24,6 +23,9 @@ excluded: # paths to ignore during linting
 - Pods
 - Documentation
 
+analyzer_rules:
+- unused_import
+
 empty_count: 
     severity: warning
 force_cast: warning

AEPEdge.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "AEPEdge"
-  s.version          = "1.6.0"
+  s.version          = "4.0.0"
   s.summary          = "Experience Platform Edge extension for Adobe Experience Platform Mobile SDK. Written and maintained by Adobe."
 
   s.description      = <<-DESC
@@ -12,14 +12,14 @@ Pod::Spec.new do |s|
   s.author           = "Adobe Experience Platform SDK Team"
   s.source           = { :git => "https://github.com/adobe/aepsdk-edge-ios.git", :tag => s.version.to_s }
 
-  s.ios.deployment_target = '10.0'
-  s.tvos.deployment_target = '10.0'
+  s.ios.deployment_target = '11.0'
+  s.tvos.deployment_target = '11.0'
 
   s.swift_version = '5.1'
 
   s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' }
-  s.dependency 'AEPCore', '>= 3.7.0'
-  s.dependency 'AEPEdgeIdentity', '>= 1.2.0'
+  s.dependency 'AEPCore', '>= 4.0.0'
+  s.dependency 'AEPEdgeIdentity', '>= 4.0.0'
 
   s.source_files = 'Sources/**/*.swift'
 end