Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clearing session cookie in Android AdvancedWeView so user can logout from GoogleAccount #237

Open
wants to merge 166 commits into
base: feature/android
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
166 commits
Select commit Hold shift + click to select a range
1bfcb8e
Fixed pending auth for iOS
auser Nov 27, 2016
3714bb7
Updated response value for oauth1 with access_token(_secret)
auser Nov 27, 2016
929912f
Added github for iOS
auser Nov 27, 2016
b5f1574
Added github auth
auser Nov 27, 2016
69b93c0
Updated docs with Android setup
auser Nov 27, 2016
c65cf0d
Update README.md
auser Nov 28, 2016
29a9440
Update README.md
auser Nov 28, 2016
89072f2
2.1.0
auser Nov 28, 2016
eb07797
fix typo in readme's ios setup instructions
cameron Dec 1, 2016
2160fa7
add readme instruction re ios/link binary with library
cameron Dec 1, 2016
19e0c1b
2.1.1
auser Dec 8, 2016
472b78d
Updated android instructions on README
auser Dec 8, 2016
bb6a78f
Fixed android compilation errors
auser Dec 8, 2016
2b48211
2.1.2
auser Dec 8, 2016
99c1f36
Merge pull request #18 from cameron/patch-1
auser Dec 13, 2016
77c0df7
Update README.md
auser Dec 13, 2016
a4ef6e4
Update README.md
auser Dec 13, 2016
1c53aa5
Updated resources for iOS 10 capabilities tab
auser Dec 13, 2016
321dd74
Fixed #23
auser Dec 13, 2016
e1116d7
2.1.3
auser Dec 13, 2016
9a6dea2
Cleaned up build.gradle
auser Dec 13, 2016
91b07a0
Fixed call to client in OAuthManager #24
auser Dec 14, 2016
8a0e2d3
2.1.4
auser Dec 14, 2016
4162e53
Fixed OAuthRequest
auser Dec 15, 2016
b7e66ad
2.1.5
auser Dec 15, 2016
b034c61
Enable bitcode (Fix #20)
brunolemos Dec 21, 2016
b64b8c4
WIP: updates
auser Jan 3, 2017
2787690
Save account after authorization
auser Jan 3, 2017
24bceba
2.1.6
auser Jan 3, 2017
9b33309
Merge pull request #28 from brunolemos/patch-1
auser Jan 3, 2017
e90ed3b
Merge branch 'master' of github.com:fullstackreact/react-native-oauth
auser Jan 3, 2017
958da4c
Updated google setup instructions and fixed github with url
auser Jan 3, 2017
486d0f7
Added slack support auth for iOS
auser Jan 4, 2017
809458b
WIP: handle errors on android
auser Jan 4, 2017
17b47ac
Update to fix credential error
auser Jan 4, 2017
3063886
Fixed scopes on Android (#29) and added Slack insructions to README (…
auser Jan 4, 2017
13ce1c8
Updated Google README docs for Google and Android setup
auser Jan 4, 2017
2cb4018
2.1.7
auser Jan 4, 2017
50265bd
Also enable BITCODE on Release build
brunolemos Jan 6, 2017
e94abbe
Merge pull request #35 from brunolemos/patch-5
auser Jan 8, 2017
57aa018
Merge branch 'master' of github.com:fullstackreact/react-native-oauth
auser Jan 8, 2017
78021af
Ignore the ulgy javac-services files and friends
auser Jan 8, 2017
5020b41
2.1.8
auser Jan 8, 2017
ac06e92
2.1.9
auser Jan 11, 2017
291d2bf
Addresses #29 - Bring the iOS and Android response objects on authori…
auser Jan 11, 2017
8800ca0
Updated iOS to include scopes in response
auser Jan 12, 2017
135bb8d
Added slack and fixed response
auser Jan 13, 2017
a81d91d
Closes #38 (Android slack support)
auser Jan 13, 2017
10bdfae
2.1.10
auser Jan 13, 2017
ef78081
Removed opts for savedAccounts
auser Jan 14, 2017
2bca45b
2.1.11
auser Jan 14, 2017
93c38f6
Pegged ScribeJava @ 3.4.1
brianjd Jan 14, 2017
f6d9e04
Merge pull request #39 from brianjd/peg-scribe-version
auser Jan 14, 2017
baa7e16
Update header imports to match RN 0.40
futuun Jan 15, 2017
c5dff65
2.1.12
auser Jan 17, 2017
f460b9d
Fixed scribejava to stick at major release 4
auser Jan 17, 2017
dd71d30
Fixed oauth scope string to be dynamic
auser Jan 17, 2017
cb012c0
Updated gradle to pin scribejava
auser Jan 17, 2017
f4cd1f8
Split on , and space for scopes
auser Jan 17, 2017
9db5b1d
2.1.13
auser Jan 17, 2017
997a82c
updated readme doc for google auth, and typo
FrenchBully Jan 17, 2017
29cd821
Merge pull request #46 from FrenchBully/hotfix/update-readme
auser Jan 17, 2017
8d0af98
Updated README
auser Jan 17, 2017
f4a5ce7
Merge branch 'master' of github.com:fullstackreact/react-native-oauth
auser Jan 17, 2017
01ec065
Updated README with checklist
auser Jan 17, 2017
f41fa8b
Update README.md
auser Jan 17, 2017
49dd185
Moved Androidsetup below iOS linking
auser Jan 17, 2017
dbcd902
2.1.14
auser Jan 17, 2017
a22cac2
Proper error handling for error response in authentication
arilitan Jan 18, 2017
a2e1bdd
Merge pull request #47 from arilitan/master
auser Jan 18, 2017
2d82c83
2.1.15
auser Jan 18, 2017
b9970f4
updated readme for Facebook and Twitter integrations
arilitan Jan 18, 2017
0999e2e
removed border at the bottom of the picture
arilitan Jan 18, 2017
59d2110
updated Facebook screenshot
arilitan Jan 18, 2017
564fb18
Merge pull request #51 from arilitan/master
auser Jan 18, 2017
aeee4fa
Update README.md
auser Jan 18, 2017
466b20c
Updated README.md
SleepyFanjo Jan 20, 2017
710eebd
Merge pull request #56 from SleepyFanjo/patch-1
auser Jan 20, 2017
a9b6aa1
Fix the scopes syntax in the authorize method parameters
Jan 25, 2017
af879ce
A few minor changes
auser Jan 25, 2017
cdc5ed4
Merge pull request #43 from futuun/master
auser Feb 5, 2017
881b268
Merge pull request #63 from 1minus1limited/master
auser Feb 5, 2017
a59f2c2
Updates
auser Feb 5, 2017
0f8be99
fix small typo
youbiak Feb 10, 2017
4f424e8
Added method for adding own providers via OAuthManager
Feb 10, 2017
1ee273b
Merge pull request #69 from niwox/patch-1
auser Feb 12, 2017
bd18bcd
updated readme with info on adding custom providers
Feb 13, 2017
9620531
Merge pull request #70 from mistenkt/master
auser Feb 13, 2017
2889243
RN iOS headers work on RN < 40 and RN >= 40
Kottidev Feb 23, 2017
7861072
Merge pull request #79 from Kottidev/master
auser Mar 7, 2017
0202ae8
Fixing addProvider function. 'authProviders' variable was not getting…
Mar 11, 2017
d415e8e
Adding XML API support for IOS
Mar 13, 2017
1092461
[fix]: fix the import else condition missing #
alextkd Mar 19, 2017
3fdcb4c
Merge pull request #92 from MCaller/master
auser Mar 19, 2017
1ae33ee
[fix]: for Google authentication make sure the clientID is present wh…
alextkd Mar 20, 2017
972ef4e
Fix for custom auth providers
mistenkt Mar 21, 2017
c1fd721
Merge pull request #94 from MCaller/master
auser Apr 5, 2017
36f0722
Set the user agent for web view
timbielawski Apr 5, 2017
a43cca8
Merge pull request #100 from timbielawski/master
auser Apr 6, 2017
99d833b
Merge pull request #95 from mistenkt/patch-1
auser Apr 6, 2017
1998d92
fragment changes done
divyanshunegi Apr 11, 2017
0995d8d
fragment changes done and merged
divyanshunegi Apr 11, 2017
719e45a
dialog fragment made full screen, added progress bar
divyanshunegi Apr 11, 2017
0cd7a27
Merge branch 'hotfix/1.0.0'
divyanshunegi Apr 11, 2017
662ac7c
dialog draw height is reduced from device height as bottom bottom bar…
divyanshunegi Apr 11, 2017
2a1c0fb
Add idToken to credentials, use GSON to parse accessToken param
iamham Apr 17, 2017
c945970
Merge pull request #105 from divyanshunegi/master
auser May 3, 2017
e5d4156
Merge pull request #108 from iamham/patch-1
auser May 8, 2017
96542c7
Merge branch 'master' into master
auser May 8, 2017
00544ee
Merge pull request #86 from rajchourasia/master
auser May 8, 2017
fae5b21
Merge pull request #88 from rajchourasia/xmldata
auser May 8, 2017
a521863
Fix check for ios directory
vbuch May 11, 2017
f9ee811
Add ConfigurableApi to support custom providers.
vbuch May 13, 2017
9f46012
Get ConfigurableApi in;
May 30, 2017
0641727
Get ConfigurableApi in;
May 30, 2017
c87965a
Merge branch 'master' of https://github.com/vbuch/react-native-oauth
May 30, 2017
9121d51
fix webview dialog not dismissed on android
May 31, 2017
93bc4be
Merge pull request #114 from pi-chan/android-webview-dismiss
auser Jun 2, 2017
9de2267
Merge pull request #111 from vbuch/master
auser Jun 2, 2017
3b8efe1
updated key of oauth_token to align with ios. Also added aouth_token_…
shohey1226 Jun 3, 2017
0a4dfe4
added handling for cancelation
shohey1226 Jun 4, 2017
4d84db7
open authorize url in SFSafariViewController when available
Jun 15, 2017
40b71a3
Merge pull request #119 from shohey1226/add_oauth_token_secret_and_up…
auser Jun 16, 2017
6bcdb9b
Merge pull request #120 from shohey1226/add_twitter_cancelation_handling
auser Jun 16, 2017
c4414d7
No need to url encode provider config
tqc Jun 19, 2017
2bee46a
Merge pull request #123 from tqc/patch-1
auser Jun 26, 2017
2f8c8d1
Merge pull request #122 from pi-chan/enable-safariview
auser Jun 26, 2017
b515014
Android - Implement support for space separated scopes
mribbons Jul 25, 2017
28d0f21
Remove deprecated createJSModules @Override
Aug 4, 2017
341152c
Merge pull request #136 from piuholo/rn-047-fix
auser Aug 7, 2017
2a1fb1b
Merge pull request #134 from mribbons/master
auser Aug 7, 2017
6925880
Added https://github.com/fullstackreact/react-native-oauth/pull/171
SailingSteve Oct 25, 2017
9c68923
Added https://github.com/fullstackreact/react-native-oauth/pull/171
SailingSteve Oct 25, 2017
370c065
Added https://github.com/fullstackreact/react-native-oauth/pull/171
SailingSteve Oct 26, 2017
0b8b674
Merge PR 121, fix user agent, fix full screen webview
Nov 24, 2017
1d7f49e
Use asynchronous execution for safariViewController
virae Jan 3, 2018
ec53484
add Spotify auth provider
thebradbain Jan 12, 2018
e93162d
Allow json body in POST / PUT requests
thebradbain Jan 12, 2018
2c475ab
Enable json body parsing
thebradbain Jan 13, 2018
28f914d
Changed if/else statement to avoid React error.
compulsor Mar 19, 2018
bd9ee8b
Update README.md
auser Mar 30, 2018
77128e0
Merge pull request #189 from thebradbain/master
auser Mar 30, 2018
7340c71
Merge pull request #188 from represent/master
auser Mar 30, 2018
02c6c1d
Fix duplicate RCTMethodInfo import (https://github.com/facebook/react…
thebradbain Apr 7, 2018
3949c3b
Fix duplicate React library import error conflict w/certain pods
thebradbain Apr 28, 2018
aa32136
Pass back response headers over javascript bridge
thebradbain Apr 28, 2018
2d53534
Merge branch 'master' of https://github.com/fullstackreact/react-nati…
thebradbain Apr 30, 2018
aa31836
Dispatch safariViewController on main queue
stonehippo May 8, 2018
b311024
Fix build issue
stonehippo May 8, 2018
84517e0
Remove deprecated @Override
rgabs May 10, 2018
f1de1ef
Fix: Duplicate RCTMethodInfo while building iOS app
rgabs May 11, 2018
234cf6f
Fix error for redefinition of RCTMethodInfo
madana-i Jun 3, 2018
87c0fe9
Merge pull request #213 from DaikiInaba/master
auser Jul 29, 2018
fbabfbb
Merge pull request #209 from rgabs/patch-2
auser Jul 29, 2018
786009f
Merge pull request #208 from rgabs/patch-1
auser Jul 29, 2018
92c81ee
Ignored dist/
Jul 29, 2018
0054354
2.1.16
Jul 29, 2018
ae28d03
Merge pull request #207 from stonehippo/master
auser Jul 29, 2018
4e0f4e3
Merge branch 'master' of github.com:fullstackreact/react-native-oauth
Jul 29, 2018
72acd19
Updates
Jul 29, 2018
e7ac4a8
Merge pull request #203 from Compulsor/master
auser Jul 29, 2018
87786d6
Merge pull request #182 from SailingSteve/master
auser Jul 29, 2018
897ba2e
Merge branch 'master' into master
auser Jul 29, 2018
f1015c2
Merge pull request #180 from matiere-noire/master
auser Jul 29, 2018
0b6d001
2.1.17
Jul 29, 2018
afaffc9
2.1.18
Jul 29, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"presets": ["env"],
"plugins": ["transform-async-to-generator", "transform-object-rest-spread"]
}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ xcuserdata/

.idea
.vscode
javac-services.0.log*
dist/
253 changes: 217 additions & 36 deletions README.md

Large diffs are not rendered by default.

132 changes: 128 additions & 4 deletions android/android.iml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<module external.linked.project.id="android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
Expand All @@ -8,14 +8,138 @@
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<afterSyncTasks>
<task>generateDebugSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
<option name="LIBRARY_PROJECT" value="true" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/multidex-instrumentation/1.0.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/multidex/1.0.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.0.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/drawee/0.8.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/fbcore/0.8.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/fresco/0.8.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-okhttp/0.8.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline/0.8.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.react/react-native/0.20.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.delight-im/Android-AdvancedWebView/v3.0.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.webkit/android-jsc/r174650/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="okhttp-ws-2.5.0" level="project" />
<orderEntry type="library" exported="" name="okio-1.6.0" level="project" />
<orderEntry type="library" exported="" name="gson-2.8.0" level="project" />
<orderEntry type="library" exported="" name="okhttp-2.5.0" level="project" />
<orderEntry type="library" exported="" name="jsr305-3.0.0" level="project" />
<orderEntry type="library" exported="" name="stetho-1.2.0" level="project" />
<orderEntry type="library" exported="" name="fbcore-0.8.1" level="project" />
<orderEntry type="library" exported="" name="commons-cli-1.2" level="project" />
<orderEntry type="library" exported="" name="scribejava-apis-3.4.1" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-23.0.1" level="project" />
<orderEntry type="library" exported="" name="imagepipeline-0.8.1" level="project" />
<orderEntry type="library" exported="" name="android-jsc-r174650" level="project" />
<orderEntry type="library" exported="" name="fresco-0.8.1" level="project" />
<orderEntry type="library" exported="" name="imagepipeline-okhttp-0.8.1" level="project" />
<orderEntry type="library" exported="" name="bolts-android-1.1.4" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
<orderEntry type="library" exported="" name="drawee-0.8.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
<orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="multidex-instrumentation-1.0.1" level="project" />
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
<orderEntry type="library" exported="" name="stetho-okhttp-1.2.0" level="project" />
<orderEntry type="library" exported="" name="Android-AdvancedWebView-v3.0.0" level="project" />
<orderEntry type="library" exported="" name="jackson-core-2.2.3" level="project" />
<orderEntry type="library" exported="" name="scribejava-core-3.4.1" level="project" />
<orderEntry type="library" exported="" name="multidex-1.0.1" level="project" />
<orderEntry type="library" exported="" name="react-native-0.20.1" level="project" />
</component>
</module>
17 changes: 1 addition & 16 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,7 @@ allprojects {

dependencies {
compile 'com.facebook.react:react-native:+'
// compile 'com.wu-man:android-oauth-client:0.4.5@aar'
// compile 'com.google.android.gms:play-services-base:+'
// compile 'com.android.volley:volley:+'
compile 'com.github.scribejava:scribejava-apis:+'
compile 'com.github.scribejava:scribejava-apis:3.4.1'
compile 'com.github.delight-im:Android-AdvancedWebView:v3.0.0'
compile 'com.google.code.gson:gson:+'

// compile 'com.google.api-client:google-api-client-android:1.19.0' exclude module: 'httpclient'
// compile 'com.google.http-client:google-http-client-gson:1.19.0' exclude module: 'httpclient'

// compile('com.google.api-client:google-api-client-android:1.15.0-rc') {
// exclude group: 'com.google.android.google-play-services', module: 'google-play-services'
// exclude group: 'junit', module: 'junit'
// exclude group: 'com.google.android', module: 'android'
// }
// // compile 'com.google.oauth-client:google-oauth-client-java6:1.15.0-rc'
// compile 'com.google.apis:google-api-services-oauth2:v1-rev129-1.22.0'
// compile 'com.google.http-client:google-http-client-jackson2:1.22.0'
}
5 changes: 2 additions & 3 deletions android/local.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Fri Sep 02 11:41:31 PDT 2016
sdk.dir=/usr/local/opt/android-sdk
ndk.dir=/usr/local/opt/android-ndk
#Tue Apr 11 11:36:49 IST 2017
sdk.dir=/Users/divyanshunegi/Downloads/adt-bundle-mac-x86_64-20140321/sdk
Loading