Update oauth package and ignore linting for it

OAuth2 isnt used therefore we can ignore it
gotify · Nov 17, 2018 · 94d23c9 · 94d23c9
1 parent d4c6273
commit 94d23c9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,6 +26,7 @@ android {
     }
     lintOptions {
         disable 'GoogleAppIndexingWarning'
+        lintConfig file('../lint.xml')
     }
     packagingOptions {
         exclude 'META-INF/DEPENDENCIES'
@@ -50,6 +51,12 @@ dependencies {
     implementation 'com.squareup.picasso:picasso:2.71828'
 }
 
+configurations {
+    all {
+        exclude group: 'org.json', module: 'json'
+    }
+}
+
 spotless {
     java {
         target '**/*.java'

diff --git a/client/build.gradle b/client/build.gradle
@@ -93,7 +93,7 @@ if(hasProperty('target') && target == 'android') {
 }
 
 ext {
-    oltu_version = "1.0.0"
+    oltu_version = "1.0.2"
     retrofit_version = "2.3.0"
     swagger_annotations_version = "1.5.15"
     junit_version = "4.12"
@@ -106,7 +106,9 @@ dependencies {
     compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
     compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
-    compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
+    compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version") {
+        exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
+    }
     compile "io.gsonfire:gson-fire:$json_fire_version"
     compile "org.threeten:threetenbp:$threetenbp_version"
     testCompile "junit:junit:$junit_version"

diff --git a/client/src/main/java/com/github/gotify/client/auth/OAuthOkHttpClient.java b/client/src/main/java/com/github/gotify/client/auth/OAuthOkHttpClient.java
@@ -59,6 +59,7 @@ public <T extends OAuthClientResponse> T execute(OAuthClientRequest request, Map
                     response.body().string(), 
                     response.body().contentType().toString(),
                     response.code(),
+                    response.headers().toMultimap(),
                     responseClass);
         } catch (IOException e) {
             throw new OAuthSystemException(e);

diff --git a/lint.xml b/lint.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <issue id="InvalidPackage">
+        <ignore path="**/org.apache.oltu.oauth2.client-1.0.2.jar"/>
+    </issue>
+</lint>