Skip to content

Commit b63860c

Browse files
morganchen12morganchen12
committed
Merge branch 'master' of github.com:firebase/FirebaseUI-iOS
2 parents d9383eb + 4d2881c commit b63860c

21 files changed

+199
-265
lines changed

‎FirebaseUI_dev_auth.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Pod::Spec.new do |s|
55
s.homepage = 'https://github.com/firebase/FirebaseUI-iOS'
66
s.license = { :type => 'Apache 2.0' }
77
s.author = 'Firebase'
8-
s.source = { :git => "../../FirebaseUI-iOS.git" }
8+
s.source = { :git => "https://github.com/firebase/FirebaseUI-iOS.git" }
99
s.platform = :ios
1010
s.ios.deployment_target = '8.0'
1111
s.ios.framework = 'UIKit'

‎FirebaseUI_dev_db.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Pod::Spec.new do |s|
55
s.homepage = 'https://github.com/firebase/FirebaseUI-iOS'
66
s.license = { :type => 'Apache 2.0' }
77
s.author = 'Firebase'
8-
s.source = { :git => "../../FirebaseUI-iOS.git" }
8+
s.source = { :git => "https://github.com/firebase/FirebaseUI-iOS.git" }
99
s.platform = :ios
1010
s.ios.deployment_target = '8.0'
1111
s.ios.framework = 'UIKit'

‎FirebaseUI_dev_fb.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Pod::Spec.new do |s|
55
s.homepage = 'https://github.com/firebase/FirebaseUI-iOS'
66
s.license = { :type => 'Apache 2.0' }
77
s.author = 'Firebase'
8-
s.source = { :git => "../../FirebaseUI-iOS.git" }
8+
s.source = { :git => "https://github.com/firebase/FirebaseUI-iOS.git" }
99
s.platform = :ios
1010
s.ios.deployment_target = '8.0'
1111
s.ios.framework = 'UIKit'

‎FirebaseUI_dev_ggl.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Pod::Spec.new do |s|
55
s.homepage = 'https://github.com/firebase/FirebaseUI-iOS'
66
s.license = { :type => 'Apache 2.0' }
77
s.author = 'Firebase'
8-
s.source = { :git => "../../FirebaseUI-iOS.git" }
8+
s.source = { :git => "https://github.com/firebase/FirebaseUI-iOS.git" }
99
s.platform = :ios
1010
s.ios.deployment_target = '8.0'
1111
s.ios.framework = 'UIKit'

‎FirebaseUI_dev_storage.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Pod::Spec.new do |s|
55
s.homepage = 'https://github.com/firebase/FirebaseUI-iOS'
66
s.license = { :type => 'Apache 2.0' }
77
s.author = 'Firebase'
8-
s.source = { :git => "../../FirebaseUI-iOS.git" }
8+
s.source = { :git => "https://github.com/firebase/FirebaseUI-iOS.git" }
99
s.platform = :ios
1010
s.ios.deployment_target = '8.0'
1111
s.ios.framework = 'UIKit'

‎FirebaseUI_dev_tw.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Pod::Spec.new do |s|
55
s.homepage = 'https://github.com/firebase/FirebaseUI-iOS'
66
s.license = { :type => 'Apache 2.0' }
77
s.author = 'Firebase'
8-
s.source = { :git => "../../FirebaseUI-iOS.git" }
8+
s.source = { :git => "https://github.com/firebase/FirebaseUI-iOS.git" }
99
s.platform = :ios
1010
s.ios.deployment_target = '8.0'
1111
s.ios.framework = 'UIKit'

‎build.swift

Lines changed: 47 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,39 @@ func cp(from source: String, to destination: String) -> Void {
5959
guard task.terminationStatus == 0 else { exit(task.terminationStatus) }
6060
}
6161

