Skip to content

Commit

Permalink
Merge pull request #114 from square/develop/aardvark-4.0
Browse files Browse the repository at this point in the history
Merging in the development branch for Aardvark 4.0, CoreAardvark 3.0, AardvarkLoggingUI 1.0, and AardvarkMailUI 1.0
  • Loading branch information
NickEntin authored Feb 24, 2021
2 parents 8274f4e + 378e226 commit 2bc73df
Show file tree
Hide file tree
Showing 106 changed files with 3,253 additions and 1,086 deletions.
21 changes: 14 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ jobs:
uses: actions/checkout@v2
- name: Bundle Install
run: bundle install
- name: Build and Test Framework
- name: Select Xcode Version
run: sudo xcode-select --switch /Applications/Xcode_11.7.app/Contents/Developer
- name: Build and Test Frameworks
run: |
xcodebuild \
-project Aardvark.xcodeproj \
-scheme Aardvark \
-scheme "All Frameworks" \
-sdk iphonesimulator \
-destination "platform=iOS Simulator,name=iPhone 11 Pro" \
test
Expand All @@ -36,13 +38,18 @@ jobs:
pod-lint:
name: Pod Lint
runs-on: macOS-latest
strategy:
matrix:
pod: ['Aardvark', 'CoreAardvark']
steps:
- name: Checkout Repo
uses: actions/checkout@v2
- name: Bundle Install
run: bundle install
- name: Lint Podspec
run: bundle exec pod lib lint --verbose --fail-fast ${{ matrix.pod }}.podspec
- name: Select Xcode Version
run: sudo xcode-select --switch /Applications/Xcode_11.7.app/Contents/Developer
- name: Lint CoreAardvark Podspec
run: bundle exec pod lib lint --verbose --fail-fast CoreAardvark.podspec
- name: Lint Aardvark Podspec
run: bundle exec pod lib lint --verbose --fail-fast Aardvark.podspec --include-podspecs=CoreAardvark.podspec
- name: Lint AardvarkLoggingUI Podspec
run: bundle exec pod lib lint --verbose --fail-fast AardvarkLoggingUI.podspec --include-podspecs=CoreAardvark.podspec
- name: Lint AardvarkMailUI Podspec
run: bundle exec pod lib lint --verbose --fail-fast AardvarkMailUI.podspec --include-podspecs="{CoreAardvark,Aardvark}.podspec"
17 changes: 9 additions & 8 deletions Aardvark.podspec
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
Pod::Spec.new do |s|
s.name = 'Aardvark'
s.version = '3.4.5'
s.version = '4.0.0'
s.license = 'Apache License, Version 2.0'
s.summary = 'Aardvark is a library that makes it dead simple to create actionable bug reports.'
s.homepage = 'https://github.com/square/Aardvark'
s.authors = 'Square'
s.source = { :git => 'https://github.com/square/Aardvark.git', :tag => s.version }
s.swift_version = '4.0'
s.ios.deployment_target = '8.0'
s.source_files = 'Aardvark/**/*.{h,m,swift}'
s.private_header_files = 'Aardvark/*_Testing.h', 'Aardvark/Private Categories/*.h'

s.dependency 'CoreAardvark', '~> 2.0'
s.source = { :git => 'https://github.com/square/Aardvark.git', :tag => "Aardvark/#{ s.version.to_s }" }

s.swift_version = '5.0'
s.ios.deployment_target = '12.0'

s.source_files = 'Sources/Aardvark/**/*.{h,m,swift}'

s.dependency 'CoreAardvark', '~> 3.0'
end
1,134 changes: 916 additions & 218 deletions Aardvark.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

24 changes: 10 additions & 14 deletions Aardvark.xcodeproj/xcshareddata/xcschemes/Aardvark.xcscheme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1010"
LastUpgradeVersion = "1220"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -27,6 +27,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4551A2C11BDACF9000F216D0"
BuildableName = "Aardvark.framework"
BlueprintName = "Aardvark"
ReferencedContainer = "container:Aardvark.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -49,17 +58,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4551A2C11BDACF9000F216D0"
BuildableName = "Aardvark.framework"
BlueprintName = "Aardvark"
ReferencedContainer = "container:Aardvark.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -80,8 +78,6 @@
ReferencedContainer = "container:Aardvark.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1220"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3D046DB3254D5A840045A06C"
BuildableName = "AardvarkLoggingUI.framework"
BlueprintName = "AardvarkLoggingUI"
ReferencedContainer = "container:Aardvark.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3D046DBB254D5A840045A06C"
BuildableName = "AardvarkLoggingUITests.xctest"
BlueprintName = "AardvarkLoggingUITests"
ReferencedContainer = "container:Aardvark.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3D046DB3254D5A840045A06C"
BuildableName = "AardvarkLoggingUI.framework"
BlueprintName = "AardvarkLoggingUI"
ReferencedContainer = "container:Aardvark.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
149 changes: 149 additions & 0 deletions Aardvark.xcodeproj/xcshareddata/xcschemes/All Frameworks.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1220"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4551A2C11BDACF9000F216D0"
BuildableName = "Aardvark.framework"
BlueprintName = "Aardvark"
ReferencedContainer = "container:Aardvark.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3D046DB3254D5A840045A06C"
BuildableName = "AardvarkLoggingUI.framework"
BlueprintName = "AardvarkLoggingUI"
ReferencedContainer = "container:Aardvark.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3DA5BF362556602000B6D148"
BuildableName = "AardvarkMailUI.framework"
BlueprintName = "AardvarkMailUI"
ReferencedContainer = "container:Aardvark.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "EAF2FE9F1D47172400931663"
BuildableName = "CoreAardvark.framework"
BlueprintName = "CoreAardvark"
ReferencedContainer = "container:Aardvark.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3D046DBB254D5A840045A06C"
BuildableName = "AardvarkLoggingUITests.xctest"
BlueprintName = "AardvarkLoggingUITests"
ReferencedContainer = "container:Aardvark.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "EA3C1D9F1D934A260048C4CD"
BuildableName = "AardvarkTests.xctest"
BlueprintName = "AardvarkTests"
ReferencedContainer = "container:Aardvark.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "EA3C1D901D934A210048C4CD"
BuildableName = "CoreAardvarkTests.xctest"
BlueprintName = "CoreAardvarkTests"
ReferencedContainer = "container:Aardvark.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3DA5BF3E2556602100B6D148"
BuildableName = "AardvarkMailUITests.xctest"
BlueprintName = "AardvarkMailUITests"
ReferencedContainer = "container:Aardvark.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4551A2C11BDACF9000F216D0"
BuildableName = "Aardvark.framework"
BlueprintName = "Aardvark"
ReferencedContainer = "container:Aardvark.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
24 changes: 10 additions & 14 deletions Aardvark.xcodeproj/xcshareddata/xcschemes/CoreAardvark.xcscheme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1010"
LastUpgradeVersion = "1220"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -27,6 +27,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "EAF2FE9F1D47172400931663"
BuildableName = "CoreAardvark.framework"
BlueprintName = "CoreAardvark"
ReferencedContainer = "container:Aardvark.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -39,17 +48,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "EAF2FE9F1D47172400931663"
BuildableName = "CoreAardvark.framework"
BlueprintName = "CoreAardvark"
ReferencedContainer = "container:Aardvark.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -70,8 +68,6 @@
ReferencedContainer = "container:Aardvark.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
Loading

0 comments on commit 2bc73df

Please sign in to comment.