Merge pull request #165 from sbenedicadb/dev-v5.0.0

Dev v5.0.0 to staging

.circleci/config.yml

@@ -38,26 +38,14 @@ commands:
           paths:
             - vendor/bundle
 
-      # restore pods related caches
-      - restore_cache:
-          name: Restore CocoaPods Cache
-          keys:
-            - cocoapods-cache-v5-{{ arch }}-{{ .Branch }}-{{ checksum "Podfile.lock" }}
-            - cocoapods-cache-v5-{{ arch }}-{{ .Branch }}
-            - cocoapods-cache-v5
-
       # install CocoaPods - using default CocoaPods version, not the bundle
       - run:
           name: Repo Update & Install CocoaPods
           command: make ci-pod-install
 
-      # save pods related files
-      - save_cache:
-          name: Save CocoaPods Cache
-          key: cocoapods-cache-v5-{{ arch }}-{{ .Branch }}-{{ checksum "Podfile.lock" }}
-          paths:
-            - ./Pods
-            - ~/.cocoapods
+      - run:
+          name: Install xcodegen
+          command: brew install xcodegen
 
   prestart_ios_simulator:
     steps:
@@ -108,28 +96,28 @@ jobs:
 
   test-spm-podspec-archive:  
     macos:
-      xcode: 15.1.0 # Specify the Xcode version to use
+      xcode: 15.0 # Specify the Xcode version to use
 
     steps:
       - checkout
       # 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
       # verify podspec is valid
-      - run:
-          name: Test Podspec
-          command: |
-            if [ "${CIRCLE_BRANCH}" == "main" ]; then
-              make test-podspec
-            fi
+      # - run:
+      #     name: Test Podspec
+      #     command: |
+      #       if [ "${CIRCLE_BRANCH}" == "main" ]; then
+      #         make test-podspec
+      #       fi
       # verify SPM works
       - run:
           name: Test SPM 
           command: |
-            if [ "${CIRCLE_BRANCH}" == "main" ]; then
+            if [ "${CIRCLE_BRANCH}" == "main" ] || [ "${CIRCLE_BRANCH}" == "staging" ]; then
               make test-SPM-integration
             fi

.github/workflows/release.yml

@@ -27,7 +27,7 @@ jobs:
         ref: main
     - uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: '15.0'
+        xcode-version: '15.0.1'
 
     - name: Install jq
       run: brew install jq

Makefile

@@ -49,7 +49,11 @@ test: clean
 	@echo "######################################################################"
 	xcodebuild test -workspace $(PROJECT_NAME).xcworkspace -scheme $(PROJECT_NAME)Tests -destination $(IOS_DESTINATION) -derivedDataPath build/out -resultBundlePath build/$(PROJECT_NAME).xcresult -enableCodeCoverage YES
 
-archive: clean pod-install build
+archive: pod-install _archive
+
+ci-archive: ci-pod-install _archive
+
+_archive: clean build
 	xcodebuild -create-xcframework -framework $(SIMULATOR_ARCHIVE_PATH)$(EXTENSION_NAME).framework -debug-symbols $(SIMULATOR_ARCHIVE_DSYM_PATH)$(EXTENSION_NAME).framework.dSYM -framework $(IOS_ARCHIVE_PATH)$(EXTENSION_NAME).framework -debug-symbols $(IOS_ARCHIVE_DSYM_PATH)$(EXTENSION_NAME).framework.dSYM -output ./build/$(TARGET_NAME_XCFRAMEWORK)
 
 build:

Package.swift

@@ -24,7 +24,7 @@ let package = Package(
  ],
  targets: [
   .target(name: "AEPTarget",
-          dependencies: ["AEPCore"],
+          dependencies: [.product(name: "AEPCore", package: "aepsdk-core-ios")],
           path: "AEPTarget/Sources"),
  ]
 )

Podfile

@@ -28,20 +28,16 @@ def lib_dev
 end
 
 def app_main
-    pod 'AEPCore'
-    pod 'AEPServices'
-    pod 'AEPRulesEngine'
+    lib_main    
     pod 'AEPIdentity'
     pod 'AEPLifecycle'
     pod 'AEPSignal'
