Skip to content

Commit

Permalink
Merge pull request #127 from adobe/staging
Browse files Browse the repository at this point in the history
staging -> main for v5.0.0 release
  • Loading branch information
emdobrin committed Mar 20, 2024
2 parents 7229952 + 00c68d3 commit 25fab07
Show file tree
Hide file tree
Showing 29 changed files with 499 additions and 561 deletions.
32 changes: 16 additions & 16 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
version: 2.1

orbs:
codecov: codecov/[email protected]
# codecov: codecov/[email protected]
macos: circleci/macos@2

# Workflows orchestrate a set of jobs to be run;
Expand Down Expand Up @@ -69,21 +69,21 @@ commands:
prestart_ios_simulator:
steps:
- macos/preboot-simulator:
version: "16.1"
device: "iPhone 14"
version: "17.2"
device: "iPhone 15"

prestart_tvos_simulator:
steps:
- macos/preboot-simulator:
platform: "tvOS"
version: "16.1"
version: "17.2"
device: "Apple TV"

jobs:

validate-code:
macos:
xcode: 14.1.0 # Specify the Xcode version to use
xcode: 15.1.0 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -96,7 +96,7 @@ jobs:

test-ios:
macos:
xcode: 14.1.0 # Specify the Xcode version to use
xcode: 15.1.0 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -111,14 +111,14 @@ jobs:

# Code coverage upload using Codecov
# See options explanation here: https://docs.codecov.com/docs/codecov-uploader
- codecov/upload:
flags: ios-tests
upload_name: Coverage Report for iOS Tests
xtra_args: -c -v --xc --xp iosresults.xcresult
# - codecov/upload:
# flags: ios-tests
# upload_name: Coverage Report for iOS Tests
# xtra_args: -c -v --xc --xp iosresults.xcresult

test-tvos:
macos:
xcode: 14.1.0 # Specify the Xcode version to use
xcode: 15.1.0 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -133,14 +133,14 @@ jobs:

# Code coverage upload using Codecov
# See options explanation here: https://docs.codecov.com/docs/codecov-uploader
- codecov/upload:
flags: tvos-tests
upload_name: Coverage Report for tvOS Tests
xtra_args: -c -v --xc --xp tvosresults.xcresult
# - codecov/upload:
# flags: tvos-tests
# upload_name: Coverage Report for tvOS Tests
# xtra_args: -c -v --xc --xp tvosresults.xcresult

build_xcframework_and_app:
macos:
xcode: 14.1.0 # Specify the Xcode version to use
xcode: 15.1.0 # Specify the Xcode version to use

steps:
- checkout
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,23 @@ on:

jobs:
release_EdgeIdentity:
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.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: |
Expand Down Expand Up @@ -89,7 +92,7 @@ jobs:
if: ${{ github.event.inputs.release_AEPEdgeIdentity == 'yes' }}
run: |
set -eo pipefail
pod trunk push AEPEdgeIdentity.podspec --allow-warnings --synchronous --swift-version=5.1
pod trunk push AEPEdgeIdentity.podspec --allow-warnings --synchronous
pod repo update
env:
COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
8 changes: 4 additions & 4 deletions AEPEdgeIdentity.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "AEPEdgeIdentity"
s.version = "4.0.1"
s.version = "5.0.0"
s.summary = "Experience Platform Edge Identity extension for Adobe Experience Platform Mobile SDK. Written and maintained by Adobe."

