Skip to content

Commit

Permalink
Merge pull request RxSwiftCommunity#12 from RxSwiftCommunity/feature/…
Browse files Browse the repository at this point in the history
…swift-4.2

Feature/swift 4.2
  • Loading branch information
arnauddorgans authored Feb 17, 2019
2 parents 752af7f + c69f1d4 commit 235d263
Showing 18 changed files with 409 additions and 422 deletions.
21 changes: 21 additions & 0 deletions .scripts/pod_lib.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/bin/bash
for pod in $(find . -name "*.podspec" -type f -exec basename {} ';' );do
push=0
if [[ $1 == 'push' ]]; then
push=1
fi
if [[ $pod == 'RxFirebase.podspec' ]]; then
continue
fi
command="$pod --allow-warnings"
if [[ $push == 0 ]]; then
command="pod lib lint $command"
else
command="pod trunk push $command"
fi
echo $command
$command ; result=$?
if [[ $result != 0 ]]; then
exit $result
fi
done
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0
4.2
18 changes: 9 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
language: swift
osx_image: xcode9.2

install: true

osx_image: xcode10.1
install:
script:
# https://github.com/travis-ci/travis-ci/issues/4190
# Output something every 9 minutes (540 seconds) or Travis kills the job
- while sleep 540; do echo "=====[ $SECONDS seconds still running ]====="; done &
- sh .scripts/pod_lib.sh
# Kill the sleep loop
- kill %1
before_install:
- gem install cocoapods
- pod --version
script:
- pod repo update && pod update
- set -o pipefail
- xcodebuild -workspace RxFirebase.xcworkspace -scheme Example -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty -c
- travis_wait 30 pod lib lint RxFirebase.podspec
2 changes: 1 addition & 1 deletion Example/AppDelegate.swift
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?


func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
return true
}
20 changes: 7 additions & 13 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
platform :ios, '8.0'
use_frameworks!

target 'RxFirebase_Example' do
pod 'RxFirebase/Firestore', :path => './'
pod 'RxFirebase/RemoteConfig', :path => './'
pod 'RxFirebase/Database', :path => './'
pod 'RxFirebase/Storage', :path => './'
pod 'RxFirebase/Auth', :path => './'
pod 'RxFirebase/Functions', :path => './'

target 'RxFirebase_Tests' do
inherit! :search_paths

end
platform :ios, '8.0'
pod 'RxFirebaseStorage', :path => './'
pod 'RxFirebaseFirestore', :path => './'
pod 'RxFirebaseRemoteConfig', :path => './'
pod 'RxFirebaseDatabase', :path => './'
pod 'RxFirebaseFunctions', :path => './'
pod 'RxFirebaseAuthentication', :path => './'
end