62+
func ln(from source: String, to destination: String) -> Void {
63+
let task = Process()
64+
task.launchPath = "/bin/ln"
65+
task.arguments = ["-s", source, destination]
66+
task.launch()
67+
task.waitUntilExit()
68+
guard task.terminationStatus == 0 else { exit(task.terminationStatus) }
69+
}
70+
71+
/// Moves files to trash
72+
func rm(_ path: String, isDirectory: Bool, isStrict: Bool) -> Void {
73+
let url = URL(fileURLWithPath: path, isDirectory: isDirectory)
74+
let fileManager = FileManager()
75+
do {
76+
try fileManager.trashItem(at: url, resultingItemURL: nil)
77+
} catch (let error) {
78+
if (isStrict) {
79+
print(fileManager.currentDirectoryPath)
80+
print(error)
81+
exit(1)
82+
}
83+
}
84+
}
85+
86+
func zip(_ input: String, output: String) -> Void {
87+
let task = Process()
88+
task.launchPath = "/usr/bin/zip"
89+
task.arguments = ["-r", "-9", "-y", output, input]
90+
task.launch()
91+
task.waitUntilExit()
92+
guard task.terminationStatus == 0 else { exit(task.terminationStatus) }
93+
}
94+
6295
mkdir(DerivedDataDir)
6396
mkdir(BuiltProductsDir)
6497

@@ -223,34 +256,23 @@ cp(from: "README.md", to: BuiltProductsDir)
223256

224257
// copy sample projects
225258
cp(from: "samples", to: BuiltProductsDir)
259+
rm(BuiltProductsDir + "samples/objc/Pods", isDirectory: true, isStrict: false)
260+
rm(BuiltProductsDir + "samples/objc/Podfile.lock", isDirectory: false, isStrict: false)
261+
rm(BuiltProductsDir + "samples/objc/GoogleService-Info.plist", isDirectory: false, isStrict: false)
262+
rm(BuiltProductsDir + "samples/swift/Pods", isDirectory: true, isStrict: false)
263+
rm(BuiltProductsDir + "samples/swift/Podfile.lock", isDirectory: false, isStrict: false)
264+
rm(BuiltProductsDir + "samples/swift/GoogleService-Info.plist", isDirectory: false, isStrict: false)
265+
rm(BuiltProductsDir + "samples/objc/FirebaseUIChat.xcodeproj/xcuserdata", isDirectory: true, isStrict: false)
266+
rm(BuiltProductsDir + "samples/objc/FirebaseUIChat.xcworkspace/xcuserdata", isDirectory: true, isStrict: false)
267+
rm(BuiltProductsDir + "samples/swift/uidemo.xcodeproj/xcuserdata", isDirectory: true, isStrict: false)
268+
rm(BuiltProductsDir + "samples/swift/uidemo.xcworkspace/xcuserdata", isDirectory: true, isStrict: false)
269+
ln(from: "./objc/FirebaseUIChat.xcworkspace", to: BuiltProductsDir + "samples/FirebaseUI-demo-objc.xcworkspace")
270+
ln(from: "./swift/uidemo.xcworkspace", to: BuiltProductsDir + "samples/FirebaseUI-demo-swift.xcworkspace")
226271

227272
// clean up build artifacts afterward
228-
229-
/// Moves files to trash
230-
func rm(_ path: String, isDirectory: Bool) -> Void {
231-
let url = URL(fileURLWithPath: path, isDirectory: isDirectory)
232-
let fileManager = FileManager()
233-
do {
234-
try fileManager.trashItem(at: url, resultingItemURL: nil)
235-
} catch (let error) {
236-
print(fileManager.currentDirectoryPath)
237-
print(error)
238-
exit(1)
239-
}
240-
}
241-
242-
func zip(_ input: String, output: String) -> Void {
243-
let task = Process()
244-
task.launchPath = "/usr/bin/zip"
245-
task.arguments = ["-r", "-9", output, input]
246-
task.launch()
247-
task.waitUntilExit()
248-
guard task.terminationStatus == 0 else { exit(task.terminationStatus) }
249-
}
250-
251273
zip("FirebaseUIFrameworks", output: "FirebaseUIFrameworks.zip")
252274

