Merge pull request #143 from adobe/staging

Staging to main for 5.0.0 release

.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;
@@ -18,7 +18,7 @@ jobs:
 
   build-and-test:
     macos:
-      xcode: 14.1.0 # Specify the Xcode version to use
+      xcode: 15.1.0 # Specify the Xcode version to use
 
     steps:
       - checkout
@@ -64,28 +64,24 @@ jobs:
           command: make lint
 
       # pre-start the simulator to prevent timeouts
-      - run:
-          name: Pre-start Simulator
-          command: xcrun instruments -w "iPhone 14 (16.1) [" || true
+      - macos/preboot-simulator:
+          platform: "iOS"
+          version: "17.2"
+          device: "iPhone 15"
 
       - run:
           name: Run Tests
           command: make test
 
-      - codecov/upload:
-          flags: aepassurance-ios-tests
-          upload_name: Coverage Report for AEPAssurance iOS Tests
-          xtra_args: -c -v --xc --xp build/AEPAssurance-ios.xcresult
-
-      # build swift package
-      - run:
-          name: Build Swift Package
-          command: make swift-build
+      # - codecov/upload:
+      #     flags: aepassurance-ios-tests
+      #     upload_name: Coverage Report for AEPAssurance iOS Tests
+      #     xtra_args: -c -v --xc --xp build/AEPAssurance-ios.xcresult
 
       # verify XCFramework archive builds
       - run:
           name: Build XCFramework
           command: |
-            if [ "${CIRCLE_BRANCH}" == "main" ]; then
-              make archive
+            if [ "${CIRCLE_BRANCH}" == "main" ] || [ "${CIRCLE_BRANCH}" == "staging" ]; then
+              make ci-archive
             fi

.github/workflows/release.yml

@@ -20,21 +20,24 @@ on:
 
 jobs:
   release_assurance:
-    runs-on: macos-latest
+    runs-on: macos-13
     steps:
     - uses: actions/checkout@v2
       with:
         ref: ${{ github.event.inputs.branch }}
     - uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: '14.1'
+        xcode-version: '15.0.1'
 
     - name: Install jq
       run: brew install jq
 
     - name: Install cocoapods
       run: gem install cocoapods
 
+    - name: Install xcodegen
+      run: brew install xcodegen
+
     - name: Check version in Podspec
       run: |
         set -eo pipefail
@@ -88,6 +91,6 @@ jobs:
       if: ${{ github.event.inputs.release_AEPAssurance == 'yes' }}
       run: |
         set -eo pipefail
-        pod trunk push AEPAssurance.podspec --allow-warnings --swift-version=5.1
+        pod trunk push AEPAssurance.podspec --allow-warnings
       env:
         COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}

.github/workflows/update_test_app.yml

@@ -8,11 +8,14 @@ on:
       - completed
 jobs:
   updateTestApp:
-    runs-on: macos-latest
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: '15.1.0'
       - name: Build Test App
         run: |
             set -eo pipefail

.gitignore

@@ -3,6 +3,7 @@
 # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
 .DS_Store
 TestProject/
+.vscode/
 
 ## User settings
 xcuserdata/

AEPAssurance.podspec

@@ -1,6 +1,7 @@
 Pod::Spec.new do |s|
   s.name             = "AEPAssurance"
-  s.version          = "4.1.2"
+  s.version          = "5.0.0"
+
   s.summary          = "AEPAssurance SDK for Adobe Experience Platform Mobile SDK. Written and maintained by Adobe."
 
   s.description      = <<-DESC
@@ -11,12 +12,13 @@ Pod::Spec.new do |s|
   s.license          = { :type => "Apache License, Version 2.0", :file => "LICENSE" }
   s.author           = "Adobe Experience Platform SDK Team"
   s.source           = { :git => "https://github.com/adobe/aepsdk-assurance-ios.git", :tag => s.version.to_s }
-  s.ios.deployment_target = '11.0'
+  s.ios.deployment_target = '12.0'
   s.swift_version = '5.1'
 
   s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' }
-  s.dependency 'AEPCore', '>= 4.0.0', '< 5.0'
-  s.dependency 'AEPServices', '>= 4.0.0', '< 5.0'
+  s.dependency 'AEPCore', '>= 5.0.0', '< 6.0.0'
+  s.dependency 'AEPServices', '>= 5.0.0', '< 6.0.0'
+
 
   s.source_files = 'AEPAssurance/Source/**/*.swift'
 end

AEPAssurance.xcodeproj/project.pbxproj