187 changes: 102 additions & 85 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,53 +1,55 @@
PODS:
- BoringSSL (10.0.6):
- BoringSSL/Implementation (= 10.0.6)
- BoringSSL/Interface (= 10.0.6)
- BoringSSL/Implementation (10.0.6):
- BoringSSL/Interface (= 10.0.6)
- BoringSSL/Interface (10.0.6)
- BoringSSL-GRPC (0.0.2):
- BoringSSL-GRPC/Implementation (= 0.0.2)
- BoringSSL-GRPC/Interface (= 0.0.2)
- BoringSSL-GRPC/Implementation (0.0.2):
- BoringSSL-GRPC/Interface (= 0.0.2)
- BoringSSL-GRPC/Interface (0.0.2)
- FirebaseABTesting (2.0.0):
- FirebaseCore (~> 5.0)
- Protobuf (~> 3.5)
- FirebaseAnalytics (5.3.0):
- FirebaseCore (~> 5.1)
- FirebaseInstanceID (~> 3.3)
- GoogleAppMeasurement (~> 5.3)
- FirebaseAnalytics (5.5.0):
- FirebaseCore (~> 5.2)
- FirebaseInstanceID (~> 3.4)
- GoogleAppMeasurement (= 5.5.0)
- GoogleUtilities/AppDelegateSwizzler (~> 5.2)
- GoogleUtilities/MethodSwizzler (~> 5.2)
- GoogleUtilities/Network (~> 5.2)
- "GoogleUtilities/NSData+zlib (~> 5.2)"
- nanopb (~> 0.3)
- FirebaseAuth (5.0.5):
- FirebaseAuth (5.3.0):
- FirebaseAuthInterop (~> 1.0)
- FirebaseCore (~> 5.1)
- FirebaseCore (~> 5.2)
- GoogleUtilities/Environment (~> 5.2)
- GTMSessionFetcher/Core (~> 1.1)
- FirebaseAuthInterop (1.0.0)
- FirebaseCore (5.1.8):
- FirebaseCore (5.2.0):
- GoogleUtilities/Logger (~> 5.2)
- FirebaseDatabase (5.0.3):
- FirebaseCore (~> 5.0)
- FirebaseDatabase (5.1.0):
- FirebaseAuthInterop (~> 1.0)
- FirebaseCore (~> 5.2)
- leveldb-library (~> 1.18)
- FirebaseFirestore (0.15.0):
- FirebaseFirestore (1.0.0):
- FirebaseAuthInterop (~> 1.0)
- FirebaseCore (~> 5.1)
- FirebaseFirestore/abseil-cpp (= 0.15.0)
- "gRPC-C++ (~> 0.0.3)"
- FirebaseCore (~> 5.2)
- FirebaseFirestore/abseil-cpp (= 1.0.0)
- "gRPC-C++ (= 0.0.6)"
- leveldb-library (~> 1.20)
- nanopb (~> 0.3.8)
- nanopb (~> 0.3.901)
- Protobuf (~> 3.1)
- FirebaseFirestore/abseil-cpp (0.15.0):
- FirebaseFirestore/abseil-cpp (1.0.0):
- FirebaseAuthInterop (~> 1.0)
- FirebaseCore (~> 5.1)
- "gRPC-C++ (~> 0.0.3)"
- FirebaseCore (~> 5.2)
- "gRPC-C++ (= 0.0.6)"
- leveldb-library (~> 1.20)
- nanopb (~> 0.3.8)
- nanopb (~> 0.3.901)
- Protobuf (~> 3.1)
- FirebaseFunctions (2.1.1):
- FirebaseCore (~> 5.0)
- FirebaseFunctions (2.2.0):
- FirebaseAuthInterop (~> 1.0)
- FirebaseCore (~> 5.2)
- GTMSessionFetcher/Core (~> 1.1)
- FirebaseInstanceID (3.3.0):
- FirebaseCore (~> 5.1)
- FirebaseInstanceID (3.4.0):
- FirebaseCore (~> 5.2)
- GoogleUtilities/Environment (~> 5.3)
- GoogleUtilities/UserDefaults (~> 5.3)
- FirebaseRemoteConfig (3.1.0):
@@ -58,50 +60,50 @@ PODS:
- GoogleUtilities/Environment (~> 5.2)
- "GoogleUtilities/NSData+zlib (~> 5.2)"
- Protobuf (~> 3.5)
- FirebaseStorage (3.0.3):
- FirebaseStorage (3.1.0):
- FirebaseAuthInterop (~> 1.0)
- FirebaseCore (~> 5.1)
- FirebaseCore (~> 5.2)
- GTMSessionFetcher/Core (~> 1.1)
- GoogleAppMeasurement (5.3.0):
- GoogleAppMeasurement (5.5.0):
- GoogleUtilities/AppDelegateSwizzler (~> 5.2)
- GoogleUtilities/MethodSwizzler (~> 5.2)
- GoogleUtilities/Network (~> 5.2)
- "GoogleUtilities/NSData+zlib (~> 5.2)"
- nanopb (~> 0.3)
- GoogleUtilities/AppDelegateSwizzler (5.3.6):
- GoogleUtilities/AppDelegateSwizzler (5.3.7):
- GoogleUtilities/Environment
- GoogleUtilities/Logger
- GoogleUtilities/Network
- GoogleUtilities/Environment (5.3.6)
- GoogleUtilities/Logger (5.3.6):
- GoogleUtilities/Environment (5.3.7)
- GoogleUtilities/Logger (5.3.7):
- GoogleUtilities/Environment
- GoogleUtilities/MethodSwizzler (5.3.6):
- GoogleUtilities/MethodSwizzler (5.3.7):
- GoogleUtilities/Logger
- GoogleUtilities/Network (5.3.6):
- GoogleUtilities/Network (5.3.7):
- GoogleUtilities/Logger
- "GoogleUtilities/NSData+zlib"
- GoogleUtilities/Reachability
- "GoogleUtilities/NSData+zlib (5.3.6)"
- GoogleUtilities/Reachability (5.3.6):
- "GoogleUtilities/NSData+zlib (5.3.7)"
- GoogleUtilities/Reachability (5.3.7):
- GoogleUtilities/Logger
- GoogleUtilities/UserDefaults (5.3.6):
- GoogleUtilities/UserDefaults (5.3.7):
- GoogleUtilities/Logger
- "gRPC-C++ (0.0.5)":
- "gRPC-C++/Implementation (= 0.0.5)"
- "gRPC-C++/Interface (= 0.0.5)"
- "gRPC-C++/Implementation (0.0.5)":
- "gRPC-C++/Interface (= 0.0.5)"
- gRPC-Core (= 1.14.0)
- "gRPC-C++ (0.0.6)":
- "gRPC-C++/Implementation (= 0.0.6)"
- "gRPC-C++/Interface (= 0.0.6)"
- "gRPC-C++/Implementation (0.0.6)":
- "gRPC-C++/Interface (= 0.0.6)"
- gRPC-Core (= 1.17.0)
- nanopb (~> 0.3)
- "gRPC-C++/Interface (0.0.5)"
- gRPC-Core (1.14.0):
- gRPC-Core/Implementation (= 1.14.0)
- gRPC-Core/Interface (= 1.14.0)
- gRPC-Core/Implementation (1.14.0):
- BoringSSL (~> 10.0)
- gRPC-Core/Interface (= 1.14.0)
- "gRPC-C++/Interface (0.0.6)"
- gRPC-Core (1.17.0):
- gRPC-Core/Implementation (= 1.17.0)
- gRPC-Core/Interface (= 1.17.0)
- gRPC-Core/Implementation (1.17.0):
- BoringSSL-GRPC (= 0.0.2)
- gRPC-Core/Interface (= 1.17.0)
- nanopb (~> 0.3)
- gRPC-Core/Interface (1.14.0)
- gRPC-Core/Interface (1.17.0)
- GTMSessionFetcher/Core (1.2.1)
- leveldb-library (1.20)
- nanopb (0.3.901):
@@ -113,45 +115,45 @@ PODS:
- RxAtomic (4.4.0)
- RxCocoa (4.4.0):
- RxSwift (~> 4.0)
- RxFirebase/Auth (0.2.6):
- RxFirebaseAuthentication (0.3.1):
- FirebaseAuth (~> 5)
- FirebaseCore (~> 5.1)
- FirebaseCore (~> 5)
- RxCocoa (~> 4)
- RxSwift (~> 4)
- RxFirebase/Database (0.2.6):
- RxFirebaseDatabase (0.3.1):
- FirebaseDatabase (~> 5)
- RxCocoa (~> 4)
- RxSwift (~> 4)
- RxFirebase/Firestore (0.2.6):
- FirebaseFirestore (~> 0.15)
- RxFirebaseFirestore (0.3.1):
- FirebaseFirestore (~> 1)
- RxCocoa (~> 4)
- RxSwift (~> 4)
- RxFirebase/Functions (0.2.6):
- RxFirebaseFunctions (0.3.1):
- FirebaseFunctions (~> 2)
- RxCocoa (~> 4)
- RxSwift (~> 4)
- RxFirebase/RemoteConfig (0.2.6):
- RxFirebaseRemoteConfig (0.3.1):
- FirebaseRemoteConfig (~> 3)
- RxCocoa (~> 4)
- RxSwift (~> 4)
- RxFirebase/Storage (0.2.6):
- RxFirebaseStorage (0.3.1):
- FirebaseStorage (~> 3)
- RxCocoa (~> 4)
- RxSwift (~> 4)
- RxSwift (4.4.0):
- RxAtomic (~> 4.4)