253-
rm(DerivedDataDir, isDirectory: true)
254-
rm(BuiltProductsDir, isDirectory: true)
275+
rm(DerivedDataDir, isDirectory: true, isStrict: true)
276+
rm(BuiltProductsDir, isDirectory: true, isStrict: true)
255277

256278
exit(0)

‎samples/FirebaseUI-demo_objc.xcworkspace

-350 KB
Binary file not shown.

‎samples/FirebaseUI-demo_swift.xcworkspace

-350 KB
Binary file not shown.

‎samples/objc/Podfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ platform :ios, '8.0'
33
target 'FirebaseUIChat' do
44

55
# used for development from sources
6-
pod 'FirebaseAuthUI', :path => "../../FirebaseUI_dev_auth.podspec"
7-
pod 'FirebaseDatabaseUI', :path => "../../FirebaseUI_dev_db.podspec"
8-
pod 'FirebaseStorageUI', :path => "../../FirebaseUI_dev_storage.podspec"
9-
pod 'FirebaseFacebookAuthUI', :path => "../../FirebaseUI_dev_fb.podspec"
10-
pod 'FirebaseGoogleAuthUI', :path => "../../FirebaseUI_dev_ggl.podspec"
11-
pod 'FirebaseTwitterAuthUI', :path => "../../FirebaseUI_dev_tw.podspec"
6+
pod 'FirebaseAuthUI', :podspec => "https://raw.githubusercontent.com/firebase/FirebaseUI-iOS/master/FirebaseUI_dev_auth.podspec"
7+
pod 'FirebaseDatabaseUI', :podspec => "https://raw.githubusercontent.com/firebase/FirebaseUI-iOS/master/FirebaseUI_dev_db.podspec"
8+
pod 'FirebaseStorageUI', :podspec => "https://raw.githubusercontent.com/firebase/FirebaseUI-iOS/master/FirebaseUI_dev_storage.podspec"
9+
pod 'FirebaseFacebookAuthUI', :podspec => "https://raw.githubusercontent.com/firebase/FirebaseUI-iOS/master/FirebaseUI_dev_fb.podspec"
10+
pod 'FirebaseGoogleAuthUI', :podspec => "https://raw.githubusercontent.com/firebase/FirebaseUI-iOS/master/FirebaseUI_dev_ggl.podspec"
11+
pod 'FirebaseTwitterAuthUI', :podspec => "https://raw.githubusercontent.com/firebase/FirebaseUI-iOS/master/FirebaseUI_dev_tw.podspec"
1212

1313
# used for development from released frameworks
1414
# use_frameworks!
15-
# pod 'FirebaseUI', :podspec => "../../FirebaseUI.podspec"
15+
# pod 'FirebaseUI', :podspec => "https://raw.githubusercontent.com/firebase/FirebaseUI-iOS/master/FirebaseUI.podspec"
1616

1717
end

‎samples/swift/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
target 'uidemo' do
22
use_frameworks!
33

4-
pod 'FirebaseUI', :podspec => '../../FirebaseUI.podspec'
4+
pod 'FirebaseUI', :podspec => 'https://raw.githubusercontent.com/firebase/FirebaseUI-iOS/master/FirebaseUI.podspec'
55

66
target 'uidemoTests' do
77
inherit! :search_paths

‎samples/swift/uidemo.xcodeproj/project.pbxproj