-    pod 'AEPAnalytics'
-    pod 'AEPAssurance'
+    pod 'AEPAnalytics', :git => 'https://github.com/adobe/aepsdk-analytics-ios.git', :branch => $dev_branch
+#    pod 'AEPAssurance'
 end
 
 def app_dev
-    pod 'AEPCore', :git => $dev_repo, :branch => $dev_branch
-    pod 'AEPServices', :git => $dev_repo, :branch => $dev_branch
-    pod 'AEPRulesEngine', :git => 'https://github.com/adobe/aepsdk-rulesengine-ios.git', :branch => $dev_branch
+    lib_dev    
     pod 'AEPIdentity', :git => $dev_repo, :branch => $dev_branch
     pod 'AEPLifecycle', :git => $dev_repo, :branch => $dev_branch
     pod 'AEPSignal', :git => $dev_repo, :branch => $dev_branch
@@ -53,18 +49,18 @@ end
 # TARGET DEFINITIONS
 # ==================
 target 'AEPTarget' do
-  lib_dev
+  lib_main
 end
 
 target 'AEPTargetDemoApp' do
-  app_dev
+  app_main
 end
 
 target 'AEPTargetDemoObjCApp' do
-  app_dev
+  app_main
 end
 
 target 'AEPTargetTests' do
-  app_dev
+  app_main
   pod 'SwiftyJSON', '~> 5.0'
 end

Podfile.lock

@@ -1,8 +1,5 @@
 PODS:
-  - AEPAnalytics (4.0.0):
-    - AEPCore (>= 4.0.0)
-    - AEPServices (>= 4.0.0)
-  - AEPAssurance (5.0.0):
+  - AEPAnalytics (5.0.0):
     - AEPCore (< 6.0.0, >= 5.0.0)
     - AEPServices (< 6.0.0, >= 5.0.0)
   - AEPCore (5.0.0):
@@ -20,72 +17,39 @@ PODS:
   - SwiftyJSON (5.0.1)
 
 DEPENDENCIES:
-  - AEPAnalytics
-  - AEPAssurance (from `https://github.com/adobe/aepsdk-assurance-ios.git`, branch `staging`)
-  - AEPCore (from `https://github.com/adobe/aepsdk-core-ios.git`, branch `staging`)
-  - AEPIdentity (from `https://github.com/adobe/aepsdk-core-ios.git`, branch `staging`)
-  - AEPLifecycle (from `https://github.com/adobe/aepsdk-core-ios.git`, branch `staging`)
-  - AEPRulesEngine (from `https://github.com/adobe/aepsdk-rulesengine-ios.git`, branch `staging`)
-  - AEPServices (from `https://github.com/adobe/aepsdk-core-ios.git`, branch `staging`)
-  - AEPSignal (from `https://github.com/adobe/aepsdk-core-ios.git`, branch `staging`)
+  - AEPAnalytics (from `https://github.com/adobe/aepsdk-analytics-ios.git`, branch `staging`)
+  - AEPCore
+  - AEPIdentity
+  - AEPLifecycle
+  - AEPRulesEngine
+  - AEPServices
+  - AEPSignal
   - SwiftLint (= 0.52.0)
   - SwiftyJSON (~> 5.0)
 
 SPEC REPOS:
   trunk:
-    - AEPAnalytics
+    - AEPCore
+    - AEPIdentity
+    - AEPLifecycle
+    - AEPRulesEngine
+    - AEPServices
+    - AEPSignal
     - SwiftLint
     - SwiftyJSON
 
 EXTERNAL SOURCES:
-  AEPAssurance:
+  AEPAnalytics:
     :branch: staging
-    :git: https://github.com/adobe/aepsdk-assurance-ios.git
-  AEPCore:
-    :branch: staging
-    :git: https://github.com/adobe/aepsdk-core-ios.git
-  AEPIdentity:
-    :branch: staging
-    :git: https://github.com/adobe/aepsdk-core-ios.git
-  AEPLifecycle:
-    :branch: staging
-    :git: https://github.com/adobe/aepsdk-core-ios.git
-  AEPRulesEngine:
-    :branch: staging
-    :git: https://github.com/adobe/aepsdk-rulesengine-ios.git
-  AEPServices:
-    :branch: staging
-    :git: https://github.com/adobe/aepsdk-core-ios.git
-  AEPSignal:
-    :branch: staging
-    :git: https://github.com/adobe/aepsdk-core-ios.git
+    :git: https://github.com/adobe/aepsdk-analytics-ios.git
 
 CHECKOUT OPTIONS:
