kadu/gotify-android-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update oauth package and ignore linting for it

Browse Source 
OAuth2 isnt used therefore we can ignore it
This commit is contained in:
Jannis Mattheis
2018-11-14 20:38:38 +01:00
parent d4c6273214
commit 94d23c9248
4 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/build.gradle
View File

@@ -26,6 +26,7 @@ android {
} }
lintOptions { lintOptions {
disable 'GoogleAppIndexingWarning' disable 'GoogleAppIndexingWarning'
lintConfig file('../lint.xml')
} }
packagingOptions { packagingOptions {
exclude 'META-INF/DEPENDENCIES' exclude 'META-INF/DEPENDENCIES'
@@ -50,6 +51,12 @@ dependencies {
implementation 'com.squareup.picasso:picasso:2.71828' implementation 'com.squareup.picasso:picasso:2.71828'
} }
configurations {
all {
exclude group: 'org.json', module: 'json'
}
}
spotless { spotless {
java { java {
target '**/*.java' target '**/*.java'

6
client/build.gradle
View File

@@ -93,7 +93,7 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
oltu_version = "1.0.0" oltu_version = "1.0.2"
retrofit_version = "2.3.0" retrofit_version = "2.3.0"
swagger_annotations_version = "1.5.15" swagger_annotations_version = "1.5.15"
junit_version = "4.12" junit_version = "4.12"
@@ -106,7 +106,9 @@ dependencies {
compile "com.squareup.retrofit2:converter-scalars:$retrofit_version" compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
compile "com.squareup.retrofit2:converter-gson:$retrofit_version" compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
compile "io.swagger:swagger-annotations:$swagger_annotations_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 "io.gsonfire:gson-fire:$json_fire_version"
compile "org.threeten:threetenbp:$threetenbp_version" compile "org.threeten:threetenbp:$threetenbp_version"
testCompile "junit:junit:$junit_version" testCompile "junit:junit:$junit_version"

1
client/src/main/java/com/github/gotify/client/auth/OAuthOkHttpClient.java
View File

@@ -59,6 +59,7 @@ public class OAuthOkHttpClient implements HttpClient {
response.body().string(), response.body().string(),
response.body().contentType().toString(), response.body().contentType().toString(),
response.code(), response.code(),
response.headers().toMultimap(),
responseClass); responseClass);
} catch (IOException e) { } catch (IOException e) {
throw new OAuthSystemException(e); throw new OAuthSystemException(e);

6
lint.xml Normal file
View File

@@ -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>