Skip to content

Commit d2ae38e

Browse files
authored
Merge pull request #10 from auth0/lbalmaceda-patch-1
Update dependencies (jackson-databind, okhttp, oss plugin)
2 parents 56a6561 + 5e200f0 commit d2ae38e

10 files changed

Lines changed: 34 additions & 36 deletions

File tree

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ gradle-app.setting
102102
.idea/dynamic.xml
103103
.idea/uiDesigner.xml
104104

105-
# Gradle:
105+
# Gradle:w
106106
.idea/gradle.xml
107107
.idea/libraries
108108

@@ -112,6 +112,10 @@ gradle-app.setting
112112
## File-based project format:
113113
*.iws
114114

115+
# IntelliJ
116+
out/
117+
118+
115119
### Intellij+iml Patch ###
116120
# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
117121

.idea/compiler.xml

Lines changed: 0 additions & 9 deletions
This file was deleted.

.idea/vcs.xml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
group = 'com.auth0'
22

3-
apply plugin: 'com.auth0.gradle.oss-library.java'
4-
apply plugin: 'jacoco'
3+
apply plugin: "com.jfrog.bintray"
4+
apply plugin: "com.auth0.gradle.oss-library.java"
5+
apply plugin: "jacoco"
56

67
logger.lifecycle("Using version ${version} for ${name}")
78

@@ -42,8 +43,8 @@ buildscript {
4243
}
4344
}
4445
dependencies {
45-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
46-
classpath "gradle.plugin.com.auth0.gradle:oss-library:0.6.0"
46+
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
47+
classpath "gradle.plugin.com.auth0.gradle:oss-library:0.9.0"
4748
}
4849
}
4950

@@ -59,11 +60,11 @@ test {
5960
}
6061

6162
dependencies {
62-
compile 'com.squareup.okhttp3:okhttp:3.6.0'
63-
compile 'com.fasterxml.jackson.core:jackson-databind:2.8.7'
63+
compile 'com.squareup.okhttp3:okhttp:3.14.2'
64+
compile 'com.fasterxml.jackson.core:jackson-databind:2.9.9'
6465

6566
testCompile 'org.mockito:mockito-core:2.5.4'
66-
testCompile 'com.squareup.okhttp3:mockwebserver:3.6.0'
67+
testCompile 'com.squareup.okhttp3:mockwebserver:3.14.2'
6768
testCompile 'org.hamcrest:java-hamcrest:2.0.0.0'
6869
testCompile 'junit:junit:4.11'
6970
}

gradle/wrapper/gradle-wrapper.jar

2.56 KB
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Tue Jan 03 13:42:16 ART 2017
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip

gradlew

Lines changed: 17 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/test/java/com/auth0/guardian/TransactionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void shouldCreateCorrectlyWithWeirdCharacters() throws Exception {
6767
assertThat(transaction.getTransactionToken(), is(equalTo("TRANSACTION_TOKEN")));
6868
assertThat(transaction.getRecoveryCode(), is(equalTo("RECOVERY_CODE")));
6969
assertThat(transaction.getTotpSecret(), is(equalTo("OTP_SECRET")));
70-
assertThat(transaction.totpURI("user%name", "compañy?!"), is(equalTo("otpauth://totp/compa%C3%B1y%3F!:user%25name?secret=OTP_SECRET&issuer=compa%C3%B1y?!")));
70+
assertThat(transaction.totpURI("user%name", "compañy?!"), is(equalTo("otpauth://totp/compa%C3%B1y%3F!:user%25name?secret=OTP_SECRET&issuer=compa%C3%B1y%3F%21")));
7171
}
7272

7373
@Test

src/test/java/com/auth0/guardian/networking/RequestTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ public class RequestTest {
8181
.url("https://example.com/")
8282
.build())
8383
.protocol(Protocol.HTTP_1_1)
84+
.message("")
8485
.code(200)
8586
.body(ResponseBody.create(MEDIA_TYPE, "{}"))
8687
.build();
@@ -90,6 +91,7 @@ public class RequestTest {
9091
.url("https://example.com/")
9192
.build())
9293
.protocol(Protocol.HTTP_1_1)
94+
.message("")
9395
.code(401)
9496
.body(ResponseBody.create(MEDIA_TYPE, "{}"))
9597
.build();

0 commit comments

Comments
 (0)