Skip to content

Commit

Permalink
Merge branch 'release/1.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@MrAsterisco
MrAsterisco committed Apr 25, 2020
2 parents 5475f36 + 2074d0b commit eba7d52
Show file tree
Hide file tree
Showing 46 changed files with 1,420 additions and 212 deletions.
4 changes: 2 additions & 2 deletions Example/Podfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ PODS:
- RxCocoa (5.1.1):
- RxRelay (~> 5)
- RxSwift (~> 5)
- RxFireAuth (1.0.0):
- RxFireAuth (1.2.0):
- Firebase/Auth (~> 6.5)
- JWTDecode (~> 2.4)
- RxCocoa (~> 5)
Expand Down Expand Up @@ -98,7 +98,7 @@ SPEC CHECKSUMS:
JWTDecode: 4bd4da0cdf0f8154fd467fa48499f34ec057fb88
nanopb: 18003b5e52dab79db540fe93fe9579f399bd1ccd
RxCocoa: 32065309a38d29b5b0db858819b5bf9ef038b601
RxFireAuth: 2fdfec4d2f2214019924986354875a53cae81d52
RxFireAuth: d2ecd67892ffc2112d9160b6135a85e75bffaf81
RxRelay: d77f7d771495f43c556cbc43eebd1bb54d01e8e9
RxSwift: 81470a2074fa8780320ea5fe4102807cb7118178

Expand Down
13 changes: 11 additions & 2 deletions Example/RxFireAuth.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
66774B58D2973FB029D59734 /* Pods_RxFireAuth_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E44A537D04B4AD25BCA4E8B /* Pods_RxFireAuth_Tests.framework */; };
C4EDED199E5D6FAD9D6BD92C /* Pods_RxFireAuth_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93D1018E205EC59B01C0D604 /* Pods_RxFireAuth_Example.framework */; };
FA3AA21A244B52F400363BCE /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = FA3AA219244B52F400363BCE /* GoogleService-Info.plist */; };
FAC78B532454B46800D2F391 /* AuthenticationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FAC78B522454B46800D2F391 /* AuthenticationServices.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -49,13 +50,16 @@
EE4839DFF9311DA585A57B1D /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
F2D9CFE62573321CD826326E /* Pods-RxFireAuth_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxFireAuth_Example.debug.xcconfig"; path = "Target Support Files/Pods-RxFireAuth_Example/Pods-RxFireAuth_Example.debug.xcconfig"; sourceTree = "<group>"; };
FA3AA219244B52F400363BCE /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
FAC78B512454B3F400D2F391 /* RxFireAuth_Example.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RxFireAuth_Example.entitlements; sourceTree = "<group>"; };
FAC78B522454B46800D2F391 /* AuthenticationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AuthenticationServices.framework; path = System/Library/Frameworks/AuthenticationServices.framework; sourceTree = SDKROOT; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
607FACCD1AFB9204008FA782 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
FAC78B532454B46800D2F391 /* AuthenticationServices.framework in Frameworks */,
C4EDED199E5D6FAD9D6BD92C /* Pods_RxFireAuth_Example.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -74,6 +78,7 @@
0F5A69D35E045B4D7E2C8E19 /* Frameworks */ = {
isa = PBXGroup;
children = (
FAC78B522454B46800D2F391 /* AuthenticationServices.framework */,
93D1018E205EC59B01C0D604 /* Pods_RxFireAuth_Example.framework */,
6E44A537D04B4AD25BCA4E8B /* Pods_RxFireAuth_Tests.framework */,
);
Expand All @@ -83,6 +88,7 @@
607FACC71AFB9204008FA782 = {
isa = PBXGroup;
children = (
FAC78B512454B3F400D2F391 /* RxFireAuth_Example.entitlements */,
607FACF51AFB993E008FA782 /* Podspec Metadata */,
607FACD21AFB9204008FA782 /* Example for RxFireAuth */,
607FACE81AFB9204008FA782 /* Tests */,
Expand Down Expand Up @@ -215,6 +221,7 @@
TargetAttributes = {
607FACCF1AFB9204008FA782 = {
CreatedOnToolsVersion = 6.3.1;
DevelopmentTeam = 43C9YP2S4Y;
LastSwiftMigration = 1140;
};
607FACE41AFB9204008FA782 = {
Expand Down Expand Up @@ -500,7 +507,8 @@
baseConfigurationReference = F2D9CFE62573321CD826326E /* Pods-RxFireAuth_Example.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = "";
CODE_SIGN_ENTITLEMENTS = RxFireAuth_Example.entitlements;
DEVELOPMENT_TEAM = 43C9YP2S4Y;
INFOPLIST_FILE = RxFireAuth/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand All @@ -517,7 +525,8 @@
baseConfigurationReference = E5F34834E8AAEBED9D6B955D /* Pods-RxFireAuth_Example.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = "";
CODE_SIGN_ENTITLEMENTS = RxFireAuth_Example.entitlements;
DEVELOPMENT_TEAM = 43C9YP2S4Y;
INFOPLIST_FILE = RxFireAuth/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand Down
32 changes: 29 additions & 3 deletions Example/RxFireAuth/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,35 @@
</constraints>
</tableViewCellContentView>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="aRd-y8-EFj">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="rKQ-l3-Jgl">
<rect key="frame" x="0.0" y="683" width="375" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="rKQ-l3-Jgl" id="STd-4d-Ith">
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="D6D-eY-1kT" customClass="ASAuthorizationAppleIDButton">
<rect key="frame" x="20" y="0.0" width="335" height="44"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="dbQ-bs-VlO"/>
</constraints>
<connections>
<action selector="signInWithAppleWithSender:" destination="ctm-QS-frk" eventType="touchUpInside" id="dPI-DD-3oC"/>
</connections>
</view>
</subviews>
<constraints>
<constraint firstItem="D6D-eY-1kT" firstAttribute="top" secondItem="STd-4d-Ith" secondAttribute="top" id="Am2-6a-OCk"/>
<constraint firstAttribute="bottom" secondItem="D6D-eY-1kT" secondAttribute="bottom" id="Drd-Z0-fV9"/>
<constraint firstItem="D6D-eY-1kT" firstAttribute="leading" secondItem="STd-4d-Ith" secondAttribute="leading" constant="20" symbolic="YES" id="EeV-Ds-d9F"/>
<constraint firstAttribute="trailing" secondItem="D6D-eY-1kT" secondAttribute="trailing" constant="20" symbolic="YES" id="FOq-uw-TWJ"/>
</constraints>
</tableViewCellContentView>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="aRd-y8-EFj">
<rect key="frame" x="0.0" y="726.5" width="375" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="aRd-y8-EFj" id="Zg7-XD-CeA">
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
Expand Down Expand Up @@ -250,7 +276,7 @@
</tableViewCellContentView>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="qlR-qY-KKn">
<rect key="frame" x="0.0" y="726.5" width="375" height="43.5"/>
<rect key="frame" x="0.0" y="770" width="375" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="qlR-qY-KKn" id="q27-43-Ymq">
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
Expand Down Expand Up @@ -305,7 +331,7 @@
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="fXz-1k-KFy" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="113" y="106"/>
<point key="canvasLocation" x="112.8" y="105.69715142428787"/>
</scene>
</scenes>
</document>
Loading

0 comments on commit eba7d52

Please sign in to comment.