Skip to content

Commit 29a62b7

Browse files
authored
Merge pull request #43 from codepath/okhttp3
Okhttp3
2 parents 3cbe239 + ffd949d commit 29a62b7

16 files changed

+221
-383
lines changed

app/src/main/java/com/codepath/oauth/OAuthAsyncHttpClient.java

-176
This file was deleted.

app/src/main/java/com/codepath/oauth/ScribeRequestAdapter.java

-174
This file was deleted.

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.3.0'
8+
classpath 'com.android.tools.build:gradle:3.4.2'
99
}
1010
}
1111

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Jan 28 10:39:02 PST 2019
1+
#Sun Aug 11 22:16:42 PDT 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

app/build.gradle library/build.gradle

+9-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ apply plugin: 'com.jfrog.bintray'
77
ext {
88

99
GROUP = 'com.codepath.libraries'
10-
BASE_VERSION = "1.4"
11-
VERSION_NAME = "1.4.0"
10+
BASE_VERSION = "2.0"
11+
VERSION_NAME = "2.0.0"
1212
POM_PACKAGING = "aar"
1313
POM_DESCRIPTION = "CodePath OAuth Handler"
1414

@@ -115,9 +115,15 @@ ext {
115115

116116
dependencies {
117117
api "androidx.appcompat:appcompat:1.0.2"
118-
api 'com.loopj.android:android-async-http:1.4.9'
118+
api 'com.codepath.libraries:asynchttpclient:0.0.5'
119119
implementation files('libs/codepath-utils.jar')
120120
api 'com.github.scribejava:scribejava-apis:4.1.1'
121+
api 'com.github.scribejava:scribejava-httpclient-okhttp:4.1.1'
122+
implementation 'se.akerfeldt:okhttp-signpost:1.1.0'
123+
implementation 'oauth.signpost:signpost-core:1.2.1.2'
124+
implementation 'com.facebook.stetho:stetho:1.5.1'
125+
implementation 'com.facebook.stetho:stetho-okhttp3:1.5.1'
126+
121127
}
122128

123129
/*task jar(type: Jar) {
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)