Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Staging to main 4.2.3 #1000

Merged
merged 8 commits into from
Feb 15, 2024
Merged

Staging to main 4.2.3 #1000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
76ca86f
fix podspec dependencies with upper limit
cdhoffmann Feb 8, 2024
0b34c60
Merge pull request #997 from cdhoffmann/fixPodspecs
cdhoffmann Feb 8, 2024
c7c52c1
Updating versions to 4.2.3.
cdhoffmann Feb 8, 2024
db7da3e
Merge pull request #998 from adobe/version-4.2.3-update
cdhoffmann Feb 8, 2024
81760e5
Merge pull request #999 from adobe/dev-v4.2.3
cdhoffmann Feb 8, 2024
bb5e29d
[MOB-20427] - don't show fullscreenmessage with empty html
sbenedicadb Feb 15, 2024
0dddc81
-revert pods version in Podfile.lock
sbenedicadb Feb 15, 2024
367f883
Merge pull request #1001 from sbenedicadb/mob-20427
cdhoffmann Feb 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions AEPCore.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "AEPCore"
s.version = "4.2.2"
s.version = "4.2.3"
s.summary = "Core library for Adobe Experience Platform Mobile SDK. Written and maintained by Adobe."
s.description = <<-DESC
The core library provides the foundation for the Adobe Experience Platform SDK. Having the core library installed is a pre-requisite for any other Adobe Experience Platform SDK extension to work.
Expand All @@ -17,8 +17,8 @@ Pod::Spec.new do |s|

s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' }

s.dependency 'AEPRulesEngine', '>= 4.0.0'
s.dependency 'AEPServices', '>= 4.2.2'
s.dependency 'AEPRulesEngine', '>= 4.0.0', '< 5.0.0'
s.dependency 'AEPServices', '>= 4.2.3', '< 5.0.0'


