From c03c850c3ac0f0127c258059d91945228588bbea Mon Sep 17 00:00:00 2001 From: Arnaud Dorgans Date: Sat, 7 Apr 2018 15:56:31 +0200 Subject: [PATCH] Project update --- .gitignore | 50 +++++--- .travis.yml | 4 +- Example/{RxFirebase => }/AppDelegate.swift | 0 .../Base.lproj/LaunchScreen.xib | 0 .../Base.lproj/Main.storyboard | 0 .../AppIcon.appiconset/Contents.json | 0 Example/{RxFirebase => }/Info.plist | 0 Example/{RxFirebase => }/ViewController.swift | 0 Example/Podfile => Podfile | 4 +- Example/Podfile.lock => Podfile.lock | 10 +- RxFirebase.podspec | 6 +- .../project.pbxproj | 18 +-- .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++ .../xcshareddata/xcschemes/Example.xcscheme | 115 ++++++++++++++++++ RxFirebase/Classes/.gitkeep | 0 {RxFirebase/Assets => Sources}/.gitkeep | 0 .../Firestore/FIRCollectionReference+Rx.swift | 0 .../Firestore/FIRDocumentReference+Rx.swift | 0 .../Firestore/FIRFirestore+Rx.swift | 0 .../Firestore/FIRQuery+Rx.swift | 0 .../Firestore/FIRWriteBatch+Rx.swift | 0 .../RemoteConfig/RemoteConfig+Rx.swift | 0 {Example/Tests => Tests}/Info.plist | 0 {Example/Tests => Tests}/Tests.swift | 0 _Pods.xcodeproj | 1 - 26 files changed, 176 insertions(+), 40 deletions(-) rename Example/{RxFirebase => }/AppDelegate.swift (100%) rename Example/{RxFirebase => }/Base.lproj/LaunchScreen.xib (100%) rename Example/{RxFirebase => }/Base.lproj/Main.storyboard (100%) rename Example/{RxFirebase => }/Images.xcassets/AppIcon.appiconset/Contents.json (100%) rename Example/{RxFirebase => }/Info.plist (100%) rename Example/{RxFirebase => }/ViewController.swift (100%) rename Example/Podfile => Podfile (57%) rename Example/Podfile.lock => Podfile.lock (94%) rename {Example/RxFirebase.xcodeproj => RxFirebase.xcodeproj}/project.pbxproj (97%) rename {Example/RxFirebase.xcodeproj => RxFirebase.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (100%) create mode 100644 RxFirebase.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 RxFirebase.xcodeproj/xcshareddata/xcschemes/Example.xcscheme delete mode 100644 RxFirebase/Classes/.gitkeep rename {RxFirebase/Assets => Sources}/.gitkeep (100%) rename {RxFirebase/Classes => Sources}/Firestore/FIRCollectionReference+Rx.swift (100%) rename {RxFirebase/Classes => Sources}/Firestore/FIRDocumentReference+Rx.swift (100%) rename {RxFirebase/Classes => Sources}/Firestore/FIRFirestore+Rx.swift (100%) rename {RxFirebase/Classes => Sources}/Firestore/FIRQuery+Rx.swift (100%) rename {RxFirebase/Classes => Sources}/Firestore/FIRWriteBatch+Rx.swift (100%) rename {RxFirebase/Classes => Sources}/RemoteConfig/RemoteConfig+Rx.swift (100%) rename {Example/Tests => Tests}/Info.plist (100%) rename {Example/Tests => Tests}/Tests.swift (100%) delete mode 120000 _Pods.xcodeproj diff --git a/.gitignore b/.gitignore index 6570405..df5ef5e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,7 @@ -# OS X -.DS_Store - # Xcode +# build/ +Build/ *.pbxuser !default.pbxuser *.mode1v3 @@ -11,30 +10,43 @@ build/ !default.mode2v3 *.perspectivev3 !default.perspectivev3 -xcuserdata/ +xcuserdata *.xccheckout -profile *.moved-aside DerivedData *.hmap *.ipa +*.xcuserstate +RxFirebase.xcworkspace -# Bundler -.bundle - -# Add this line if you want to avoid checking in source code from Carthage dependencies. -# Carthage/Checkouts - -Carthage/Build +timeline.xctimeline +# CocoaPods +# # We recommend against adding the Pods directory to your .gitignore. However # you should judge for yourself, the pros and cons are mentioned at: # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control -# -# Note: if you ignore the Pods directory, make sure to uncomment -# `pod install` in .travis.yml # -# Pods/ -/Example/RxFirebase.xcworkspace -/Example/Pods -/Example/RxFirebase.xcodeproj/xcshareddata +Pods + +# Carthage +# +# Add this line if you want to avoid checking in source code from Carthage dependencies. +Carthage/Checkouts +Carthage/Build + + +# Various + +.DS_Store + + +# Linux + +*.swp +*.swo + +# Swift Package Manager + +.build/ +Packages/ diff --git a/.travis.yml b/.travis.yml index bf410e7..190f74a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,10 @@ language: swift osx_image: xcode9.2 - before_install: - gem install cocoapods script: + - pod repo update && pod update - set -o pipefail - - xcodebuild -workspace Example/RxFirebase.xcworkspace -scheme Example -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty -c + - xcodebuild -workspace RxFirebase.xcworkspace -scheme Example -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty -c - pod lib lint RxFirebase.podspec diff --git a/Example/RxFirebase/AppDelegate.swift b/Example/AppDelegate.swift similarity index 100% rename from Example/RxFirebase/AppDelegate.swift rename to Example/AppDelegate.swift diff --git a/Example/RxFirebase/Base.lproj/LaunchScreen.xib b/Example/Base.lproj/LaunchScreen.xib similarity index 100% rename from Example/RxFirebase/Base.lproj/LaunchScreen.xib rename to Example/Base.lproj/LaunchScreen.xib diff --git a/Example/RxFirebase/Base.lproj/Main.storyboard b/Example/Base.lproj/Main.storyboard similarity index 100% rename from Example/RxFirebase/Base.lproj/Main.storyboard rename to Example/Base.lproj/Main.storyboard diff --git a/Example/RxFirebase/Images.xcassets/AppIcon.appiconset/Contents.json b/Example/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Example/RxFirebase/Images.xcassets/AppIcon.appiconset/Contents.json rename to Example/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/Example/RxFirebase/Info.plist b/Example/Info.plist similarity index 100% rename from Example/RxFirebase/Info.plist rename to Example/Info.plist diff --git a/Example/RxFirebase/ViewController.swift b/Example/ViewController.swift similarity index 100% rename from Example/RxFirebase/ViewController.swift rename to Example/ViewController.swift diff --git a/Example/Podfile b/Podfile similarity index 57% rename from Example/Podfile rename to Podfile index 17af653..82f755e 100644 --- a/Example/Podfile +++ b/Podfile @@ -1,8 +1,8 @@ use_frameworks! target 'RxFirebase_Example' do - pod 'RxFirebase/Firestore', :path => '../' - pod 'RxFirebase/RemoteConfig', :path => '../' + pod 'RxFirebase/Firestore', :path => './' + pod 'RxFirebase/RemoteConfig', :path => './' target 'RxFirebase_Tests' do inherit! :search_paths diff --git a/Example/Podfile.lock b/Podfile.lock similarity index 94% rename from Example/Podfile.lock rename to Podfile.lock index 1fd2990..0894474 100644 --- a/Example/Podfile.lock +++ b/Podfile.lock @@ -74,8 +74,8 @@ PODS: - RxSwift (4.1.2) DEPENDENCIES: - - RxFirebase/Firestore (from `../`) - - RxFirebase/RemoteConfig (from `../`) + - RxFirebase/Firestore (from `./`) + - RxFirebase/RemoteConfig (from `./`) SPEC REPOS: https://github.com/CocoaPods/Specs.git: @@ -99,7 +99,7 @@ SPEC REPOS: EXTERNAL SOURCES: RxFirebase: - :path: "../" + :path: "./" SPEC CHECKSUMS: BoringSSL: 32764dbaf5f5888cf51fbaa172a010126b41bcd4 @@ -118,9 +118,9 @@ SPEC CHECKSUMS: nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3 Protobuf: 8a9838fba8dae3389230e1b7f8c104aa32389c03 RxCocoa: d88ba0f1f6abf040011a9eb4b539324fc426843a - RxFirebase: b583b3aae1a8d5a51e97e0790c07d00ccb6cb3e1 + RxFirebase: c1e21c544d201d9aa460b8871803573f85d2a6e5 RxSwift: e49536837d9901277638493ea537394d4b55f570 -PODFILE CHECKSUM: fa5e35e55f371ddc9fefb67e0cedcf9531f56e4b +PODFILE CHECKSUM: 09bed75ac8068bae654275c266aee2f118ccc9da COCOAPODS: 1.5.0 diff --git a/RxFirebase.podspec b/RxFirebase.podspec index 0580c03..92185b3 100644 --- a/RxFirebase.podspec +++ b/RxFirebase.podspec @@ -37,13 +37,11 @@ Including for now FirebaseCore s.dependency 'FirebaseCore', '~> 4' s.subspec 'Firestore' do |firestore| - firestore.source_files = 'RxFirebase/Classes/Firestore/**/*' + firestore.source_files = 'Sources/Firestore/**/*' firestore.dependency 'FirebaseFirestore', '~> 0' end s.subspec 'RemoteConfig' do |remote| - remote.source_files = 'RxFirebase/Classes/RemoteConfig/**/*' + remote.source_files = 'Sources/RemoteConfig/**/*' remote.dependency 'FirebaseRemoteConfig', '~> 2' end - - end diff --git a/Example/RxFirebase.xcodeproj/project.pbxproj b/RxFirebase.xcodeproj/project.pbxproj similarity index 97% rename from Example/RxFirebase.xcodeproj/project.pbxproj rename to RxFirebase.xcodeproj/project.pbxproj index 1694b2a..4d05a64 100644 --- a/Example/RxFirebase.xcodeproj/project.pbxproj +++ b/RxFirebase.xcodeproj/project.pbxproj @@ -41,10 +41,10 @@ 607FACEB1AFB9204008FA782 /* Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tests.swift; sourceTree = ""; }; 6BF2ABCDD7184B5EE57E1330 /* Pods_RxFirebase_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RxFirebase_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 89BF759F7539983B6504973B /* Pods-RxFirebase_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxFirebase_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-RxFirebase_Example/Pods-RxFirebase_Example.release.xcconfig"; sourceTree = ""; }; - 8D1F218AB871F5DC9A8661D7 /* RxFirebase.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = RxFirebase.podspec; path = ../RxFirebase.podspec; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 8D1F218AB871F5DC9A8661D7 /* RxFirebase.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = RxFirebase.podspec; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 9DE96A3C1B64D32C3F85F23E /* Pods-RxFirebase_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxFirebase_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RxFirebase_Tests/Pods-RxFirebase_Tests.release.xcconfig"; sourceTree = ""; }; - A5ECD0739495588E75E2ACBB /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = ""; }; - B2E93982D2C0A28AF5F580D4 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = ""; }; + A5ECD0739495588E75E2ACBB /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; + B2E93982D2C0A28AF5F580D4 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = LICENSE; sourceTree = ""; }; C6A32035D43AEC5C5947CB67 /* Pods_RxFirebase_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RxFirebase_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D519C2B489975AD7FFBC1420 /* Pods-RxFirebase_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxFirebase_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RxFirebase_Tests/Pods-RxFirebase_Tests.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -121,7 +121,7 @@ 607FACD31AFB9204008FA782 /* Supporting Files */, ); name = "Example for RxFirebase"; - path = RxFirebase; + path = Example; sourceTree = ""; }; 607FACD31AFB9204008FA782 /* Supporting Files */ = { @@ -207,7 +207,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0830; - LastUpgradeCheck = 0830; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = CocoaPods; TargetAttributes = { 607FACCF1AFB9204008FA782 = { @@ -397,12 +397,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -450,12 +452,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -489,7 +493,7 @@ baseConfigurationReference = 1CD820DF94FDAAC9440B2B81 /* Pods-RxFirebase_Example.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - INFOPLIST_FILE = RxFirebase/Info.plist; + INFOPLIST_FILE = Example/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; @@ -504,7 +508,7 @@ baseConfigurationReference = 89BF759F7539983B6504973B /* Pods-RxFirebase_Example.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - INFOPLIST_FILE = RxFirebase/Info.plist; + INFOPLIST_FILE = Example/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; diff --git a/Example/RxFirebase.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/RxFirebase.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from Example/RxFirebase.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to RxFirebase.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/RxFirebase.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/RxFirebase.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/RxFirebase.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/RxFirebase.xcodeproj/xcshareddata/xcschemes/Example.xcscheme b/RxFirebase.xcodeproj/xcshareddata/xcschemes/Example.xcscheme new file mode 100644 index 0000000..1bbd9c4 --- /dev/null +++ b/RxFirebase.xcodeproj/xcshareddata/xcschemes/Example.xcscheme @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/RxFirebase/Classes/.gitkeep b/RxFirebase/Classes/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/RxFirebase/Assets/.gitkeep b/Sources/.gitkeep similarity index 100% rename from RxFirebase/Assets/.gitkeep rename to Sources/.gitkeep diff --git a/RxFirebase/Classes/Firestore/FIRCollectionReference+Rx.swift b/Sources/Firestore/FIRCollectionReference+Rx.swift similarity index 100% rename from RxFirebase/Classes/Firestore/FIRCollectionReference+Rx.swift rename to Sources/Firestore/FIRCollectionReference+Rx.swift diff --git a/RxFirebase/Classes/Firestore/FIRDocumentReference+Rx.swift b/Sources/Firestore/FIRDocumentReference+Rx.swift similarity index 100% rename from RxFirebase/Classes/Firestore/FIRDocumentReference+Rx.swift rename to Sources/Firestore/FIRDocumentReference+Rx.swift diff --git a/RxFirebase/Classes/Firestore/FIRFirestore+Rx.swift b/Sources/Firestore/FIRFirestore+Rx.swift similarity index 100% rename from RxFirebase/Classes/Firestore/FIRFirestore+Rx.swift rename to Sources/Firestore/FIRFirestore+Rx.swift diff --git a/RxFirebase/Classes/Firestore/FIRQuery+Rx.swift b/Sources/Firestore/FIRQuery+Rx.swift similarity index 100% rename from RxFirebase/Classes/Firestore/FIRQuery+Rx.swift rename to Sources/Firestore/FIRQuery+Rx.swift diff --git a/RxFirebase/Classes/Firestore/FIRWriteBatch+Rx.swift b/Sources/Firestore/FIRWriteBatch+Rx.swift similarity index 100% rename from RxFirebase/Classes/Firestore/FIRWriteBatch+Rx.swift rename to Sources/Firestore/FIRWriteBatch+Rx.swift diff --git a/RxFirebase/Classes/RemoteConfig/RemoteConfig+Rx.swift b/Sources/RemoteConfig/RemoteConfig+Rx.swift similarity index 100% rename from RxFirebase/Classes/RemoteConfig/RemoteConfig+Rx.swift rename to Sources/RemoteConfig/RemoteConfig+Rx.swift diff --git a/Example/Tests/Info.plist b/Tests/Info.plist similarity index 100% rename from Example/Tests/Info.plist rename to Tests/Info.plist diff --git a/Example/Tests/Tests.swift b/Tests/Tests.swift similarity index 100% rename from Example/Tests/Tests.swift rename to Tests/Tests.swift diff --git a/_Pods.xcodeproj b/_Pods.xcodeproj deleted file mode 120000 index 3c5a8e7..0000000 --- a/_Pods.xcodeproj +++ /dev/null @@ -1 +0,0 @@ -Example/Pods/Pods.xcodeproj \ No newline at end of file