Lines changed: 12 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,9 @@
159159
isa = PBXNativeTarget;
160160
buildConfigurationList = 8DABC9A21D3D82D600453807 /* Build configuration list for PBXNativeTarget "uidemo" */;
161161
buildPhases = (
162-
757DE2C28DE66EF8748CA3DA /* [CP] Check Pods Manifest.lock */,
163162
8DABC9811D3D82D600453807 /* Sources */,
164163
8DABC9821D3D82D600453807 /* Frameworks */,
165164
8DABC9831D3D82D600453807 /* Resources */,
166-
766A34E36C2BABD9E53324E8 /* [CP] Embed Pods Frameworks */,
167-
6CC65E746C220141C88C7F20 /* [CP] Copy Pods Resources */,
168165
);
169166
buildRules = (
170167
);
@@ -179,12 +176,9 @@
179176
isa = PBXNativeTarget;
180177
buildConfigurationList = 8DABC9A51D3D82D600453807 /* Build configuration list for PBXNativeTarget "uidemoTests" */;
181178
buildPhases = (
182-
235E6CAB9EF32464B5D5C387 /* [CP] Check Pods Manifest.lock */,
183179
8DABC9951D3D82D600453807 /* Sources */,
184180
8DABC9961D3D82D600453807 /* Frameworks */,
185181
8DABC9971D3D82D600453807 /* Resources */,
186-
C6C5C6CC234D3892828C1C9D /* [CP] Embed Pods Frameworks */,
187-
25A95440B19AD17F8CF61ED7 /* [CP] Copy Pods Resources */,
188182
);
189183
buildRules = (
190184
);
@@ -203,14 +197,16 @@
203197
isa = PBXProject;
204198
attributes = {
205199
LastSwiftUpdateCheck = 0730;
206-
LastUpgradeCheck = 0730;
200+
LastUpgradeCheck = 0800;
207201
ORGANIZATIONNAME = morganchen;
208202
TargetAttributes = {
209203
8DABC9841D3D82D600453807 = {
210204
CreatedOnToolsVersion = 7.3.1;
205+
LastSwiftMigration = 0800;
211206
};
212207
8DABC9981D3D82D600453807 = {
213208
CreatedOnToolsVersion = 7.3.1;
209+
LastSwiftMigration = 0800;
214210
TestTargetID = 8DABC9841D3D82D600453807;
215211
};
216212
};
@@ -255,99 +251,6 @@
255251
};
256252
/* End PBXResourcesBuildPhase section */
257253

