Skip to content

Commit c282912

Browse files
auserauser
committed
Updates
1 parent 9540d0a commit c282912

File tree

6 files changed

+14
-27
lines changed

6 files changed

+14
-27
lines changed

‎android/app/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,14 @@ android {
126126
}
127127

128128
dependencies {
129+
compile project(':react-native-oauth')
129130
compile project(':react-native-fs')
130131
compile project(':react-native-firestack')
131132
compile project(':react-native-vector-icons')
132133
compile fileTree(dir: "libs", include: ["*.jar"])
133134
compile "com.android.support:appcompat-v7:23.0.1"
134135
compile "com.facebook.react:react-native:+" // From node_modules
136+
compile 'com.github.delight-im:Android-AdvancedWebView:v3.0.0'
135137
}
136138

137139
// Run this once to be able to run the application with BUCK

‎android/app/src/main/java/com/firestackapp/MainApplication.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import android.util.Log;
55

66
import com.facebook.react.ReactApplication;
7+
import io.fullstack.oauth.OAuthManagerPackage;
78
import com.rnfs.RNFSPackage;
89
import io.fullstack.firestack.FirestackPackage;
910
import com.oblador.vectoricons.VectorIconsPackage;
@@ -27,6 +28,7 @@ protected boolean getUseDeveloperSupport() {
2728
protected List<ReactPackage> getPackages() {
2829
return Arrays.<ReactPackage>asList(
2930
new MainReactPackage(),
31+
new OAuthManagerPackage(),
3032
new RNFSPackage(),
3133
new FirestackPackage(),
3234
new VectorIconsPackage()

‎android/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ allprojects {
1717
repositories {
1818
mavenLocal()
1919
jcenter()
20+
maven { url "https://jitpack.io" }
2021
maven {
2122
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
2223
url "$rootDir/../node_modules/react-native/android"

‎android/settings.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
rootProject.name = 'FirestackApp'
22

33
include ':app'
4+
include ':react-native-oauth'
5+
project(':react-native-oauth').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-oauth/android')
46
include ':react-native-fs'
57
project(':react-native-fs').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fs/android')
68
include ':react-native-firestack'

‎ios/FirestackApp.xcodeproj/project.pbxproj

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
};
66
objectVersion = 46;
77
objects = {
8-
98
/* Begin PBXBuildFile section */
109
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
1110
00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
@@ -121,13 +120,6 @@
121120
remoteGlobalIDString = 58B5119B1A9E6C1200147676;
122121
remoteInfo = RCTText;
123122
};
124-
D92A80AE1DA902B400EFDC2C /* PBXContainerItemProxy */ = {
125-
isa = PBXContainerItemProxy;
126-
containerPortal = 8108D6CBBAC940E79F7B2091 /* OAuthManager.xcodeproj */;
127-
proxyType = 2;
128-
remoteGlobalIDString = D92A80A91DA902B400EFDC2C;
129-
remoteInfo = OAuthManager;
130-
};
131123
D952A59D1D9E7F3700A9C369 /* PBXContainerItemProxy */ = {
132124
isa = PBXContainerItemProxy;
133125
containerPortal = DB12A55C1C7B48E6B67B7F38 /* Firestack.xcodeproj */;
@@ -194,7 +186,6 @@
194186
621F832D582B499B8F88D567 /* Zocial.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = unknown; name = Zocial.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = "<group>"; };
195187
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
196188
7B96D879A35F8CCE9DDE1AF3 /* libPods-FirestackApp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-FirestackApp.a"; sourceTree = BUILT_PRODUCTS_DIR; };
197-
8108D6CBBAC940E79F7B2091 /* OAuthManager.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = OAuthManager.xcodeproj; path = "../node_modules/react-native-oauth/ios/OAuthManager.xcodeproj"; sourceTree = "<group>"; };
198189
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
199190
83DD9D687A23CFF859FC5C80 /* Pods-FirestackApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirestackApp.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FirestackApp/Pods-FirestackApp.debug.xcconfig"; sourceTree = "<group>"; };
200191
92260FFCC5A41B4324C2DE1D /* Pods-FirestackApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirestackApp.release.xcconfig"; path = "Pods/Target Support Files/Pods-FirestackApp/Pods-FirestackApp.release.xcconfig"; sourceTree = "<group>"; };
@@ -211,6 +202,7 @@
211202
DB12A55C1C7B48E6B67B7F38 /* Firestack.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = Firestack.xcodeproj; path = "../node_modules/react-native-firestack/ios/Firestack.xcodeproj"; sourceTree = "<group>"; };
212203
F0F6BD6002274B96B0321DBF /* EvilIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = unknown; name = EvilIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = "<group>"; };
213204
FD86BD6E5B684A7DB8D05C0E /* libOAuthManager.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = archive.ar; path = libOAuthManager.a; sourceTree = "<group>"; };
205+
A0760CC26DF347F7ABD64501 /* OAuthManager.xcodeproj */ = {isa = PBXFileReference; name = "OAuthManager.xcodeproj"; path = "../node_modules/react-native-oauth/ios/OAuthManager.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
214206
/* End PBXFileReference section */
215207

216208
/* Begin PBXFrameworksBuildPhase section */
@@ -369,8 +361,8 @@
369361
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
370362
5D4DBCF5A4BA4854BBD023F0 /* RNVectorIcons.xcodeproj */,
371363
DB12A55C1C7B48E6B67B7F38 /* Firestack.xcodeproj */,
372-
8108D6CBBAC940E79F7B2091 /* OAuthManager.xcodeproj */,
373364
08A096EC48E74C2C9EA3A14D /* RNFS.xcodeproj */,
365+
A0760CC26DF347F7ABD64501 /* OAuthManager.xcodeproj */,
374366
);
375367
name = Libraries;
376368
sourceTree = "<group>";
@@ -445,14 +437,6 @@
445437
name = Frameworks;
446438
sourceTree = "<group>";
447439
};
448-
D92A80AA1DA902B400EFDC2C /* Products */ = {
449-
isa = PBXGroup;
450-
children = (
451-
D92A80AF1DA902B400EFDC2C /* libOAuthManager.a */,
452-
);
453-
name = Products;
454-
sourceTree = "<group>";
455-
};
456440
D952A59A1D9E7F3700A9C369 /* Products */ = {
457441
isa = PBXGroup;
458442
children = (
@@ -554,10 +538,6 @@
554538
ProductGroup = D952A59A1D9E7F3700A9C369 /* Products */;
555539
ProjectRef = DB12A55C1C7B48E6B67B7F38 /* Firestack.xcodeproj */;
556540
},
557-
{
558-
ProductGroup = D92A80AA1DA902B400EFDC2C /* Products */;
559-
ProjectRef = 8108D6CBBAC940E79F7B2091 /* OAuthManager.xcodeproj */;
560-
},
561541
{
562542
ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */;
563543
ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */;
@@ -909,9 +889,9 @@
909889
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
910890
"$(SRCROOT)/../node_modules/react-native-firestack/ios/Firestack",
911891
"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingiOS",
912-
"$(SRCROOT)/../node_modules/react-native-oauth/ios/OAuthManager",
913892
"$(SRCROOT)/../node_modules/react-native-oauth/ios/**",
914893
"$(SRCROOT)/../node_modules/react-native-fs/**",
894+
"$(SRCROOT)/../node_modules/react-native-oauth/ios/OAuthManager",
915895
);
916896
INFOPLIST_FILE = FirestackApp/Info.plist;
917897
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -954,9 +934,9 @@
954934
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
955935
"$(SRCROOT)/../node_modules/react-native-firestack/ios/Firestack",
956936
"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingiOS",
957-
"$(SRCROOT)/../node_modules/react-native-oauth/ios/OAuthManager",
958937
"$(SRCROOT)/../node_modules/react-native-oauth/ios/**",
959938
"$(SRCROOT)/../node_modules/react-native-fs/**",
939+
"$(SRCROOT)/../node_modules/react-native-oauth/ios/OAuthManager",
960940
);
961941
INFOPLIST_FILE = FirestackApp/Info.plist;
962942
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -1018,9 +998,9 @@
1018998
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
1019999
"$(SRCROOT)/../node_modules/react-native-firestack/ios/Firestack/**",
10201000
"$(SRCROOT)/../node_modules/react-native-firestack/ios/Firestack",
1021-
"$(SRCROOT)/../node_modules/react-native-oauth/ios/OAuthManager",
10221001
"$(SRCROOT)/../node_modules/react-native-oauth/ios/**",
10231002
"$(SRCROOT)/../node_modules/react-native-fs/**",
1003+
"$(SRCROOT)/../node_modules/react-native-oauth/ios/OAuthManager",
10241004
);
10251005
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
10261006
MTL_ENABLE_DEBUG_INFO = YES;
@@ -1064,9 +1044,9 @@
10641044
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
10651045
"$(SRCROOT)/../node_modules/react-native-firestack/ios/Firestack/**",
10661046
"$(SRCROOT)/../node_modules/react-native-firestack/ios/Firestack",
1067-
"$(SRCROOT)/../node_modules/react-native-oauth/ios/OAuthManager",
10681047
"$(SRCROOT)/../node_modules/react-native-oauth/ios/**",
10691048
"$(SRCROOT)/../node_modules/react-native-fs/**",
1049+
"$(SRCROOT)/../node_modules/react-native-oauth/ios/OAuthManager",
10701050
);
10711051
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
10721052
MTL_ENABLE_DEBUG_INFO = NO;

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"react-native-firestack": "^2.3.5",
1818
"react-native-fs": "^2.0.1-rc.2",
1919
"react-native-gifted-chat": "0.0.10",
20-
"react-native-oauth": "^1.1.0",
20+
"react-native-oauth": "^2.1.0",
2121
"react-native-scrollable-tab-view": "^0.6.0",
2222
"react-native-vector-icons": "^2.1.0",
2323
"react-redux": "^4.4.5",

0 commit comments

Comments
 (0)