Skip to content

Commit

Permalink
Project update
Browse files Browse the repository at this point in the history
  • Loading branch information
Arnaud Dorgans committed Apr 7, 2018
1 parent 866b9a3 commit c03c850
Show file tree
Hide file tree
Showing 26 changed files with 176 additions and 40 deletions.
50 changes: 31 additions & 19 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# OS X
.DS_Store

# Xcode
#
build/
Build/
*.pbxuser
!default.pbxuser
*.mode1v3
Expand All @@ -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/
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions Example/Podfile → Podfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions Example/Podfile.lock → Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -99,7 +99,7 @@ SPEC REPOS:

EXTERNAL SOURCES:
RxFirebase:
:path: "../"
:path: "./"

SPEC CHECKSUMS:
BoringSSL: 32764dbaf5f5888cf51fbaa172a010126b41bcd4
Expand All @@ -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
6 changes: 2 additions & 4 deletions RxFirebase.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
607FACEB1AFB9204008FA782 /* Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tests.swift; sourceTree = "<group>"; };
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 = "<group>"; };
8D1F218AB871F5DC9A8661D7 /* RxFirebase.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = RxFirebase.podspec; path = ../RxFirebase.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
8D1F218AB871F5DC9A8661D7 /* RxFirebase.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = RxFirebase.podspec; sourceTree = "<group>"; 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 = "<group>"; };
A5ECD0739495588E75E2ACBB /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
B2E93982D2C0A28AF5F580D4 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
A5ECD0739495588E75E2ACBB /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
B2E93982D2C0A28AF5F580D4 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
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 = "<group>"; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -121,7 +121,7 @@
607FACD31AFB9204008FA782 /* Supporting Files */,
);
name = "Example for RxFirebase";
path = RxFirebase;
path = Example;
sourceTree = "<group>";
};
607FACD31AFB9204008FA782 /* Supporting Files */ = {
Expand Down Expand Up @@ -207,7 +207,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0830;
LastUpgradeCheck = 0830;
LastUpgradeCheck = 0930;
ORGANIZATIONNAME = CocoaPods;
TargetAttributes = {
607FACCF1AFB9204008FA782 = {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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)";
Expand All @@ -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)";
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
115 changes: 115 additions & 0 deletions RxFirebase.xcodeproj/xcshareddata/xcschemes/Example.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "607FACCF1AFB9204008FA782"
BuildableName = "RxFirebase_Example.app"
BlueprintName = "RxFirebase_Example"
ReferencedContainer = "container:RxFirebase.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "607FACE41AFB9204008FA782"
BuildableName = "RxFirebase_Tests.xctest"
BlueprintName = "RxFirebase_Tests"
ReferencedContainer = "container:RxFirebase.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "607FACE41AFB9204008FA782"
BuildableName = "RxFirebase_Tests.xctest"
BlueprintName = "RxFirebase_Tests"
ReferencedContainer = "container:RxFirebase.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "607FACCF1AFB9204008FA782"
BuildableName = "RxFirebase_Example.app"
BlueprintName = "RxFirebase_Example"
ReferencedContainer = "container:RxFirebase.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "607FACCF1AFB9204008FA782"
BuildableName = "RxFirebase_Example.app"
BlueprintName = "RxFirebase_Example"
ReferencedContainer = "container:RxFirebase.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "607FACCF1AFB9204008FA782"
BuildableName = "RxFirebase_Example.app"
BlueprintName = "RxFirebase_Example"
ReferencedContainer = "container:RxFirebase.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Empty file removed RxFirebase/Classes/.gitkeep
Empty file.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion _Pods.xcodeproj

This file was deleted.

0 comments on commit c03c850

Please sign in to comment.