s.description = <<-DESC
Expand All @@ -12,13 +12,13 @@ Pod::Spec.new do |s|
s.author = "Adobe Experience Platform SDK Team"
s.source = { :git => "https://github.com/adobe/aepsdk-identityedge-ios.git", :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 'AEPCore', '>= 4.0.0', '< 5.0.0'
s.dependency 'AEPCore', '>= 5.0.0', '< 6.0.0'

s.source_files = 'Sources/**/*.swift'
end
54 changes: 20 additions & 34 deletions AEPEdgeIdentity.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,8 @@
BFF649AD25C0EFE10012A4C5 /* IdentityMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF649AC25C0EFE10012A4C5 /* IdentityMap.swift */; };
BFF649B725C0FC810012A4C5 /* IdentityMapTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF649B625C0FC810012A4C5 /* IdentityMapTests.swift */; };
BFF64A6025C4C63F0012A4C5 /* EdgeIdentity+IdentityDirectTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF64A5A25C4C5410012A4C5 /* EdgeIdentity+IdentityDirectTests.swift */; };
BFF64A6A25C4C6A90012A4C5 /* TestHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF64A6925C4C6A90012A4C5 /* TestHelpers.swift */; };
BFF64AE925C8A9B40012A4C5 /* TestableExtensionRuntime.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF64AE625C8A9B40012A4C5 /* TestableExtensionRuntime.swift */; };
BFF64AEA25C8A9B40012A4C5 /* TestableExtensionRuntime.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF64AE625C8A9B40012A4C5 /* TestableExtensionRuntime.swift */; };
BFF64AEB25C8A9B40012A4C5 /* MockExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF64AE725C8A9B40012A4C5 /* MockExtension.swift */; };
BFF64AEC25C8A9B40012A4C5 /* MockExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF64AE725C8A9B40012A4C5 /* MockExtension.swift */; };
BFF64AED25C8A9B40012A4C5 /* MockDataStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF64AE825C8A9B40012A4C5 /* MockDataStore.swift */; };
BFF64AEE25C8A9B40012A4C5 /* MockDataStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFF64AE825C8A9B40012A4C5 /* MockDataStore.swift */; };
D43BAB1525BBA4F700B08CC0 /* AEPEdgeIdentity.h in Headers */ = {isa = PBXBuildFile; fileRef = D43BAB1325BBA4F700B08CC0 /* AEPEdgeIdentity.h */; settings = {ATTRIBUTES = (Public, ); }; };
D43BAB2825BBA8A900B08CC0 /* IdentityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D43BAB2725BBA8A900B08CC0 /* IdentityTests.swift */; };
D43BAB2A25BBA8A900B08CC0 /* AEPEdgeIdentity.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D43BAB1025BBA4F700B08CC0 /* AEPEdgeIdentity.framework */; };
Expand Down Expand Up @@ -173,10 +168,7 @@
BFF649AC25C0EFE10012A4C5 /* IdentityMap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IdentityMap.swift; sourceTree = "<group>"; };
BFF649B625C0FC810012A4C5 /* IdentityMapTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IdentityMapTests.swift; sourceTree = "<group>"; };
BFF64A5A25C4C5410012A4C5 /* EdgeIdentity+IdentityDirectTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "EdgeIdentity+IdentityDirectTests.swift"; sourceTree = "<group>"; };
BFF64A6925C4C6A90012A4C5 /* TestHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestHelpers.swift; sourceTree = "<group>"; };
BFF64AE625C8A9B40012A4C5 /* TestableExtensionRuntime.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestableExtensionRuntime.swift; sourceTree = "<group>"; };
BFF64AE725C8A9B40012A4C5 /* MockExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockExtension.swift; sourceTree = "<group>"; };
BFF64AE825C8A9B40012A4C5 /* MockDataStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockDataStore.swift; sourceTree = "<group>"; };
C47B40176808D37B24680AD5 /* Pods-TestApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TestApp.debug.xcconfig"; path = "Target Support Files/Pods-TestApp/Pods-TestApp.debug.xcconfig"; sourceTree = "<group>"; };
C7321A30094E7F594E3CF8C2 /* Pods-FunctionalTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FunctionalTests.debug.xcconfig"; path = "Target Support Files/Pods-FunctionalTests/Pods-FunctionalTests.debug.xcconfig"; sourceTree = "<group>"; };
D1A06D8E5AC518ED6EE0DA30 /* Pods-TestApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TestApp.release.xcconfig"; path = "Target Support Files/Pods-TestApp/Pods-TestApp.release.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -306,9 +298,7 @@
BFF64AE525C8A9B40012A4C5 /* Mocks */ = {
isa = PBXGroup;
children = (
BFF64AE625C8A9B40012A4C5 /* TestableExtensionRuntime.swift */,
BFF64AE725C8A9B40012A4C5 /* MockExtension.swift */,
BFF64AE825C8A9B40012A4C5 /* MockDataStore.swift */,
);
name = Mocks;
path = Tests/Mocks;
Expand Down Expand Up @@ -382,13 +372,13 @@
isa = PBXGroup;
children = (
BFF6498E25C0AC0F0012A4C5 /* ECIDTests.swift */,
BFF6497925C09ED80012A4C5 /* IdentityPublicAPITests.swift */,
D43BAB2725BBA8A900B08CC0 /* IdentityTests.swift */,
BFF649B625C0FC810012A4C5 /* IdentityMapTests.swift */,
BFF6499A25C0ACC00012A4C5 /* IdentityPropertiesTests.swift */,
BFF6497925C09ED80012A4C5 /* IdentityPublicAPITests.swift */,
BFF649A025C0D29D0012A4C5 /* IdentityStateTests.swift */,
D43BAB2925BBA8A900B08CC0 /* Info.plist */,
D43BAB2725BBA8A900B08CC0 /* IdentityTests.swift */,
2EE7E6EB27FE9D2F00C4B12A /* URLUtilsTests.swift */,
D43BAB2925BBA8A900B08CC0 /* Info.plist */,
);
name = UnitTests;
path = Tests/UnitTests;
Expand All @@ -397,11 +387,10 @@
D43BAB3725BBA8C700B08CC0 /* FunctionalTests */ = {
isa = PBXGroup;
children = (
4C4B7D8B27A0CA2F00C0CE25 /* IdentityAdIDTests.swift */,
BFF64A5A25C4C5410012A4C5 /* EdgeIdentity+IdentityDirectTests.swift */,
D43BAB3A25BBA8C700B08CC0 /* Info.plist */,
BFF64A6925C4C6A90012A4C5 /* TestHelpers.swift */,
4C4B7D8B27A0CA2F00C0CE25 /* IdentityAdIDTests.swift */,
2ED365D428496BD600D2F717 /* IdentityGetUrlVariablesTests.swift */,
D43BAB3A25BBA8C700B08CC0 /* Info.plist */,
);
name = FunctionalTests;
path = Tests/FunctionalTests;
Expand Down Expand Up @@ -576,7 +565,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 1230;
LastUpgradeCheck = 1230;
LastUpgradeCheck = 1520;
TargetAttributes = {
B6F27EBB2609146800C50A04 = {
CreatedOnToolsVersion = 12.4;
Expand Down Expand Up @@ -1030,8 +1019,6 @@
files = (
4C4B7D9227A111A500C0CE25 /* IdentityConstants.swift in Sources */,
BFF6497A25C09ED80012A4C5 /* IdentityPublicAPITests.swift in Sources */,
BFF64AED25C8A9B40012A4C5 /* MockDataStore.swift in Sources */,
BFF64AE925C8A9B40012A4C5 /* TestableExtensionRuntime.swift in Sources */,
BFF6499B25C0ACC00012A4C5 /* IdentityPropertiesTests.swift in Sources */,
2EE7E6ED27FE9D8600C4B12A /* URLUtilsTests.swift in Sources */,
BFF6498F25C0AC0F0012A4C5 /* ECIDTests.swift in Sources */,
Expand All @@ -1050,10 +1037,7 @@
BFF64A6025C4C63F0012A4C5 /* EdgeIdentity+IdentityDirectTests.swift in Sources */,
4C4B7D9027A0CAC900C0CE25 /* Event+Identity.swift in Sources */,
4C4B7D8C27A0CA2F00C0CE25 /* IdentityAdIDTests.swift in Sources */,
BFF64AEE25C8A9B40012A4C5 /* MockDataStore.swift in Sources */,
2ED365D528496BD600D2F717 /* IdentityGetUrlVariablesTests.swift in Sources */,
BFF64AEA25C8A9B40012A4C5 /* TestableExtensionRuntime.swift in Sources */,
BFF64A6A25C4C6A90012A4C5 /* TestHelpers.swift in Sources */,
BFF64AEC25C8A9B40012A4C5 /* MockExtension.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -1184,7 +1168,7 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = FKGEE875K4;
INFOPLIST_FILE = SampleApps/TestAppObjC/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -1204,7 +1188,7 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = FKGEE875K4;
INFOPLIST_FILE = SampleApps/TestAppObjC/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -1268,7 +1252,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
Expand All @@ -1277,7 +1261,7 @@
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
TARGETED_DEVICE_FAMILY = "1,2,3";
TVOS_DEPLOYMENT_TARGET = 11.0;
TVOS_DEPLOYMENT_TARGET = 12.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
Expand Down Expand Up @@ -1330,15 +1314,15 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos";
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
TARGETED_DEVICE_FAMILY = "1,2,3";
TVOS_DEPLOYMENT_TARGET = 11.0;
TVOS_DEPLOYMENT_TARGET = 12.0;
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand All @@ -1350,6 +1334,7 @@
baseConfigurationReference = F823DBDD04E1F9BF72A00CB0 /* Pods-AEPEdgeIdentity.debug.xcconfig */;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
Expand All @@ -1358,13 +1343,13 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Sources/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",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 4.0.1;
MARKETING_VERSION = 5.0.0;
PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.edge.identity;
PRODUCT_MODULE_NAME = AEPEdgeIdentity;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
Expand All @@ -1373,7 +1358,7 @@
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,3";
TVOS_DEPLOYMENT_TARGET = 11.0;
TVOS_DEPLOYMENT_TARGET = 12.0;
};
name = Debug;
};
Expand All @@ -1382,6 +1367,7 @@
baseConfigurationReference = 1DB983800FEA77BE0A7A8139 /* Pods-AEPEdgeIdentity.release.xcconfig */;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
Expand All @@ -1390,21 +1376,21 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Sources/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",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 4.0.1;
MARKETING_VERSION = 5.0.0;
PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.edge.identity;
PRODUCT_MODULE_NAME = AEPEdgeIdentity;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
SUPPORTS_MACCATALYST = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,3";
TVOS_DEPLOYMENT_TARGET = 11.0;
TVOS_DEPLOYMENT_TARGET = 12.0;
};
name = Release;
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1520"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1520"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1240"
LastUpgradeVersion = "1520"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1170"
LastUpgradeVersion = "1520"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1340"
LastUpgradeVersion = "1520"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Loading

0 comments on commit 25fab07

Please sign in to comment.