-  AEPAssurance:
-    :commit: 6098c48a067daf4c70cb630b0000564552ad3bc7
-    :git: https://github.com/adobe/aepsdk-assurance-ios.git
-  AEPCore:
-    :commit: f44b7b0d66e2c6a1454b51ed5a9d835bfbc2a8f9
-    :git: https://github.com/adobe/aepsdk-core-ios.git
-  AEPIdentity:
-    :commit: f44b7b0d66e2c6a1454b51ed5a9d835bfbc2a8f9
-    :git: https://github.com/adobe/aepsdk-core-ios.git
-  AEPLifecycle:
-    :commit: f44b7b0d66e2c6a1454b51ed5a9d835bfbc2a8f9
-    :git: https://github.com/adobe/aepsdk-core-ios.git
-  AEPRulesEngine:
-    :commit: 814672b136b6c71ab529a3f1366f3bf16cd9a532
-    :git: https://github.com/adobe/aepsdk-rulesengine-ios.git
-  AEPServices:
-    :commit: f44b7b0d66e2c6a1454b51ed5a9d835bfbc2a8f9
-    :git: https://github.com/adobe/aepsdk-core-ios.git
-  AEPSignal:
-    :commit: f44b7b0d66e2c6a1454b51ed5a9d835bfbc2a8f9
-    :git: https://github.com/adobe/aepsdk-core-ios.git
+  AEPAnalytics:
+    :commit: 9493af778f039d6ba0ab47a7089e4b7409cb8345
+    :git: https://github.com/adobe/aepsdk-analytics-ios.git
 
 SPEC CHECKSUMS:
-  AEPAnalytics: a510eb9653fac7f913965ad4291c8d51f74ffdcd
-  AEPAssurance: 7f260ded4df38a70a06efebade8c33a3e3221984
+  AEPAnalytics: c35fedaf0d515fb949001f944aea3fe72b435363
   AEPCore: f1c3e9238bb12e7e1103f4407c341ebc65aeab5b
   AEPIdentity: a65c1eba43a06f01b0dab191b27a53a81adada57
   AEPLifecycle: d4e0e1e86d6225d87203875d67f56c48f7ab7f67
@@ -95,6 +59,6 @@ SPEC CHECKSUMS:
   SwiftLint: 13280e21cdda6786ad908dc6e416afe5acd1fcb7
   SwiftyJSON: 2f33a42c6fbc52764d96f13368585094bfd8aa5e
 
-PODFILE CHECKSUM: ae275201056492cde01fa3f2eddf9516d67aec22
+PODFILE CHECKSUM: 96abd20609ec984da403b9623c6a97d2e9786acb
 
-COCOAPODS: 1.15.0
+COCOAPODS: 1.14.3

Script/test-SPM.sh

@@ -38,8 +38,8 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: \"https://github.com/adobe/aepsdk-core-ios.git\", .upToNextMajor(from:\"5.0.0\")),
-        .package(path: \"../\")
+        .package(name: \"AEPCore\", url: \"https://github.com/adobe/aepsdk-core-ios.git\", .branch(\"main\")),
+        .package(name: \"AEPTarget\", path: \"../\")
     ],
     targets: [
         .target(
@@ -57,10 +57,11 @@ let package = Package(
 " >Package.swift
 
 swift package update
+swift package resolve
 
-# This is a workaround for SPM issue https://github.com/apple/swift-package-manager/issues/5767
-swift package dump-pif > /dev/null || true
-xcodebuild clean -scheme TestProject -destination 'generic/platform=iOS' > /dev/null || true
+# This is necessary to avoid internal PIF error
+swift package dump-pif > /dev/null
+(xcodebuild clean -scheme TestProject -destination 'generic/platform=iOS' > /dev/null) || :
 
 # Archive for generic iOS device
 echo '############# Archive for generic iOS device ###############'