Skip to content

Commit 2bc73df

Browse files
NickEntinNickEntin
authored
Merge pull request #114 from square/develop/aardvark-4.0
Merging in the development branch for Aardvark 4.0, CoreAardvark 3.0, AardvarkLoggingUI 1.0, and AardvarkMailUI 1.0
2 parents 8274f4e + 378e226 commit 2bc73df

File tree

106 files changed

+3253
-1086
lines changed

Some content is hidden

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

106 files changed

+3253
-1086
lines changed

‎.github/workflows/ci.yml

+14-7
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@ jobs:
1515
uses: actions/checkout@v2
1616
- name: Bundle Install
1717
run: bundle install
18-
- name: Build and Test Framework
18+
- name: Select Xcode Version
19+
run: sudo xcode-select --switch /Applications/Xcode_11.7.app/Contents/Developer
20+
- name: Build and Test Frameworks
1921
run: |
2022
xcodebuild \
2123
-project Aardvark.xcodeproj \
22-
-scheme Aardvark \
24+
-scheme "All Frameworks" \
2325
-sdk iphonesimulator \
2426
-destination "platform=iOS Simulator,name=iPhone 11 Pro" \
2527
test
@@ -36,13 +38,18 @@ jobs:
3638
pod-lint:
3739
name: Pod Lint
3840
runs-on: macOS-latest
39-
strategy:
40-
matrix:
41-
pod: ['Aardvark', 'CoreAardvark']
4241
steps:
4342
- name: Checkout Repo
4443
uses: actions/checkout@v2
4544
- name: Bundle Install
4645
run: bundle install
47-
- name: Lint Podspec
48-
run: bundle exec pod lib lint --verbose --fail-fast ${{ matrix.pod }}.podspec
46+
- name: Select Xcode Version
47+
run: sudo xcode-select --switch /Applications/Xcode_11.7.app/Contents/Developer
48+
- name: Lint CoreAardvark Podspec
49+
run: bundle exec pod lib lint --verbose --fail-fast CoreAardvark.podspec
50+
- name: Lint Aardvark Podspec
51+
run: bundle exec pod lib lint --verbose --fail-fast Aardvark.podspec --include-podspecs=CoreAardvark.podspec
52+
- name: Lint AardvarkLoggingUI Podspec
53+
run: bundle exec pod lib lint --verbose --fail-fast AardvarkLoggingUI.podspec --include-podspecs=CoreAardvark.podspec
54+
- name: Lint AardvarkMailUI Podspec
55+
run: bundle exec pod lib lint --verbose --fail-fast AardvarkMailUI.podspec --include-podspecs="{CoreAardvark,Aardvark}.podspec"

‎Aardvark.podspec

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
Pod::Spec.new do |s|
22
s.name = 'Aardvark'
3-
s.version = '3.4.5'
3+
s.version = '4.0.0'
44
s.license = 'Apache License, Version 2.0'
55
s.summary = 'Aardvark is a library that makes it dead simple to create actionable bug reports.'
66
s.homepage = 'https://github.com/square/Aardvark'
77
s.authors = 'Square'
8-
s.source = { :git => 'https://github.com/square/Aardvark.git', :tag => s.version }
9-
s.swift_version = '4.0'
10-
s.ios.deployment_target = '8.0'
11-
s.source_files = 'Aardvark/**/*.{h,m,swift}'
12-
s.private_header_files = 'Aardvark/*_Testing.h', 'Aardvark/Private Categories/*.h'
13-
14-
s.dependency 'CoreAardvark', '~> 2.0'
8+
s.source = { :git => 'https://github.com/square/Aardvark.git', :tag => "Aardvark/#{ s.version.to_s }" }
9+
10+
s.swift_version = '5.0'
11+
s.ios.deployment_target = '12.0'
12+
13+
s.source_files = 'Sources/Aardvark/**/*.{h,m,swift}'
14+
15+
s.dependency 'CoreAardvark', '~> 3.0'
1516
end

‎Aardvark.xcodeproj/project.pbxproj

+916-218
Large diffs are not rendered by default.

‎Aardvark.xcodeproj/xcshareddata/xcschemes/Aardvark.xcscheme

+10-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1010"
3+
LastUpgradeVersion = "1220"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "4551A2C11BDACF9000F216D0"
34+
BuildableName = "Aardvark.framework"
35+
BlueprintName = "Aardvark"
36+
ReferencedContainer = "container:Aardvark.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -49,17 +58,6 @@
4958
</BuildableReference>
5059
</TestableReference>
5160
</Testables>
52-
<MacroExpansion>
53-
<BuildableReference
54-
BuildableIdentifier = "primary"
55-
BlueprintIdentifier = "4551A2C11BDACF9000F216D0"
56-
BuildableName = "Aardvark.framework"
57-
BlueprintName = "Aardvark"
58-
ReferencedContainer = "container:Aardvark.xcodeproj">
59-
</BuildableReference>
60-
</MacroExpansion>
61-
<AdditionalOptions>
62-
</AdditionalOptions>
6361
</TestAction>
6462
<LaunchAction
6563
buildConfiguration = "Debug"
@@ -80,8 +78,6 @@
8078
ReferencedContainer = "container:Aardvark.xcodeproj">
8179
</BuildableReference>
8280
</MacroExpansion>
83-
<AdditionalOptions>
84-
</AdditionalOptions>
8581
</LaunchAction>
8682
<ProfileAction
8783
buildConfiguration = "Release"

