Skip to content

Commit 94d23c9

Browse files
committed
Update oauth package and ignore linting for it
OAuth2 isnt used therefore we can ignore it
1 parent d4c6273 commit 94d23c9

File tree

4 files changed

+18
-2
lines changed

4 files changed

+18
-2
lines changed

app/build.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ android {
2626
}
2727
lintOptions {
2828
disable 'GoogleAppIndexingWarning'
29+
lintConfig file('../lint.xml')
2930
}
3031
packagingOptions {
3132
exclude 'META-INF/DEPENDENCIES'
@@ -50,6 +51,12 @@ dependencies {
5051
implementation 'com.squareup.picasso:picasso:2.71828'
5152
}
5253

54+
configurations {
55+
all {
56+
exclude group: 'org.json', module: 'json'
57+
}
58+
}
59+
5360
spotless {
5461
java {
5562
target '**/*.java'

client/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ if(hasProperty('target') && target == 'android') {
9393
}
9494

9595
ext {
96-
oltu_version = "1.0.0"
96+
oltu_version = "1.0.2"
9797
retrofit_version = "2.3.0"
9898
swagger_annotations_version = "1.5.15"
9999
junit_version = "4.12"
@@ -106,7 +106,9 @@ dependencies {
106106
compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
107107
compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
108108
compile "io.swagger:swagger-annotations:$swagger_annotations_version"
109-
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
109+
compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version") {
110+
exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
111+
}
110112
compile "io.gsonfire:gson-fire:$json_fire_version"
111113
compile "org.threeten:threetenbp:$threetenbp_version"
112114
testCompile "junit:junit:$junit_version"

client/src/main/java/com/github/gotify/client/auth/OAuthOkHttpClient.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public <T extends OAuthClientResponse> T execute(OAuthClientRequest request, Map
5959
response.body().string(),
6060
response.body().contentType().toString(),
6161
response.code(),
62+
response.headers().toMultimap(),
6263
responseClass);
6364
} catch (IOException e) {
6465
throw new OAuthSystemException(e);

lint.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<lint>
3+
<issue id="InvalidPackage">
4+
<ignore path="**/org.apache.oltu.oauth2.client-1.0.2.jar"/>
5+
</issue>
6+
</lint>

0 commit comments

Comments
 (0)