Skip to content
This repository was archived by the owner on Apr 7, 2018. It is now read-only.

Commit 3104f91

Browse files
kzaherkzaher
committed
Adaptations of RxFirebase to Swift 3 and RxSwift 3.
1 parent 0c71cc0 commit 3104f91

12 files changed

+405
-521
lines changed

‎.RxFirebase.podspec.swp

12 KB
Binary file not shown.

‎.swift-version

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.0

‎Example/Podfile.lock

+74-39
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,92 @@
11
PODS:
2-
- Firebase/Analytics (3.2.0):
3-
- FirebaseAnalytics (= 3.2.0)
4-
- Firebase/Auth (3.2.0):
5-
- Firebase/Analytics (= 3.2.0)
6-
- FirebaseAuth (= 3.0.2)
7-
- Firebase/Database (3.2.0):
8-
- Firebase/Analytics (= 3.2.0)
9-
- FirebaseDatabase (= 3.0.1)
10-
- FirebaseAnalytics (3.2.0):
2+
- Firebase/Analytics (3.10.0):
3+
- Firebase/Core
4+
- Firebase/Auth (3.10.0):
5+
- Firebase/Core
6+
- FirebaseAuth (= 3.0.6)
7+
- Firebase/Core (3.10.0):
8+
- FirebaseAnalytics (= 3.6.0)
9+
- FirebaseCore (= 3.4.5)
10+
- Firebase/Database (3.10.0):
11+
- Firebase/Core
12+
- FirebaseDatabase (= 3.1.1)
13+
- Firebase/RemoteConfig (3.10.0):
14+
- Firebase/Core
15+
- FirebaseRemoteConfig (= 1.3.1)
16+
- Firebase/Storage (3.10.0):
17+
- Firebase/Core
18+
- FirebaseStorage (= 1.0.5)
19+
- FirebaseAnalytics (3.6.0):
20+
- FirebaseCore (~> 3.4)
1121
- FirebaseInstanceID (~> 1.0)
1222
- GoogleInterchangeUtilities (~> 1.2)
1323
- GoogleSymbolUtilities (~> 1.1)
14-
- GoogleUtilities (~> 1.3)
15-
- FirebaseAuth (3.0.2):
16-
- FirebaseAnalytics (~> 3.2)
17-
- GoogleNetworkingUtilities (~> 1.2)
18-
- GoogleUtilities (~> 1.3)
19-
- FirebaseDatabase (3.0.1):
20-
- FirebaseAnalytics (~> 3.2)
21-
- FirebaseInstanceID (1.0.6)
22-
- GoogleInterchangeUtilities (1.2.1):
23-
- GoogleSymbolUtilities (~> 1.0)
24-
- GoogleNetworkingUtilities (1.2.1):
25-
- GoogleSymbolUtilities (~> 1.0)
26-
- GoogleSymbolUtilities (1.1.1)
27-
- GoogleUtilities (1.3.1):
28-
- GoogleSymbolUtilities (~> 1.0)
24+
- GoogleToolboxForMac/NSData+zlib (~> 2.1)
25+
- FirebaseAuth (3.0.6):
26+
- FirebaseAnalytics (~> 3.4)
27+
- GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)
28+
- GTMSessionFetcher/Core (~> 1.1)
29+
- FirebaseCore (3.4.5):
30+
- GoogleInterchangeUtilities (~> 1.2)
31+
- GoogleToolboxForMac/NSData+zlib (~> 2.1)
32+
- FirebaseDatabase (3.1.1):
33+
- FirebaseAnalytics (~> 3.5)
34+
- FirebaseInstanceID (1.0.8)
35+
- FirebaseRemoteConfig (1.3.1):
36+
- FirebaseAnalytics (~> 3.4)
37+
- FirebaseInstanceID (~> 1.0)
38+
- GoogleInterchangeUtilities (~> 1.2)
39+
- GoogleSymbolUtilities (~> 1.1)
40+
- GoogleToolboxForMac/NSData+zlib (~> 2.1)
41+
- FirebaseStorage (1.0.5):
42+
- FirebaseAnalytics (~> 3.5)
43+
- GTMSessionFetcher/Core (~> 1.1)
44+
- GoogleInterchangeUtilities (1.2.2):
45+
- GoogleSymbolUtilities (~> 1.1)
46+
- GoogleSymbolUtilities (1.1.2)
47+
- GoogleToolboxForMac/DebugUtils (2.1.0):
48+
- GoogleToolboxForMac/Defines (= 2.1.0)
49+
- GoogleToolboxForMac/Defines (2.1.0)
50+
- GoogleToolboxForMac/NSData+zlib (2.1.0):
51+
- GoogleToolboxForMac/Defines (= 2.1.0)
52+
- GoogleToolboxForMac/NSDictionary+URLArguments (2.1.0):
53+
- GoogleToolboxForMac/DebugUtils (= 2.1.0)
54+
- GoogleToolboxForMac/Defines (= 2.1.0)
55+
- GoogleToolboxForMac/NSString+URLArguments (= 2.1.0)
56+
- GoogleToolboxForMac/NSString+URLArguments (2.1.0)
57+
- GTMSessionFetcher/Core (1.1.7)
2958
- RxFirebase (0.1.0):
59+
- Firebase/Analytics
3060
- Firebase/Auth
3161
- Firebase/Database
32-
- RxSwift (~> 2.5)
33-
- RxSwift (2.5.0)
62+
- Firebase/RemoteConfig
63+
- Firebase/Storage
64+
- RxSwift (~> 3.0)
65+
- RxSwift (3.0.1)
3466