‎Aardvark.xcodeproj/xcshareddata/xcschemes/AardvarkLoggingUI.xcscheme

+77
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1220"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "3D046DB3254D5A840045A06C"
18+
BuildableName = "AardvarkLoggingUI.framework"
19+
BlueprintName = "AardvarkLoggingUI"
20+
ReferencedContainer = "container:Aardvark.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
<TestableReference
32+
skipped = "NO">
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "3D046DBB254D5A840045A06C"
36+
BuildableName = "AardvarkLoggingUITests.xctest"
37+
BlueprintName = "AardvarkLoggingUITests"
38+
ReferencedContainer = "container:Aardvark.xcodeproj">
39+
</BuildableReference>
40+
</TestableReference>
41+
</Testables>
42+
</TestAction>
43+
<LaunchAction
44+
buildConfiguration = "Debug"
45+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
46+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
47+
launchStyle = "0"
48+
useCustomWorkingDirectory = "NO"
49+
ignoresPersistentStateOnLaunch = "NO"
50+
debugDocumentVersioning = "YES"
51+
debugServiceExtension = "internal"
52+
allowLocationSimulation = "YES">
53+
</LaunchAction>
54+
<ProfileAction
55+
buildConfiguration = "Release"
56+
shouldUseLaunchSchemeArgsEnv = "YES"
57+
savedToolIdentifier = ""
58+
useCustomWorkingDirectory = "NO"
59+
debugDocumentVersioning = "YES">
60+
<MacroExpansion>
61+
<BuildableReference
62+
BuildableIdentifier = "primary"
63+
BlueprintIdentifier = "3D046DB3254D5A840045A06C"
64+
BuildableName = "AardvarkLoggingUI.framework"
65+
BlueprintName = "AardvarkLoggingUI"
66+
ReferencedContainer = "container:Aardvark.xcodeproj">
67+
</BuildableReference>
68+
</MacroExpansion>
69+
</ProfileAction>
70+
<AnalyzeAction
71+
buildConfiguration = "Debug">
72+
</AnalyzeAction>
73+
<ArchiveAction
74+
buildConfiguration = "Release"
75+
revealArchiveInOrganizer = "YES">
76+
</ArchiveAction>
77+
</Scheme>

‎Aardvark.xcodeproj/xcshareddata/xcschemes/All Frameworks.xcscheme

