dev -> staging (5.0.0 release)

.github/workflows/release.yml

@@ -29,6 +29,9 @@ jobs:
     - name: Install jq
       run: brew install jq
 
+    - name: Install xcodegen
+      run: brew install xcodegen
+
     - name: Check version in Podspec
       run: |
         set -eo pipefail
@@ -46,14 +49,13 @@ jobs:
         echo SPM integration test starts:
         make test-SPM-integration
 
-    - name: podspec file verification
+    - name: Podspec file verification
       if: ${{ github.event.inputs.action_tag == 'yes' }}
       run: |
         set -eo pipefail
         echo podspec file verification starts:
         make test-podspec
 
-
     - name: Build Artifact
       if: ${{ github.event.inputs.action_tag == 'yes' }}
       run: |
@@ -92,4 +94,3 @@ jobs:
       env:
         COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
 
-

AEPUserProfile.xcodeproj/project.pbxproj

@@ -699,7 +699,8 @@
 			buildSettings = {
 				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_IDENTITY = "";
+				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -730,7 +731,8 @@
 			buildSettings = {
 				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_IDENTITY = "";
+				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;

Makefile

@@ -46,7 +46,7 @@ test: clean
 	@echo "######################################################################"
 	xcodebuild test -workspace $(PROJECT_NAME).xcworkspace -scheme $(PROJECT_NAME)Tests -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath build/out -enableCodeCoverage YES
 
-archive: clean pod-update
+archive: clean pod-install
 	xcodebuild archive -workspace $(PROJECT_NAME).xcworkspace -scheme $(SCHEME_NAME_XCFRAMEWORK) -archivePath "./build/ios.xcarchive" -sdk iphoneos -destination="iOS" SKIP_INSTALL=NO BUILD_LIBRARIES_FOR_DISTRIBUTION=YES
 	xcodebuild archive -workspace $(PROJECT_NAME).xcworkspace -scheme $(SCHEME_NAME_XCFRAMEWORK) -archivePath "./build/ios_simulator.xcarchive" -sdk iphonesimulator -destination="iOS Simulator" SKIP_INSTALL=NO BUILD_LIBRARIES_FOR_DISTRIBUTION=YES
 	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)

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 /*
  Copyright 2020 Adobe. All rights reserved.
@@ -24,7 +24,7 @@ let package = Package(
     ],
     targets: [
         .target(name: "AEPUserProfile",
-                dependencies: ["AEPCore"],
+                dependencies: [.product(name: "AEPCore", package: "aepsdk-core-ios")],                
                 path: "AEPUserProfile/Sources"),
     ]
 )

Podfile

@@ -10,21 +10,21 @@ project 'AEPUserProfile.xcodeproj'
 pod 'SwiftLint', '0.52.0'
 
 target 'AEPUserProfile' do
-  pod 'AEPCore', :git => 'https://github.com/adobe/aepsdk-core-ios.git', :branch => 'staging'
-  pod 'AEPServices', :git => 'https://github.com/adobe/aepsdk-core-ios.git', :branch => 'staging'
-  pod 'AEPRulesEngine', :git => 'https://github.com/adobe/aepsdk-rulesengine-ios.git', :branch => 'staging'
+  pod 'AEPCore'
+  pod 'AEPServices'
+  pod 'AEPRulesEngine'
 end
 
 target 'AEPUserProfileTests' do
-  pod 'AEPCore', :git => 'https://github.com/adobe/aepsdk-core-ios.git', :branch => 'staging'
-  pod 'AEPServices', :git => 'https://github.com/adobe/aepsdk-core-ios.git', :branch => 'staging'
-  pod 'AEPRulesEngine', :git => 'https://github.com/adobe/aepsdk-rulesengine-ios.git', :branch => 'staging'
-  pod 'AEPTestUtils', :git => 'https://github.com/adobe/aepsdk-testutils-ios.git', :branch => 'main'
+  pod 'AEPCore'
+  pod 'AEPServices'
+  pod 'AEPRulesEngine'
+  pod 'AEPTestUtils', :git => 'https://github.com/adobe/aepsdk-testutils-ios.git', :tag => '5.0.0'
 end
 
 target 'AEPUserProfileE2ETests' do
-  pod 'AEPCore', :git => 'https://github.com/adobe/aepsdk-core-ios.git', :branch => 'staging'
-  pod 'AEPServices', :git => 'https://github.com/adobe/aepsdk-core-ios.git', :branch => 'staging'
-  pod 'AEPRulesEngine', :git => 'https://github.com/adobe/aepsdk-rulesengine-ios.git', :branch => 'staging'
-  pod 'AEPTestUtils', :git => 'https://github.com/adobe/aepsdk-testutils-ios.git', :branch => 'main'
+  pod 'AEPCore'
+  pod 'AEPServices'
+  pod 'AEPRulesEngine'
+  pod 'AEPTestUtils', :git => 'https://github.com/adobe/aepsdk-testutils-ios.git', :tag => '5.0.0'
 end

Podfile.lock

@@ -10,43 +10,28 @@ PODS:
   - SwiftLint (0.52.0)
 
 DEPENDENCIES:
-  - AEPCore (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`)
-  - AEPTestUtils (from `https://github.com/adobe/aepsdk-testutils-ios.git`, branch `main`)
+  - AEPCore
+  - AEPRulesEngine
+  - AEPServices
+  - AEPTestUtils (from `https://github.com/adobe/aepsdk-testutils-ios.git`, tag `5.0.0`)
   - SwiftLint (= 0.52.0)
 
 SPEC REPOS:
   trunk:
+    - AEPCore
+    - AEPRulesEngine
+    - AEPServices
     - SwiftLint
 
 EXTERNAL SOURCES:
-  AEPCore:
-    :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
   AEPTestUtils:
-    :branch: main
     :git: https://github.com/adobe/aepsdk-testutils-ios.git
+    :tag: 5.0.0
 
 CHECKOUT OPTIONS:
-  AEPCore:
-    :commit: f44b7b0d66e2c6a1454b51ed5a9d835bfbc2a8f9
-    :git: https://github.com/adobe/aepsdk-core-ios.git
-  AEPRulesEngine:
-    :commit: 7750ad5041c23c76053713441546116738e0fdcb
-    :git: https://github.com/adobe/aepsdk-rulesengine-ios.git
-  AEPServices:
-    :commit: f44b7b0d66e2c6a1454b51ed5a9d835bfbc2a8f9
-    :git: https://github.com/adobe/aepsdk-core-ios.git
   AEPTestUtils:
-    :commit: 33020333a1e804526dd0d80f4f29e0356e062480
     :git: https://github.com/adobe/aepsdk-testutils-ios.git
+    :tag: 5.0.0
 
 SPEC CHECKSUMS:
   AEPCore: f1c3e9238bb12e7e1103f4407c341ebc65aeab5b
@@ -55,6 +40,6 @@ SPEC CHECKSUMS:
   AEPTestUtils: 20495b368da57904ca2e9f241d1d8b114f9887b5
   SwiftLint: 13280e21cdda6786ad908dc6e416afe5acd1fcb7
 
-PODFILE CHECKSUM: 553013e02c1b8b2c6f1612bb796a9d974a258c76
+PODFILE CHECKSUM: d54ccb88f821a8734b48f4196652f72b23c1c74a
 
 COCOAPODS: 1.14.3

Script/test-podspec.sh

@@ -11,7 +11,23 @@ mkdir -p $PROJECT_NAME && cd $PROJECT_NAME
 
 # Create a new Xcode project.
 swift package init
-swift package generate-xcodeproj
+
+# Use Xcodegen to generate the project.
+echo "
+name: $PROJECT_NAME
+options:
+  bundleIdPrefix: $PROJECT_NAME
+targets:
+  $PROJECT_NAME:
+    type: framework
+    sources: Sources
+    platform: iOS
+    deploymentTarget: "12.0"
+    settings:
+      GENERATE_INFOPLIST_FILE: YES
+" >>project.yml
+
+xcodegen generate
 
 # Create a Podfile with our pod as dependency.
 echo "
@@ -33,19 +49,19 @@ pod install
 
 # Archive for generic iOS device
 echo '############# Archive for generic iOS device ###############'
-xcodebuild archive -scheme TestProject-Package -workspace TestProject.xcworkspace -destination 'generic/platform=iOS'
+xcodebuild archive -scheme TestProject -workspace TestProject.xcworkspace -destination 'generic/platform=iOS'
 
 # Build for generic iOS device
 echo '############# Build for generic iOS device ###############'
-xcodebuild clean build -scheme TestProject-Package -workspace TestProject.xcworkspace -destination 'generic/platform=iOS'
+xcodebuild clean build -scheme TestProject -workspace TestProject.xcworkspace -destination 'generic/platform=iOS'
 
 # Archive for x86_64 simulator
 echo '############# Archive for simulator ###############'
-xcodebuild archive -scheme TestProject-Package -workspace TestProject.xcworkspace -destination 'generic/platform=iOS Simulator'
+xcodebuild archive -scheme TestProject -workspace TestProject.xcworkspace -destination 'generic/platform=iOS Simulator'
 
 # Build for x86_64 simulator
 echo '############# Build for simulator ###############'
-xcodebuild clean build -scheme TestProject-Package -workspace TestProject.xcworkspace -destination 'generic/platform=iOS Simulator'
+xcodebuild clean build -scheme TestProject -workspace TestProject.xcworkspace -destination 'generic/platform=iOS Simulator'
 
 # Clean up.
 cd ../