3567
DEPENDENCIES:
3668
- RxFirebase (from `../`)
3769

3870
EXTERNAL SOURCES:
3971
RxFirebase:
40-
:path: ../
72+
:path: "../"
4173

4274
SPEC CHECKSUMS:
43-
Firebase: 6d4012da1598732a2b43f16d8355eca90f94ed59
44-
FirebaseAnalytics: 6f75b04e6bfb8e0b6e9ef298e04c24eea3b13863
45-
FirebaseAuth: 94b851fc345ce98036dfedfdc2eddeaef8fa3b4c
46-
FirebaseDatabase: 34301d11621a83546f39f670d256477ba6f7fcea
47-
FirebaseInstanceID: d014d574053a2fe84478f12f7bae96979e7051bb
48-
GoogleInterchangeUtilities: def8415a862effc67d549d5b5b0b9c7a2f97d4de
49-
GoogleNetworkingUtilities: 3e83269048cfb498dc7ec83ab36813360965c74f
50-
GoogleSymbolUtilities: 33117db1b5f290c6fbf259585e4885b4c84b98d7
51-
GoogleUtilities: 56c5ac05b7aa5dc417a1bb85221a9516e04d7032
52-
RxFirebase: 59cfda204203de3c4cd0ee26b5f290990e66e32f
53-
RxSwift: 402b41a50e922a0368fc14cb3bc9f4427920e8ae
75+
Firebase: 387f37c7dca894a02708da9ff35ba147040eae9e
76+
FirebaseAnalytics: 9c67af0ebeb8d2146c9b4ea2616439affa947b58
77+
FirebaseAuth: 96e9674ff31d6e1f826d53e26aa003a57cab0295
78+
FirebaseCore: 1e383fdfe37b6b5d6ff88e84204bdee30276af0f
79+
FirebaseDatabase: 6de92187481ff0e8e124064f21742e95ee883b02
80+
FirebaseInstanceID: ba1e640935235e5fac39dfa816fe7660e72e1a8a
81+
FirebaseRemoteConfig: 383a9afe0a9291ada949e3f615257928a823b594
82+
FirebaseStorage: 5738284835edb57f0e81d4ae5832bb17c1e4b5fa
83+
GoogleInterchangeUtilities: d5bc4d88d5b661ab72f9d70c58d02ca8c27ad1f7
84+
GoogleSymbolUtilities: 631ee17048aa5e9ab133470d768ea997a5ef9b96
85+
GoogleToolboxForMac: 2b2596cbb7186865e98cadf2b1e262d851c2b168
86+
GTMSessionFetcher: a1f8ed39e4fe21c68957daed472c7afbcdf29166
87+
RxFirebase: e2dd01246ec7bd5c9aa668b80af73a15b43eaf42
88+
RxSwift: af5680055c4ad04480189c52d28385b1029493a6
5489

