Skip to content

Commit 54cbde9

Browse files
authored
Merge pull request #80 from adobe/staging
Staging to Main for 3.1.0
2 parents 06ea89a + 5f7f920 commit 54cbde9

File tree

75 files changed

+5840
-1096
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+5840
-1096
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
build-and-test:
1616
macos:
17-
xcode: 12.0.0 # Specify the Xcode version to use
17+
xcode: 13.3.1 # Specify the Xcode version to use
1818

1919
steps:
2020
- checkout

.swiftlint.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ disabled_rules: # rule identifiers to exclude from running
1616
- type_body_length
1717
- weak_delegate
1818
- class_delegate_protocol
19+
- trailing_whitespace
1920
opt_in_rules: # some rules are opt-in only
2021
- closure_end_indentation
2122
- convenience_type
@@ -35,11 +36,11 @@ opt_in_rules: # some rules are opt-in only
3536
- vertical_parameter_alignment_on_call
3637
excluded: # paths to ignore during linting
3738
- Carthage
38-
- AEPAssurance/UnitTests/
39-
- SampleApps/*/Pods
40-
- SampleApps/*/xdmlib
39+
- AEPAssurance/UnitTests
40+
- TestAppObjC
4141
- SampleApps/*/libs
4242
- Pods
43+
- .build
4344

4445
empty_count:
4546
severity: warning

AEPAssurance.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "AEPAssurance"
3-
s.version = "3.0.1"
3+
s.version = "3.1.0"
44
s.summary = "AEPAssurance SDK for Adobe Experience Platform Mobile SDK. Written and maintained by Adobe."
55

66
s.description = <<-DESC

AEPAssurance.xcodeproj/project.pbxproj

+128-24
Large diffs are not rendered by default.

AEPAssurance.xcodeproj/xcshareddata/xcschemes/TestApp.xcscheme

+8
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
buildConfiguration = "Debug"
4545
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4646
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
47+
enableAddressSanitizer = "YES"
4748
launchStyle = "0"
4849
useCustomWorkingDirectory = "NO"
4950
ignoresPersistentStateOnLaunch = "NO"
@@ -60,6 +61,13 @@
6061
ReferencedContainer = "container:AEPAssurance.xcodeproj">
6162
</BuildableReference>
6263
</BuildableProductRunnable>
64+
<AdditionalOptions>
65+
<AdditionalOption
66+
key = "NSZombieEnabled"
67+
value = "YES"
68+
isEnabled = "YES">
69+
</AdditionalOption>
70+
</AdditionalOptions>
6371
</LaunchAction>
6472
<ProfileAction
6573
buildConfiguration = "Release"

AEPAssurance/Source/Assurance+State.swift

-50
This file was deleted.

0 commit comments

Comments
 (0)