Skip to content

Commit

Permalink
Merge branch 'dev-v3.0.1' into listenersFix
Browse files Browse the repository at this point in the history
  • Loading branch information
emdobrin committed Feb 27, 2021
2 parents c120959 + ec88c03 commit f74ab85
Show file tree
Hide file tree
Showing 10 changed files with 132 additions and 472 deletions.
258 changes: 117 additions & 141 deletions AEPCore.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

10 changes: 1 addition & 9 deletions AEPServices/Mocks/MockUIService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,6 @@ public class MockUIService: UIService {
public func createFloatingButton(listener: FloatingButtonDelegate) -> FloatingButtonPresentable {
createFloatingButtonCalled = true
return floatingButton ?? createFloatingButton(listener: listener)
}

var createAlertMessageCalled = false
var alertMessage: AlertMessageShowable?
public func createAlertMessage(title: String, message: String, positiveButtonLabel: String?, negativeButtonLabel: String?, listener: AlertMessageDelegate?) -> AlertMessageShowable {
createAlertMessageCalled = true
return alertMessage ?? AlertMessage(title: title, message: message, positiveButtonLabel: positiveButtonLabel, negativeButtonLabel: negativeButtonLabel, listener: listener, messageMonitor: mockMessageMonitor ?? MessageMonitor())
}

}

}
4 changes: 0 additions & 4 deletions AEPServices/Sources/ui/AEPUIService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,4 @@ class AEPUIService: UIService {
func createFloatingButton(listener: FloatingButtonDelegate) -> FloatingButtonPresentable {
return FloatingButton(listener: listener)
}

func createAlertMessage(title: String, message: String, positiveButtonLabel: String?, negativeButtonLabel: String?, listener: AlertMessageDelegate?) -> AlertMessageShowable {
return AlertMessage(title: title, message: message, positiveButtonLabel: positiveButtonLabel, negativeButtonLabel: negativeButtonLabel, listener: listener, messageMonitor: messageMonitor)
}
}
10 changes: 0 additions & 10 deletions AEPServices/Sources/ui/UIService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,4 @@ public protocol UIService {
/// - listener: The `FloatingButtonPresentable`'s `FloatingButtonDelegate`
/// - Returns: A `FloatingButtonPresentable` implementation
func createFloatingButton(listener: FloatingButtonDelegate) -> FloatingButtonPresentable

///
/// Creates an `AlertMessageShowable`
/// - Parameters:
/// - title: The title of the alert message as a `String`
/// - message: The message of the alert message as a `String`
/// - positiveButtonLabel: The positive button label text as a `String?`
/// - negativeButtonLabel: The negative button label text as a `String?`
/// - Returns: An `AlertMessageShowable` implementation
func createAlertMessage(title: String, message: String, positiveButtonLabel: String?, negativeButtonLabel: String?, listener: AlertMessageDelegate?) -> AlertMessageShowable
}
137 changes: 0 additions & 137 deletions AEPServices/Sources/ui/alert/AlertMessage.swift

This file was deleted.

45 changes: 0 additions & 45 deletions AEPServices/Sources/ui/alert/AlertMessageDelegate.swift

This file was deleted.

19 changes: 0 additions & 19 deletions AEPServices/Sources/ui/alert/AlertMessageShowable.swift

This file was deleted.

87 changes: 0 additions & 87 deletions AEPServices/Tests/services/AlertMessageTests.swift

This file was deleted.

12 changes: 6 additions & 6 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,25 @@ workspace 'AEPCore'
project 'AEPCore.xcodeproj'

target 'AEPCore' do
pod 'AEPRulesEngine', :git => 'https://github.com/adobe/aepsdk-rulesengine-ios.git', :branch => 'main'
pod 'AEPRulesEngine'
end

target 'AEPCoreTests' do
pod 'AEPRulesEngine', :git => 'https://github.com/adobe/aepsdk-rulesengine-ios.git', :branch => 'main'
pod 'AEPRulesEngine'
end

target 'AEPSignalTests' do
pod 'AEPRulesEngine', :git => 'https://github.com/adobe/aepsdk-rulesengine-ios.git', :branch => 'main'
pod 'AEPRulesEngine'
end

target 'AEPLifecycleTests' do
pod 'AEPRulesEngine', :git => 'https://github.com/adobe/aepsdk-rulesengine-ios.git', :branch => 'main'
pod 'AEPRulesEngine'
end

target 'AEPIdentityTests' do
pod 'AEPRulesEngine', :git => 'https://github.com/adobe/aepsdk-rulesengine-ios.git', :branch => 'main'
pod 'AEPRulesEngine'
end

target 'AEPIntegrationTests' do
pod 'AEPRulesEngine', :git => 'https://github.com/adobe/aepsdk-rulesengine-ios.git', :branch => 'main'
pod 'AEPRulesEngine'
end
22 changes: 8 additions & 14 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,22 +1,16 @@
PODS:
- AEPRulesEngine (1.0.0-beta.2)
- AEPRulesEngine (1.0.0)

DEPENDENCIES:
- AEPRulesEngine (from `https://github.com/adobe/aepsdk-rulesengine-ios.git`, branch `main`)
- AEPRulesEngine

EXTERNAL SOURCES:
AEPRulesEngine:
:branch: main
:git: https://github.com/adobe/aepsdk-rulesengine-ios.git

CHECKOUT OPTIONS:
AEPRulesEngine:
:commit: 151df7075de461c492c192a43eefa582cd7311df
:git: https://github.com/adobe/aepsdk-rulesengine-ios.git
SPEC REPOS:
trunk:
- AEPRulesEngine

SPEC CHECKSUMS:
AEPRulesEngine: bc77ec533b584fd353b616063601d4d8c9401089
AEPRulesEngine: 8bbc694fce6900cd33b2496c7d4b33ee2eeffc46

PODFILE CHECKSUM: 2f62254a30b50ed814c4364b36843ce9076bb9be
PODFILE CHECKSUM: 31a9899de6250afde3d420f3c919cf16beb8dc75

COCOAPODS: 1.10.1
COCOAPODS: 1.10.0

0 comments on commit f74ab85

Please sign in to comment.