5590
PODFILE CHECKSUM: 7055416547896e7d460aa0056157b9aecb7d6deb
5691

57-
COCOAPODS: 1.0.0
92+
COCOAPODS: 1.1.1

‎Example/RxFirebase.xcodeproj/project.pbxproj

+22-20
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,12 @@
166166
isa = PBXNativeTarget;
167167
buildConfigurationList = 607FACEF1AFB9204008FA782 /* Build configuration list for PBXNativeTarget "RxFirebase_Example" */;
168168
buildPhases = (
169-
944C8942C3F340DC4365F8B0 /* 📦 Check Pods Manifest.lock */,
169+
944C8942C3F340DC4365F8B0 /* [CP] Check Pods Manifest.lock */,
170170
607FACCC1AFB9204008FA782 /* Sources */,
171171
607FACCD1AFB9204008FA782 /* Frameworks */,
172172
607FACCE1AFB9204008FA782 /* Resources */,
173-
804855B0613C8BE053B9A624 /* 📦 Embed Pods Frameworks */,
174-
98398309EF70B6D10AB630A1 /* 📦 Copy Pods Resources */,
173+
804855B0613C8BE053B9A624 /* [CP] Embed Pods Frameworks */,
174+
98398309EF70B6D10AB630A1 /* [CP] Copy Pods Resources */,
175175
);
176176
buildRules = (
177177
);
@@ -186,12 +186,12 @@
186186
isa = PBXNativeTarget;
187187
buildConfigurationList = 607FACF21AFB9204008FA782 /* Build configuration list for PBXNativeTarget "RxFirebase_Tests" */;
188188
buildPhases = (
189-
E1FC2347463DB34BCA244A83 /* 📦 Check Pods Manifest.lock */,
189+
E1FC2347463DB34BCA244A83 /* [CP] Check Pods Manifest.lock */,
190190
607FACE11AFB9204008FA782 /* Sources */,
191191
607FACE21AFB9204008FA782 /* Frameworks */,
192192
607FACE31AFB9204008FA782 /* Resources */,
193-
B95E4D070990B7BF68B72C79 /* 📦 Embed Pods Frameworks */,
194-
B168629AC375AE191659CB18 /* 📦 Copy Pods Resources */,
193+
B95E4D070990B7BF68B72C79 /* [CP] Embed Pods Frameworks */,
194+
B168629AC375AE191659CB18 /* [CP] Copy Pods Resources */,
195195
);
196196
buildRules = (
197197
);
@@ -262,94 +262,94 @@
262262
/* End PBXResourcesBuildPhase section */
263263

