Skip to content

Commit b6cd99e

Browse files
authored
Update Firebase Storage directory structure (#4573)
1 parent 0d11ee1 commit b6cd99e

File tree

129 files changed

+210
-3023
lines changed

Some content is hidden

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

129 files changed

+210
-3023
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ Example/Auth/ApiTests/AuthCredentials.h
77

88
Example/Database/App/GoogleService-Info.plist
99

10-
Example/Storage/App/GoogleService-Info.plist
10+
# FirebaseStorage integration tests GoogleService-Info.plist
11+
FirebaseStorage/Tests/Integration/Resources/GoogleService-Info.plist
1112

1213
# FirebaseInstallations integration tests GoogleService-Info.plist
1314
FirebaseInstallations/Source/Tests/Resources/GoogleService-Info.plist

Dangerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ has_license_changes = didModify(["LICENSE"])
8787
@has_instanceid_changes = hasChangesIn("Firebase/InstanceID/")
8888
@has_messaging_changes = hasChangesIn("Firebase/Messaging/")
8989
@has_remoteconfig_changes = hasChangesIn("FirebaseRemoteConfig/")
90-
@has_storage_changes = hasChangesIn("Firebase/Storage/")
90+
@has_storage_changes = hasChangesIn("FirebaseStorage/")
9191

9292
@has_gdt_changes = hasChangesIn("GoogleDataTransport/") ||
9393
hasChangesIn("GoogleDataTransportCCTSupport")

Example/Firebase.xcodeproj/project.pbxproj

Lines changed: 0 additions & 323 deletions
Large diffs are not rendered by default.

Example/Firebase.xcodeproj/xcshareddata/xcschemes/AllUnitTests_iOS.xcscheme

Lines changed: 11 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -76,20 +76,6 @@
7676
ReferencedContainer = "container:Firebase.xcodeproj">
7777
</BuildableReference>
7878
</BuildActionEntry>
79-
<BuildActionEntry
80-
buildForTesting = "YES"
81-
buildForRunning = "YES"
82-
buildForProfiling = "NO"
83-
buildForArchiving = "NO"
84-
buildForAnalyzing = "YES">
85-
<BuildableReference
86-
BuildableIdentifier = "primary"
87-
BlueprintIdentifier = "DEB13A0A1E73507E00AC236D"
88-
BuildableName = "Storage_Tests_iOS.xctest"
89-
BlueprintName = "Storage_Tests_iOS"
90-
ReferencedContainer = "container:Firebase.xcodeproj">
91-
</BuildableReference>
92-
</BuildActionEntry>
9379
<BuildActionEntry
9480
buildForTesting = "YES"
9581
buildForRunning = "NO"
@@ -138,9 +124,18 @@
138124
buildConfiguration = "Debug"
139125
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
140126
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
127+
shouldUseLaunchSchemeArgsEnv = "YES"
141128
disableMainThreadChecker = "YES"
142-
codeCoverageEnabled = "YES"
143-
shouldUseLaunchSchemeArgsEnv = "YES">
129+
codeCoverageEnabled = "YES">
130+
<MacroExpansion>
131+
<BuildableReference
132+
BuildableIdentifier = "primary"
133+
BlueprintIdentifier = "DE3373891E73773400881891"
134+
BuildableName = "AllUnitTests_iOS"
135+
BlueprintName = "AllUnitTests_iOS"
136+
ReferencedContainer = "container:Firebase.xcodeproj">
137+
</BuildableReference>
138+
</MacroExpansion>
144139
<Testables>
145140
<TestableReference
146141
skipped = "NO">
@@ -182,16 +177,6 @@
182177
ReferencedContainer = "container:Firebase.xcodeproj">
183178
</BuildableReference>
184179
</TestableReference>
185-
<TestableReference
186-
skipped = "NO">
187-
<BuildableReference
188-
BuildableIdentifier = "primary"
189-
BlueprintIdentifier = "DEB13A0A1E73507E00AC236D"
190-
BuildableName = "Storage_Tests_iOS.xctest"
191-
BlueprintName = "Storage_Tests_iOS"
192-
ReferencedContainer = "container:Firebase.xcodeproj">
193-
</BuildableReference>
194-
</TestableReference>
195180
<TestableReference
196181
skipped = "NO">
197182
<BuildableReference
@@ -213,17 +198,6 @@
213198
</BuildableReference>
214199
</TestableReference>
215200
</Testables>
216-
<MacroExpansion>
217-
<BuildableReference
218-
BuildableIdentifier = "primary"
219-
BlueprintIdentifier = "DE3373891E73773400881891"
220-
BuildableName = "AllUnitTests_iOS"
221-
BlueprintName = "AllUnitTests_iOS"
222-
ReferencedContainer = "container:Firebase.xcodeproj">
223-
</BuildableReference>
224-
</MacroExpansion>
225-
<AdditionalOptions>
226-
</AdditionalOptions>
227201
</TestAction>
228202
<LaunchAction
229203
buildConfiguration = "Debug"
@@ -244,24 +218,13 @@
244218
ReferencedContainer = "container:Firebase.xcodeproj">
245219
</BuildableReference>
246220
</MacroExpansion>
247-
<AdditionalOptions>
248-
</AdditionalOptions>
249221
</LaunchAction>
250222
<ProfileAction
251223
buildConfiguration = "Release"
252224
shouldUseLaunchSchemeArgsEnv = "YES"
253225
savedToolIdentifier = ""
254226
useCustomWorkingDirectory = "NO"
255227
debugDocumentVersioning = "YES">
256-
<MacroExpansion>
257-
<BuildableReference
258-
BuildableIdentifier = "primary"
259-
BlueprintIdentifier = "DE3373891E73773400881891"
260-
BuildableName = "AllUnitTests_iOS"
261-
BlueprintName = "AllUnitTests_iOS"
262-
ReferencedContainer = "container:Firebase.xcodeproj">
263-
</BuildableReference>
264-
</MacroExpansion>
265228
</ProfileAction>
266229
<AnalyzeAction
267230
buildConfiguration = "Debug">

Example/Firebase.xcodeproj/xcshareddata/xcschemes/AllUnitTests_macOS.xcscheme

Lines changed: 9 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -62,27 +62,22 @@
6262
ReferencedContainer = "container:Firebase.xcodeproj">
6363
</BuildableReference>
6464
</BuildActionEntry>
65-
<BuildActionEntry
66-
buildForTesting = "YES"
67-
buildForRunning = "YES"
68-
buildForProfiling = "NO"
69-
buildForArchiving = "NO"
70-
buildForAnalyzing = "NO">
71-
<BuildableReference
72-
BuildableIdentifier = "primary"
73-
BlueprintIdentifier = "D0EDB2DE1EDA06CB00B6C31B"
74-
BuildableName = "Storage_Tests_macOS.xctest"
75-
BlueprintName = "Storage_Tests_macOS"
76-
ReferencedContainer = "container:Firebase.xcodeproj">
77-
</BuildableReference>
78-
</BuildActionEntry>
7965
</BuildActionEntries>
8066
</BuildAction>
8167
<TestAction
8268
buildConfiguration = "Debug"
8369
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
8470
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
8571
shouldUseLaunchSchemeArgsEnv = "YES">
72+
<MacroExpansion>
73+
<BuildableReference
74+
BuildableIdentifier = "primary"
75+
BlueprintIdentifier = "D0FE8A041ED9C32C003F6722"
76+
BuildableName = "AllUnitTests_macOS"
77+
BlueprintName = "AllUnitTests_macOS"
78+
ReferencedContainer = "container:Firebase.xcodeproj">
79+
</BuildableReference>
80+
</MacroExpansion>
8681
<Testables>
8782
<TestableReference
8883
skipped = "NO">
@@ -114,28 +109,7 @@
114109
ReferencedContainer = "container:Firebase.xcodeproj">
115110
</BuildableReference>
116111
</TestableReference>
117-
<TestableReference
118-
skipped = "NO">
119-
<BuildableReference
120-
BuildableIdentifier = "primary"
121-
BlueprintIdentifier = "D0EDB2DE1EDA06CB00B6C31B"
122-
BuildableName = "Storage_Tests_macOS.xctest"
123-
BlueprintName = "Storage_Tests_macOS"
124-
ReferencedContainer = "container:Firebase.xcodeproj">
125-
</BuildableReference>
126-
</TestableReference>
127112
</Testables>
128-
<MacroExpansion>
129-
<BuildableReference
130-
BuildableIdentifier = "primary"
131-
BlueprintIdentifier = "D0FE8A041ED9C32C003F6722"
132-
BuildableName = "AllUnitTests_macOS"
133-
BlueprintName = "AllUnitTests_macOS"
134-
ReferencedContainer = "container:Firebase.xcodeproj">
135-
</BuildableReference>
136-
</MacroExpansion>
137-
<AdditionalOptions>
138-
</AdditionalOptions>
139113
</TestAction>
140114
<LaunchAction
141115
buildConfiguration = "Debug"
@@ -156,24 +130,13 @@
156130
ReferencedContainer = "container:Firebase.xcodeproj">
157131
</BuildableReference>
158132
</MacroExpansion>
159-
<AdditionalOptions>
160-
</AdditionalOptions>
161133
</LaunchAction>
162134
<ProfileAction
163135
buildConfiguration = "Release"
164136
shouldUseLaunchSchemeArgsEnv = "YES"
165137
savedToolIdentifier = ""
166138
useCustomWorkingDirectory = "NO"
167139
debugDocumentVersioning = "YES">
168-
<MacroExpansion>
169-
<BuildableReference
170-
BuildableIdentifier = "primary"
171-
BlueprintIdentifier = "D0FE8A041ED9C32C003F6722"
172-
BuildableName = "AllUnitTests_macOS"
173-
BlueprintName = "AllUnitTests_macOS"
174-
ReferencedContainer = "container:Firebase.xcodeproj">
175-
</BuildableReference>
176-
</MacroExpansion>
177140
</ProfileAction>
178141
<AnalyzeAction
179142
buildConfiguration = "Debug">

Example/Firebase.xcodeproj/xcshareddata/xcschemes/AllUnitTests_tvOS.xcscheme

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,15 @@
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4343
shouldUseLaunchSchemeArgsEnv = "YES">
44+
<MacroExpansion>
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "DE545C7F1FBCA3F000C637AE"
48+
BuildableName = "AllUnitTests_tvOS"
49+
BlueprintName = "AllUnitTests_tvOS"
50+
ReferencedContainer = "container:Firebase.xcodeproj">
51+
</BuildableReference>
52+
</MacroExpansion>
4453
<Testables>
4554
<TestableReference
4655
skipped = "NO">
@@ -62,16 +71,6 @@
6271
ReferencedContainer = "container:Firebase.xcodeproj">
6372
</BuildableReference>
6473
</TestableReference>
65-
<TestableReference
66-
skipped = "NO">
67-
<BuildableReference
68-
BuildableIdentifier = "primary"
69-
BlueprintIdentifier = "DEAAD3F41FBA46AB0053BF48"
70-
BuildableName = "Storage_Tests_tvOS.xctest"
71-
BlueprintName = "Storage_Tests_tvOS"
72-
ReferencedContainer = "container:Firebase.xcodeproj">
73-
</BuildableReference>
74-
</TestableReference>
7574
<TestableReference
7675
skipped = "NO">
7776
<BuildableReference
@@ -103,17 +102,6 @@
103102
</BuildableReference>
104103
</TestableReference>
105104
</Testables>
106-
<MacroExpansion>
107-
<BuildableReference
108-
BuildableIdentifier = "primary"
109-
BlueprintIdentifier = "DE545C7F1FBCA3F000C637AE"
110-
BuildableName = "AllUnitTests_tvOS"
111-
BlueprintName = "AllUnitTests_tvOS"
112-
ReferencedContainer = "container:Firebase.xcodeproj">
113-
</BuildableReference>
114-
</MacroExpansion>
115-
<AdditionalOptions>
116-
</AdditionalOptions>
117105
</TestAction>
118106
<LaunchAction
119107
buildConfiguration = "Debug"
@@ -134,8 +122,6 @@
134122
ReferencedContainer = "container:Firebase.xcodeproj">
135123
</BuildableReference>
136124
</MacroExpansion>
137-
<AdditionalOptions>
138-
</AdditionalOptions>
139125
</LaunchAction>
140126
<ProfileAction
141127
buildConfiguration = "Release"

Example/Firebase.xcodeproj/xcshareddata/xcschemes/Storage_Example_iOS.xcscheme

Lines changed: 0 additions & 101 deletions
This file was deleted.

0 commit comments

Comments
 (0)