Skip to content

Commit

Permalink
Merge 6.33 SPM fixes back to master (#6530)
Browse files Browse the repository at this point in the history
* SPM M80(6.33.0) Analytics update (#6490)
* Remove unnecessary analytics public header copy (#6498)
* Fix SPM analytics warning introduced yesterday (#6504)
* Fix SPM version (#6527)
  • Loading branch information
paulb777 authored Sep 23, 2020
1 parent da9327e commit 1d1ae87
Show file tree
Hide file tree
Showing 14 changed files with 153 additions and 1,424 deletions.
10 changes: 10 additions & 0 deletions .swiftpm/xcode/xcshareddata/xcschemes/Firebase-Package.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,16 @@
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "analytics-import-test"
BuildableName = "analytics-import-test"
BlueprintName = "analytics-import-test"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1200"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "analytics-import-test"
BuildableName = "analytics-import-test"
BlueprintName = "analytics-import-test"
ReferencedContainer = "container:">
</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">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

This file was deleted.

154 changes: 0 additions & 154 deletions FirebaseAnalyticsWrapper/Public/FirebaseAnalytics/FIRAnalytics.h

This file was deleted.

Loading

0 comments on commit 1d1ae87

Please sign in to comment.