s.source_files = 'AEPCore/Sources/**/*.swift'
Expand Down
28 changes: 14 additions & 14 deletions AEPCore.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3895,7 +3895,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 4.2.2;
MARKETING_VERSION = 4.2.3;
PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.core;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -3928,7 +3928,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 4.2.2;
MARKETING_VERSION = 4.2.3;
PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.core;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -4009,7 +4009,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 4.2.2;
MARKETING_VERSION = 4.2.3;
PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.signal;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -4040,7 +4040,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 4.2.2;
MARKETING_VERSION = 4.2.3;
PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.signal;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -4112,7 +4112,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 4.2.2;
MARKETING_VERSION = 4.2.3;
PRODUCT_BUNDLE_IDENTIFIER = come.adobe.aep.services;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -4142,7 +4142,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 4.2.2;
MARKETING_VERSION = 4.2.3;
PRODUCT_BUNDLE_IDENTIFIER = come.adobe.aep.services;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -4283,7 +4283,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 4.2.2;
MARKETING_VERSION = 4.2.3;
PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.AEPServicesMocks;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -4313,7 +4313,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 4.2.2;
MARKETING_VERSION = 4.2.3;
PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.AEPServicesMocks;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -4342,7 +4342,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 4.2.2;
MARKETING_VERSION = 4.2.3;
PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.lifecycle;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -4372,7 +4372,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 4.2.2;
MARKETING_VERSION = 4.2.3;
PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.lifecycle;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -4446,7 +4446,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 4.2.2;
MARKETING_VERSION = 4.2.3;
PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.identity;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -4476,7 +4476,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 4.2.2;
MARKETING_VERSION = 4.2.3;
PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.identity;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -4550,7 +4550,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 4.2.2;
MARKETING_VERSION = 4.2.3;
PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.AEPCoreMocks;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -4580,7 +4580,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 4.2.2;
MARKETING_VERSION = 4.2.3;
PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.AEPCoreMocks;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
Expand Down
2 changes: 1 addition & 1 deletion AEPCore/Sources/configuration/ConfigurationConstants.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import Foundation
struct ConfigurationConstants {
static let EXTENSION_NAME = "com.adobe.module.configuration"
static let FRIENDLY_NAME = "Configuration"
static let EXTENSION_VERSION = "4.2.2"
static let EXTENSION_VERSION = "4.2.3"
static let DATA_STORE_NAME = EXTENSION_NAME

static let CONFIG_URL_BASE = "https://assets.adobedtm.com/"
Expand Down
2 changes: 1 addition & 1 deletion AEPCore/Sources/eventhub/EventHubConstants.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ enum EventHubConstants {
static let XDM_STATE_CHANGE = "Shared state change (XDM)"
static let NAME = "com.adobe.module.eventhub"
static let FRIENDLY_NAME = "EventHub"
static let VERSION_NUMBER = "4.2.2"
static let VERSION_NUMBER = "4.2.3"

enum EventDataKeys {
static let VERSION = "version"
Expand Down
2 changes: 1 addition & 1 deletion AEPCore/Tests/MobileCoreTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ class MobileCoreTests: XCTestCase {
"friendlyName" : "mockExtension"
},
"com.adobe.module.configuration" : {
"version" : "4.2.2",
"version" : "4.2.3",
"friendlyName" : "Configuration"
},
"com.adobe.mockExtensionTwo" : {
Expand Down
4 changes: 2 additions & 2 deletions AEPIdentity.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "AEPIdentity"
s.version = "4.2.2"
s.version = "4.2.3"
s.summary = "Identity extension for Adobe Experience Platform Mobile SDK. Written and maintained by Adobe."
s.description = <<-DESC
The AEPIdentity extension provides APIs that allow use of the Visitor ID services in the Adobe Experience Cloud SDK.
Expand All @@ -18,6 +18,6 @@ Pod::Spec.new do |s|
s.swift_version = '5.1'
s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' }

s.dependency 'AEPCore', '>= 4.2.2'
s.dependency 'AEPCore', '>= 4.2.3', '< 5.0.0'

end
2 changes: 1 addition & 1 deletion AEPIdentity/Sources/IdentityConstants.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import Foundation
enum IdentityConstants {
static let EXTENSION_NAME = "com.adobe.module.identity"
static let FRIENDLY_NAME = "Identity"
static let EXTENSION_VERSION = "4.2.2"
static let EXTENSION_VERSION = "4.2.3"
static let DATASTORE_NAME = EXTENSION_NAME

static let API_TIMEOUT = TimeInterval(0.5) // Get API requests timeout after half a second
Expand Down
4 changes: 2 additions & 2 deletions AEPLifecycle.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "AEPLifecycle"
s.version = "4.2.2"
s.version = "4.2.3"
s.summary = "Lifecycle extension for Adobe Experience Platform Mobile SDK. Written and maintained by Adobe."
s.description = <<-DESC
The AEPLifecycle extension is used to track application lifecycle including session metricss and device related data.
Expand All @@ -18,6 +18,6 @@ Pod::Spec.new do |s|
s.swift_version = '5.1'
s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' }

s.dependency 'AEPCore', '>= 4.2.2'
s.dependency 'AEPCore', '>= 4.2.3', '< 5.0.0'

end
2 changes: 1 addition & 1 deletion AEPLifecycle/Sources/LifecycleConstants.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import Foundation
enum LifecycleConstants {
static let EXTENSION_NAME = "com.adobe.module.lifecycle"
static let FRIENDLY_NAME = "Lifecycle"
static let EXTENSION_VERSION = "4.2.2"
static let EXTENSION_VERSION = "4.2.3"
static let DATA_STORE_NAME = LifecycleConstants.EXTENSION_NAME

static let START = "start"
Expand Down
2 changes: 1 addition & 1 deletion AEPServices.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "AEPServices"
s.version = "4.2.2"
s.version = "4.2.3"
s.summary = "Servcies library for Adobe Experience Platform Mobile SDK. Written and maintained by Adobe."
s.description = <<-DESC
The AEPServices library provides the platform services and utilities for the Adobe Experience Platform SDK. Having the services library installed is a pre-requisite for any other Adobe Experience Platform SDK extension to work.
Expand Down
8 changes: 8 additions & 0 deletions AEPServices/Sources/ui/fullscreen/FullscreenMessage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,14 @@
}

private func displayWithAnimation(webView: WKWebView) {
// MOB-20427 - only display the WKWebView if we have html to show
guard !self.payload.isEmpty else {
Log.trace(label: self.LOG_PREFIX, "Suppressing the display of a FullscreenMessage because it has no HTML to be shown.")
// reset the monitor so it doesn't think a message is being shown
self.messageMonitor.dismissMessage()
return

Check warning on line 353 in AEPServices/Sources/ui/fullscreen/FullscreenMessage.swift

View check run for this annotation

Codecov / codecov/patch

AEPServices/Sources/ui/fullscreen/FullscreenMessage.swift#L350-L353 

Added lines #L350 - L353 were not covered by tests
}

DispatchQueue.main.async {
let keyWindow = UIApplication.shared.getKeyWindow()

Expand Down
4 changes: 2 additions & 2 deletions AEPSignal.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "AEPSignal"
s.version = "4.2.2"
s.version = "4.2.3"
s.summary = "Signal extension for Adobe Experience Platform Mobile SDK. Written and maintained by Adobe."
s.description = <<-DESC
The AEPSignal extension provides the support for Postback/PII/Open URL actions triggered by Core rules engine.
Expand All @@ -18,6 +18,6 @@ Pod::Spec.new do |s|
s.swift_version = '5.1'
s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' }

s.dependency 'AEPCore', '>= 4.2.2'
s.dependency 'AEPCore', '>= 4.2.3', '< 5.0.0'

end
2 changes: 1 addition & 1 deletion AEPSignal/Sources/SignalConstants.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import Foundation
enum SignalConstants {
static let EXTENSION_NAME = "com.adobe.module.signal"
static let FRIENDLY_NAME = "Signal"
static let EXTENSION_VERSION = "4.2.2"
static let EXTENSION_VERSION = "4.2.3"
static let DATASTORE_NAME = EXTENSION_NAME
static let LOG_PREFIX = FRIENDLY_NAME

Expand Down