264264
/* Begin PBXShellScriptBuildPhase section */
265-
804855B0613C8BE053B9A624 /* 📦 Embed Pods Frameworks */ = {
265+
804855B0613C8BE053B9A624 /* [CP] Embed Pods Frameworks */ = {
266266
isa = PBXShellScriptBuildPhase;
267267
buildActionMask = 2147483647;
268268
files = (
269269
);
270270
inputPaths = (
271271
);
272-
name = "📦 Embed Pods Frameworks";
272+
name = "[CP] Embed Pods Frameworks";
273273
outputPaths = (
274274
);
275275
runOnlyForDeploymentPostprocessing = 0;
276276
shellPath = /bin/sh;
277277
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxFirebase_Example/Pods-RxFirebase_Example-frameworks.sh\"\n";
278278
showEnvVarsInLog = 0;
279279
};
280-
944C8942C3F340DC4365F8B0 /* 📦 Check Pods Manifest.lock */ = {
280+
944C8942C3F340DC4365F8B0 /* [CP] Check Pods Manifest.lock */ = {
281281
isa = PBXShellScriptBuildPhase;
282282
buildActionMask = 2147483647;
283283
files = (
284284
);
285285
inputPaths = (
286286
);
287-
name = "📦 Check Pods Manifest.lock";
287+
name = "[CP] Check Pods Manifest.lock";
288288
outputPaths = (
289289
);
290290
runOnlyForDeploymentPostprocessing = 0;
291291
shellPath = /bin/sh;
292-
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";
292+
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
293293
showEnvVarsInLog = 0;
294294
};
295-
98398309EF70B6D10AB630A1 /* 📦 Copy Pods Resources */ = {
295+
98398309EF70B6D10AB630A1 /* [CP] Copy Pods Resources */ = {
296296
isa = PBXShellScriptBuildPhase;
297297
buildActionMask = 2147483647;
298298
files = (
299299
);
300300
inputPaths = (
301301
);
302-
name = "📦 Copy Pods Resources";
302+
name = "[CP] Copy Pods Resources";
303303
outputPaths = (
304304
);
305305
runOnlyForDeploymentPostprocessing = 0;
306306
shellPath = /bin/sh;
307307
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxFirebase_Example/Pods-RxFirebase_Example-resources.sh\"\n";
308308
showEnvVarsInLog = 0;
309309
};
310-
B168629AC375AE191659CB18 /* 📦 Copy Pods Resources */ = {
310+
B168629AC375AE191659CB18 /* [CP] Copy Pods Resources */ = {
311311
isa = PBXShellScriptBuildPhase;
312312
buildActionMask = 2147483647;
313313
files = (
314314
);
315315
inputPaths = (
316316
);
317-
name = "📦 Copy Pods Resources";
317+
name = "[CP] Copy Pods Resources";
318318
outputPaths = (
319319
);
320320
runOnlyForDeploymentPostprocessing = 0;
321321
shellPath = /bin/sh;
322322
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxFirebase_Tests/Pods-RxFirebase_Tests-resources.sh\"\n";
323323
showEnvVarsInLog = 0;
324324
};
325-
B95E4D070990B7BF68B72C79 /* 📦 Embed Pods Frameworks */ = {
325+
B95E4D070990B7BF68B72C79 /* [CP] Embed Pods Frameworks */ = {
326326
isa = PBXShellScriptBuildPhase;
327327
buildActionMask = 2147483647;
328328
files = (
329329
);
330330
inputPaths = (
331331
);
332-
name = "📦 Embed Pods Frameworks";
332+
name = "[CP] Embed Pods Frameworks";
333333
outputPaths = (
334334
);
335335
runOnlyForDeploymentPostprocessing = 0;
336336
shellPath = /bin/sh;
337337
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxFirebase_Tests/Pods-RxFirebase_Tests-frameworks.sh\"\n";
338338
showEnvVarsInLog = 0;
339339
};
340-
E1FC2347463DB34BCA244A83 /* 📦 Check Pods Manifest.lock */ = {
340+
E1FC2347463DB34BCA244A83 /* [CP] Check Pods Manifest.lock */ = {
341341
isa = PBXShellScriptBuildPhase;
342342
buildActionMask = 2147483647;
343343
files = (
344344
);
345345
inputPaths = (
346346
);
347-
name = "📦 Check Pods Manifest.lock";
347+
name = "[CP] Check Pods Manifest.lock";
348348
outputPaths = (
349349
);
350350
runOnlyForDeploymentPostprocessing = 0;
351351
shellPath = /bin/sh;
352-
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";
352+
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
353353
showEnvVarsInLog = 0;
354354
};
355355
/* End PBXShellScriptBuildPhase section */
@@ -444,6 +444,7 @@
444444
ONLY_ACTIVE_ARCH = YES;
445445
SDKROOT = iphoneos;
446446
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
447+
SWIFT_VERSION = 3.0.1;
447448
};
448449
name = Debug;
449450
};
@@ -480,6 +481,7 @@
480481
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
481482
MTL_ENABLE_DEBUG_INFO = NO;
482483
SDKROOT = iphoneos;
484+
SWIFT_VERSION = 3.0.1;
483485
VALIDATE_PRODUCT = YES;
484486
};
485487
name = Release;

‎Example/RxFirebase/AppDelegate.swift

-29
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,5 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1313

1414
var window: UIWindow?
1515

16-
17-
func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
18-
// Override point for customization after application launch.
19-
return true
20-
}
21-
22-
func applicationWillResignActive(application: UIApplication) {
23-
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
24-
// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
25-
}
26-
27-
func applicationDidEnterBackground(application: UIApplication) {
28-
// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
29-
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
30-
}
31-
32-
func applicationWillEnterForeground(application: UIApplication) {
33-
// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
34-
}
35-
36-
func applicationDidBecomeActive(application: UIApplication) {
37-
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
38-
}
39-
40-
func applicationWillTerminate(application: UIApplication) {
41-
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
42-
}
43-
44-
4516
}
4617

‎Example/Tests/Tests.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Tests: XCTestCase {
2121

2222
func testPerformanceExample() {
2323
// This is an example of a performance test case.
24-
self.measureBlock() {
24+
self.measure() {
2525
// Put the code you want to measure the time of here.
2626
}
2727
}

‎RxFirebase.podspec

+9-5
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ Pod::Spec.new do |s|
1818
# * Finally, don't worry about the indent, CocoaPods strips it!
1919

2020
s.description = <<-DESC
21-
This is a library to help you use RxSwift 2.5 or higher with Firebase 3.0 or higher.
21+
This is a library to help you use RxSwift 3.0 or higher with Firebase 3.0 or higher.
2222
DESC
2323

2424
s.homepage = "https://github.com/RxSwiftCommunity/RxFirebase"
25-
# s.screenshots = "www.example.com/screenshots_1", "www.example.com/screenshots_2"
2625
s.license = 'MIT'
2726
s.author = { "Maximilian Alexander" => "max@zinkpulse.com" }
2827
s.source = { :git => "https://github.com/RxSwiftCommunity/RxFirebase.git", :tag => s.version.to_s }
@@ -33,12 +32,17 @@ This is a library to help you use RxSwift 2.5 or higher with Firebase 3.0 or hig
3332
s.source_files = 'RxFirebase/Classes/**/*'
3433

3534
s.frameworks = 'UIKit'
36-
s.dependency 'RxSwift', '~> 2.5'
35+
s.dependency 'RxSwift', '~> 3.0'
3736
s.dependency 'Firebase/Database'
3837
s.dependency 'Firebase/Auth'
38+
s.dependency 'Firebase/Analytics'
39+
s.dependency 'Firebase/RemoteConfig'
40+
s.dependency 'Firebase/Storage'
41+
42+
s.framework = 'FirebaseCore', 'FirebaseAnalytics', 'FirebaseDatabase'
3943

4044
s.xcconfig = {
41-
"FRAMEWORK_SEARCH_PATHS" => "'$(PODS_ROOT)/FirebaseDatabase'"
45+
"FRAMEWORK_SEARCH_PATHS" => "'$(PODS_ROOT)/FirebaseDatabase/Frameworks'",
46+
4247
}
43-
s.vendored_frameworks = ["${PODS_ROOT}/FirebaseDatabase/Frameworks/FirebaseDatabase.framework"]
4448
end

0 commit comments

Comments
 (0)