+149
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1220"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "4551A2C11BDACF9000F216D0"
18+
BuildableName = "Aardvark.framework"
19+
BlueprintName = "Aardvark"
20+
ReferencedContainer = "container:Aardvark.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
<BuildActionEntry
24+
buildForTesting = "YES"
25+
buildForRunning = "YES"
26+
buildForProfiling = "YES"
27+
buildForArchiving = "YES"
28+
buildForAnalyzing = "YES">
29+
<BuildableReference
30+
BuildableIdentifier = "primary"
31+
BlueprintIdentifier = "3D046DB3254D5A840045A06C"
32+
BuildableName = "AardvarkLoggingUI.framework"
33+
BlueprintName = "AardvarkLoggingUI"
34+
ReferencedContainer = "container:Aardvark.xcodeproj">
35+
</BuildableReference>
36+
</BuildActionEntry>
37+
<BuildActionEntry
38+
buildForTesting = "YES"
39+
buildForRunning = "YES"
40+
buildForProfiling = "YES"
41+
buildForArchiving = "YES"
42+
buildForAnalyzing = "YES">
43+
<BuildableReference
44+
BuildableIdentifier = "primary"
45+
BlueprintIdentifier = "3DA5BF362556602000B6D148"
46+
BuildableName = "AardvarkMailUI.framework"
47+
BlueprintName = "AardvarkMailUI"
48+
ReferencedContainer = "container:Aardvark.xcodeproj">
49+
</BuildableReference>
50+
</BuildActionEntry>
51+
<BuildActionEntry
52+
buildForTesting = "YES"
53+
buildForRunning = "YES"
54+
buildForProfiling = "YES"
55+
buildForArchiving = "YES"
56+
buildForAnalyzing = "YES">
57+
<BuildableReference
58+
BuildableIdentifier = "primary"
59+
BlueprintIdentifier = "EAF2FE9F1D47172400931663"
60+
BuildableName = "CoreAardvark.framework"
61+
BlueprintName = "CoreAardvark"
62+
ReferencedContainer = "container:Aardvark.xcodeproj">
63+
</BuildableReference>
64+
</BuildActionEntry>
65+
</BuildActionEntries>
66+
</BuildAction>
67+
<TestAction
68+
buildConfiguration = "Debug"
69+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
70+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
71+
shouldUseLaunchSchemeArgsEnv = "YES">
72+
<Testables>
73+
<TestableReference
74+
skipped = "NO">
75+
<BuildableReference
76+
BuildableIdentifier = "primary"
77+
BlueprintIdentifier = "3D046DBB254D5A840045A06C"
78+
BuildableName = "AardvarkLoggingUITests.xctest"
79+
BlueprintName = "AardvarkLoggingUITests"
80+
ReferencedContainer = "container:Aardvark.xcodeproj">
81+
</BuildableReference>
82+
</TestableReference>
83+
<TestableReference
84+
skipped = "NO">
85+
<BuildableReference
86+
BuildableIdentifier = "primary"
87+
BlueprintIdentifier = "EA3C1D9F1D934A260048C4CD"
88+
BuildableName = "AardvarkTests.xctest"
89+
BlueprintName = "AardvarkTests"
90+
ReferencedContainer = "container:Aardvark.xcodeproj">
91+
</BuildableReference>
92+
</TestableReference>
93+
<TestableReference
94+
skipped = "NO">
95+
<BuildableReference
96+
BuildableIdentifier = "primary"
97+
BlueprintIdentifier = "EA3C1D901D934A210048C4CD"
98+
BuildableName = "CoreAardvarkTests.xctest"
99+
BlueprintName = "CoreAardvarkTests"
100+
ReferencedContainer = "container:Aardvark.xcodeproj">
101+
</BuildableReference>
102+
</TestableReference>
103+
<TestableReference
104+
skipped = "NO">
105+
<BuildableReference
106+
BuildableIdentifier = "primary"
107+
BlueprintIdentifier = "3DA5BF3E2556602100B6D148"
108+
BuildableName = "AardvarkMailUITests.xctest"
109+
BlueprintName = "AardvarkMailUITests"
110+
ReferencedContainer = "container:Aardvark.xcodeproj">
111+
</BuildableReference>
112+
</TestableReference>
113+
</Testables>
114+
</TestAction>
115+
<LaunchAction
116+
buildConfiguration = "Debug"
117+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
118+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
119+
launchStyle = "0"
120+
useCustomWorkingDirectory = "NO"
121+
ignoresPersistentStateOnLaunch = "NO"
122+
debugDocumentVersioning = "YES"
123+
debugServiceExtension = "internal"
124+
allowLocationSimulation = "YES">
125+
</LaunchAction>
126+
<ProfileAction
127+
buildConfiguration = "Release"
128+
shouldUseLaunchSchemeArgsEnv = "YES"
129+
savedToolIdentifier = ""
130+
useCustomWorkingDirectory = "NO"
131+
debugDocumentVersioning = "YES">
132+
<MacroExpansion>
133+
<BuildableReference
134+
BuildableIdentifier = "primary"
135+
BlueprintIdentifier = "4551A2C11BDACF9000F216D0"
136+
BuildableName = "Aardvark.framework"
137+
BlueprintName = "Aardvark"
138+
ReferencedContainer = "container:Aardvark.xcodeproj">
139+
</BuildableReference>
140+
</MacroExpansion>
141+
</ProfileAction>
142+
<AnalyzeAction
143+
buildConfiguration = "Debug">
144+
</AnalyzeAction>
145+
<ArchiveAction
146+
buildConfiguration = "Release"
147+
revealArchiveInOrganizer = "YES">
148+
</ArchiveAction>
149+
</Scheme>

‎Aardvark.xcodeproj/xcshareddata/xcschemes/CoreAardvark.xcscheme

+10-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1010"
3+
LastUpgradeVersion = "1220"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "EAF2FE9F1D47172400931663"
34+
BuildableName = "CoreAardvark.framework"
35+
BlueprintName = "CoreAardvark"
36+
ReferencedContainer = "container:Aardvark.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -39,17 +48,6 @@
3948
</BuildableReference>
4049
</TestableReference>
4150
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "EAF2FE9F1D47172400931663"
46-
BuildableName = "CoreAardvark.framework"
47-
BlueprintName = "CoreAardvark"
48-
ReferencedContainer = "container:Aardvark.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
7068
ReferencedContainer = "container:Aardvark.xcodeproj">
7169
</BuildableReference>
7270
</MacroExpansion>
73-
<AdditionalOptions>
74-
</AdditionalOptions>
7571
</LaunchAction>
7672
<ProfileAction
7773
buildConfiguration = "Release"

0 commit comments

Comments
 (0)