258-
/* Begin PBXShellScriptBuildPhase section */
259-
235E6CAB9EF32464B5D5C387 /* [CP] Check Pods Manifest.lock */ = {
260-
isa = PBXShellScriptBuildPhase;
261-
buildActionMask = 2147483647;
262-
files = (
263-
);
264-
inputPaths = (
265-
);
266-
name = "[CP] Check Pods Manifest.lock";
267-
outputPaths = (
268-
);
269-
runOnlyForDeploymentPostprocessing = 0;
270-
shellPath = /bin/sh;
271-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
272-
showEnvVarsInLog = 0;
273-
};
274-
25A95440B19AD17F8CF61ED7 /* [CP] Copy Pods Resources */ = {
275-
isa = PBXShellScriptBuildPhase;
276-
buildActionMask = 2147483647;
277-
files = (
278-
);
279-
inputPaths = (
280-
);
281-
name = "[CP] Copy Pods Resources";
282-
outputPaths = (
283-
);
284-
runOnlyForDeploymentPostprocessing = 0;
285-
shellPath = /bin/sh;
286-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-uidemoTests/Pods-uidemoTests-resources.sh\"\n";
287-
showEnvVarsInLog = 0;
288-
};
289-
6CC65E746C220141C88C7F20 /* [CP] Copy Pods Resources */ = {
290-
isa = PBXShellScriptBuildPhase;
291-
buildActionMask = 2147483647;
292-
files = (
293-
);
294-
inputPaths = (
295-
);
296-
name = "[CP] Copy Pods Resources";
297-
outputPaths = (
298-
);
299-
runOnlyForDeploymentPostprocessing = 0;
300-
shellPath = /bin/sh;
301-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-uidemo/Pods-uidemo-resources.sh\"\n";
302-
showEnvVarsInLog = 0;
303-
};
304-
757DE2C28DE66EF8748CA3DA /* [CP] Check Pods Manifest.lock */ = {
305-
isa = PBXShellScriptBuildPhase;
306-
buildActionMask = 2147483647;
307-
files = (
308-
);
309-
inputPaths = (
310-
);
311-
name = "[CP] Check Pods Manifest.lock";
312-
outputPaths = (
313-
);
314-
runOnlyForDeploymentPostprocessing = 0;
315-
shellPath = /bin/sh;
316-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
317-
showEnvVarsInLog = 0;
318-
};
319-
766A34E36C2BABD9E53324E8 /* [CP] Embed Pods Frameworks */ = {
320-
isa = PBXShellScriptBuildPhase;
321-
buildActionMask = 2147483647;
322-
files = (
323-
);
324-
inputPaths = (
325-
);
326-
name = "[CP] Embed Pods Frameworks";
327-
outputPaths = (
328-
);
329-
runOnlyForDeploymentPostprocessing = 0;
330-
shellPath = /bin/sh;
331-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-uidemo/Pods-uidemo-frameworks.sh\"\n";
332-
showEnvVarsInLog = 0;
333-
};
334-
C6C5C6CC234D3892828C1C9D /* [CP] Embed Pods Frameworks */ = {
335-
isa = PBXShellScriptBuildPhase;
336-
buildActionMask = 2147483647;
337-
files = (
338-
);
339-
inputPaths = (
340-
);
341-
name = "[CP] Embed Pods Frameworks";
342-
outputPaths = (
343-
);
344-
runOnlyForDeploymentPostprocessing = 0;
345-
shellPath = /bin/sh;
346-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-uidemoTests/Pods-uidemoTests-frameworks.sh\"\n";
347-
showEnvVarsInLog = 0;
348-
};
349-
/* End PBXShellScriptBuildPhase section */
350-
351254
/* Begin PBXSourcesBuildPhase section */
352255
8DABC9811D3D82D600453807 /* Sources */ = {
353256
isa = PBXSourcesBuildPhase;
@@ -418,8 +321,10 @@
418321
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
419322
CLANG_WARN_EMPTY_BODY = YES;
420323
CLANG_WARN_ENUM_CONVERSION = YES;
324+
CLANG_WARN_INFINITE_RECURSION = YES;
421325
CLANG_WARN_INT_CONVERSION = YES;
422326
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
327+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
423328
CLANG_WARN_UNREACHABLE_CODE = YES;
424329
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
425330
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -465,8 +370,10 @@
465370
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
466371
CLANG_WARN_EMPTY_BODY = YES;
467372
CLANG_WARN_ENUM_CONVERSION = YES;
373+
CLANG_WARN_INFINITE_RECURSION = YES;
468374
CLANG_WARN_INT_CONVERSION = YES;
469375
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
376+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
470377
CLANG_WARN_UNREACHABLE_CODE = YES;
471378
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
472379
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -485,6 +392,7 @@
485392
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
486393
MTL_ENABLE_DEBUG_INFO = NO;
487394
SDKROOT = iphoneos;
395+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
488396
TARGETED_DEVICE_FAMILY = "1,2";
489397
VALIDATE_PRODUCT = YES;
490398
};
@@ -502,6 +410,7 @@
502410
PRODUCT_NAME = "$(TARGET_NAME)";
503411
SWIFT_OBJC_BRIDGING_HEADER = "";
504412
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
413+
SWIFT_VERSION = 3.0;
505414
};
506415
name = Debug;
507416
};
@@ -516,6 +425,7 @@
516425
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.firebaseui.uidemo;
517426
PRODUCT_NAME = "$(TARGET_NAME)";
518427
SWIFT_OBJC_BRIDGING_HEADER = "";
428+
SWIFT_VERSION = 3.0;
519429
};
520430
name = Release;
521431
};
@@ -527,6 +437,7 @@
527437
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
528438
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.uidemoTests;
529439
PRODUCT_NAME = "$(TARGET_NAME)";
440+
SWIFT_VERSION = 3.0;
530441
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/uidemo.app/uidemo";
531442
};
532443
name = Debug;
@@ -539,6 +450,7 @@
539450
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
540451
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.uidemoTests;
541452
PRODUCT_NAME = "$(TARGET_NAME)";
453+
SWIFT_VERSION = 3.0;
542454
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/uidemo.app/uidemo";
543455
};
544456
name = Release;

0 commit comments

Comments
 (0)