DEPENDENCIES:
- RxFirebase/Auth (from `./`)
- RxFirebase/Database (from `./`)
- RxFirebase/Firestore (from `./`)
- RxFirebase/Functions (from `./`)
- RxFirebase/RemoteConfig (from `./`)
- RxFirebase/Storage (from `./`)
- RxFirebaseAuthentication (from `./`)
- RxFirebaseDatabase (from `./`)
- RxFirebaseFirestore (from `./`)
- RxFirebaseFunctions (from `./`)
- RxFirebaseRemoteConfig (from `./`)
- RxFirebaseStorage (from `./`)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- BoringSSL
- BoringSSL-GRPC
- FirebaseABTesting
- FirebaseAnalytics
- FirebaseAuth
@@ -176,35 +178,50 @@ SPEC REPOS:
- RxSwift

EXTERNAL SOURCES:
RxFirebase:
RxFirebaseAuthentication:
:path: "./"
RxFirebaseDatabase:
:path: "./"
RxFirebaseFirestore:
:path: "./"
RxFirebaseFunctions:
:path: "./"
RxFirebaseRemoteConfig:
:path: "./"
RxFirebaseStorage:
:path: "./"

SPEC CHECKSUMS:
BoringSSL: e10f92a27043805c01071fe815a5cd98ae8212e7
BoringSSL-GRPC: 2a230d9cd93e7ce39916044f645cebb31f37dde6
FirebaseABTesting: 1f50b8d50f5e3469eea54e7463a7b7fe221d1f5e
FirebaseAnalytics: 63202d2665de4e6adcbdce189135255d8b5962ba
FirebaseAuth: 9299ab178271bec7426967b05b2718bb6fc31f17
FirebaseAnalytics: d35d47c03c50c73c14a7fd31463c5775843e78a9
FirebaseAuth: c9b3ff063c223d2841d97240af547ce511bce19a
FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc
FirebaseCore: fba2bfaa691c49028309b92e4dd37cc4b5512fbe
FirebaseDatabase: e2bcbc106adc4b11a2da3ec2eb63c0c4a44f2f54
FirebaseFirestore: 9e9411f13a0aba72d4f631899611d09e43734c48
FirebaseFunctions: 6c03d7c5d62520be4678dc3fb7957654aab82b4f
FirebaseInstanceID: e2fa4cb35ef5558c200f7f0ad8a53e212215f93e
FirebaseCore: ea2d1816723ef21492b8e9113303e1350db5e08c
FirebaseDatabase: 23acb0c53cd4d4070a427b60100b2e4aaa97c45d
FirebaseFirestore: 6f2b93b4f7bb8416628142763c91ccc00fa04c86
FirebaseFunctions: f35dd01ba4cfd036c1c521b3ed99851d7ec08c70
FirebaseInstanceID: 97ea7a5dca9afd72c79bfcdddb7a44aa1cbb42a1
FirebaseRemoteConfig: 7e11c65f0769c09bff6947997c209515058c5318
FirebaseStorage: 3d22c041370593e639fba013d1eb698a8dae2881
GoogleAppMeasurement: 5029d78f2b438bd30ffb44e6c558b57c21622727
GoogleUtilities: 95996bea7c7d9b8fb811b7507669a4a8762f80c7
"gRPC-C++": 19eec1ffd34de29453f5fab5b4697ad0f240ad51
gRPC-Core: f4836515817c0eb479aeeb9cc27c91c4ba62a9f6
FirebaseStorage: 29075f874c2b3cf61e5221a62c4ceefc809e5412
GoogleAppMeasurement: 621f3bc6211d5ba548debe01fafad30cf5ab6859
GoogleUtilities: 111a012f4c3a29c9e7c954c082fafd6ee3c999c0
"gRPC-C++": e76441995900ac90e9bd98644ab4733f12521edf
gRPC-Core: 4028031ed2c5267cca0d846c876d8046b1ecb9b6
GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca
leveldb-library: 08cba283675b7ed2d99629a4bc5fd052cd2bb6a5
nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48
Protobuf: 1eb9700044745f00181c136ef21b8ff3ad5a0fd5
RxAtomic: eacf60db868c96bfd63320e28619fe29c179656f
RxCocoa: df63ebf7b9a70d6b4eeea407ed5dd4efc8979749
RxFirebase: 60c063fa68dac3b9dc6a72a80236d55db530a970
RxFirebaseAuthentication: ad450b7a43150c90468f2241bd148361ed65bd40
RxFirebaseDatabase: 6cf592cc2ac705e6e9f51c81f78c8658cd2f5cff
RxFirebaseFirestore: cedbab269fb62d157ecadebbaa84c11fd6123200
RxFirebaseFunctions: 566243d404ee059da9045a1d14821ba339ab78a7
RxFirebaseRemoteConfig: 68c0636879cfd45ebf39be588a8d6c215b099a96
RxFirebaseStorage: a6612ade3e2d81491a8e804121cfe5e94c0c2469
RxSwift: 5976ecd04fc2fefd648827c23de5e11157faa973

PODFILE CHECKSUM: db4e0a593103ec732f32da4bf8e8163883660ceb
PODFILE CHECKSUM: cb6cd0cb602df0faa608611790523795175feaeb

COCOAPODS: 1.6.0.beta.2
COCOAPODS: 1.6.0
Loading

0 comments on commit 235d263

Please sign in to comment.