@@ -1555,7 +1555,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = AEPAssurance/Source/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",
@@ -1584,7 +1584,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = AEPAssurance/Source/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",
@@ -1607,7 +1607,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = AEPAssurance/UnitTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1628,7 +1628,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = AEPAssurance/UnitTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

AEPAssurance/Source/AssuranceClientInfo.swift

@@ -118,6 +118,8 @@ enum AssuranceClientInfo {
             return "Apple Car Play"
         case .mac:
             return "Mac"
+        case .vision:
+            return "Vision"
         @unknown default:
             return "Unspecified"
         }

AEPAssurance/Source/AssuranceConstants.swift

@@ -15,7 +15,8 @@ import Foundation
 enum AssuranceConstants {
     static let EXTENSION_NAME = "com.adobe.assurance"
     static let FRIENDLY_NAME = "Assurance"
-    static let EXTENSION_VERSION = "4.1.2"
+    static let EXTENSION_VERSION = "5.0.0"
+
     static let LOG_TAG = FRIENDLY_NAME
     static let DEFAULT_ENVIRONMENT = AssuranceEnvironment.prod
 

AEPAssurance/UnitTests/PluginLogForwardingTests.swift

@@ -148,19 +148,19 @@ class PluginLogForwardingTests: XCTestCase {
         XCTAssertNotNil(logMessage)
         XCTAssertTrue(logMessage!.contains("secret log message"))
 
-        sleep(1)
         // reset the expectation and invert it to verify that sendEvent is not called
         mockSession.sendEventCalled = XCTestExpectation()
         mockSession.sendEventCalled.isInverted = true
         // now send event to stop forwarding
         plugin.receiveEvent(logForwardingEvent(start: false))
-
+
+        sleep(1)
         // add log statement
         os_log("another secret log message")
-
+        
         // verify
-        XCTAssertFalse(plugin.currentlyRunning)
         wait(for: [mockSession.sendEventCalled], timeout: 1.0)
+        XCTAssertFalse(plugin.currentlyRunning)
     }
 
     func test_commandLogForwarding_stopForwarding_whenNeverStarted() {

Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'cocoapods', '= 1.10.0'
+gem 'cocoapods', '= 1.14.3'

Gemfile.lock

@@ -1,93 +1,101 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.3)
-    activesupport (5.2.5)
+    CFPropertyList (3.0.7)
+      base64
+      nkf
+      rexml
+    activesupport (6.1.7.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
+      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.0.3)
-    cocoapods (1.10.0)
-      addressable (~> 2.6)
+    base64 (0.2.0)
+    claide (1.1.0)
+    cocoapods (1.14.3)
+      addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.10.0)
+      cocoapods-core (= 1.14.3)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.4.0, < 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.4.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.6.6)
+      molinillo (~> 0.8.0)
       nap (~> 1.0)
-      ruby-macho (~> 1.4)
-      xcodeproj (>= 1.19.0, < 2.0)
-    cocoapods-core (1.10.0)
-      activesupport (> 5.0, < 6)
-      addressable (~> 2.6)
+      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
+      public_suffix (~> 4.0)
       typhoeus (~> 1.0)
-    cocoapods-deintegrate (1.0.4)
-    cocoapods-downloader (1.4.0)
+    cocoapods-deintegrate (1.0.5)
+    cocoapods-downloader (2.1)
     cocoapods-plugins (1.0.0)
       nap
-    cocoapods-search (1.0.0)
-    cocoapods-trunk (1.5.0)
+    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.1.8)
+    concurrent-ruby (1.2.3)
     escape (0.0.4)
-    ethon (0.13.0)
+    ethon (0.16.0)
       ffi (>= 1.15.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.8.10)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    json (2.5.1)
-    minitest (5.14.4)
-    molinillo (0.6.6)
+    json (2.7.1)
+    minitest (5.22.3)
+    molinillo (0.8.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
-    public_suffix (4.0.6)
-    ruby-macho (1.4.0)
-    thread_safe (0.3.6)
-    typhoeus (1.4.0)
+    nkf (0.2.0)
+    public_suffix (4.0.7)
+    rexml (3.2.6)
+    ruby-macho (2.5.1)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-    xcodeproj (1.19.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    xcodeproj (1.24.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.13)
 
 PLATFORMS
-  x86_64-darwin-19
+  ruby
 
 DEPENDENCIES
-  cocoapods (= 1.10.0)
+  cocoapods (= 1.14.3)
 
 BUNDLED WITH
-   2.2.16
+   1.17.2