From 554bf72c407beff7ef71a262f8fb0ae41429b152 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Apr 2021 21:06:36 +0000 Subject: [PATCH 1/4] Bump lovelyinput from 1.0.9 to 1.1.6 Bumps lovelyinput from 1.0.9 to 1.1.6. Signed-off-by: dependabot[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 28bc439ad..9fb0b6152 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -209,7 +209,7 @@ dependencies { implementation 'org.webrtc:google-webrtc:1.0.32006' implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}" implementation 'com.yarolegovich:lovely-dialog:1.1.0' - implementation 'com.yarolegovich:lovelyinput:1.0.9' + implementation 'com.yarolegovich:lovelyinput:1.1.6' implementation 'com.yarolegovich:mp:1.0.9' implementation 'me.zhanghai.android.effortlesspermissions:library:1.1.0' implementation 'org.apache.commons:commons-lang3:3.11' From 2e537f0af3bc285151d439714d06914538bb0cdf Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 22 Apr 2021 21:54:48 +0200 Subject: [PATCH 2/4] lovely-input has been superseeded by lovely-dialog Signed-off-by: Andy Scherzinger --- app/build.gradle | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9fb0b6152..e0adf7fc8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -208,9 +208,8 @@ dependencies { implementation 'eu.davidea:flexible-adapter-ui:1.0.0' implementation 'org.webrtc:google-webrtc:1.0.32006' implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}" - implementation 'com.yarolegovich:lovely-dialog:1.1.0' - implementation 'com.yarolegovich:lovelyinput:1.1.6' - implementation 'com.yarolegovich:mp:1.0.9' + implementation 'com.yarolegovich:lovely-dialog:1.1.1' + implementation 'com.yarolegovich:mp:1.1.6' implementation 'me.zhanghai.android.effortlesspermissions:library:1.1.0' implementation 'org.apache.commons:commons-lang3:3.11' implementation 'com.github.wooplr:Spotlight:1.3' From 575a877ca0b4894be161f7c1cf74952f3d14cd9d Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 27 Apr 2021 15:31:45 +0200 Subject: [PATCH 3/4] unify lib version(s) bump mockito 3.8.0->3.9.0 Signed-off-by: Andy Scherzinger --- app/build.gradle | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e0adf7fc8..357dbe3c5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -126,10 +126,14 @@ android { } ext { + butterknifeVersion = "10.2.3" coilKtVersion = "1.2.0" daggerVersion = "2.34.1" + okhttpVersion = "3.14.2" + lombokVersion = "1.18.10" parcelerVersion = "1.1.13" powermockVersion = "2.0.9" + retrofit2Version = "2.7.1" workVersion = "2.3.0" markwonVersion = "4.6.2" } @@ -173,16 +177,16 @@ dependencies { implementation 'com.bluelinelabs:conductor:2.1.5' implementation 'com.bluelinelabs:conductor-support:2.1.5' - implementation 'com.squareup.okhttp3:okhttp:3.14.2' - implementation 'com.squareup.okhttp3:okhttp-urlconnection:3.14.2' - implementation 'com.squareup.okhttp3:logging-interceptor:3.14.2' + implementation "com.squareup.okhttp3:okhttp:${okhttpVersion}" + implementation "com.squareup.okhttp3:okhttp-urlconnection:${okhttpVersion}" + implementation "com.squareup.okhttp3:logging-interceptor:${okhttpVersion}" implementation 'com.bluelinelabs:logansquare:1.3.7' implementation 'com.fasterxml.jackson.core:jackson-core:2.12.3' kapt 'com.bluelinelabs:logansquare-compiler:1.3.7' - implementation 'com.squareup.retrofit2:retrofit:2.7.1' - implementation 'com.squareup.retrofit2:adapter-rxjava2:2.7.1' + implementation "com.squareup.retrofit2:retrofit:${retrofit2Version}" + implementation "com.squareup.retrofit2:adapter-rxjava2:${retrofit2Version}" implementation 'com.github.aurae.retrofit2:converter-logansquare:1.4.1' implementation "com.google.dagger:dagger:$daggerVersion" @@ -199,10 +203,10 @@ dependencies { implementation "org.parceler:parceler-api:$parcelerVersion" kapt "org.parceler:parceler:$parcelerVersion" implementation 'net.orange-box.storebox:storebox-lib:1.4.0' - compileOnly 'org.projectlombok:lombok:1.18.10' - annotationProcessor "org.projectlombok:lombok:1.18.10" - implementation 'com.jakewharton:butterknife:10.2.3' - kapt 'com.jakewharton:butterknife-compiler:10.2.1' + compileOnly "org.projectlombok:lombok:${lombokVersion}" + annotationProcessor "org.projectlombok:lombok:${lombokVersion}" + implementation "com.jakewharton:butterknife:${butterknifeVersion}" + kapt "com.jakewharton:butterknife-compiler:${butterknifeVersion}" implementation 'com.github.HITGIF:TextFieldBoxes:1.4.5' implementation 'eu.davidea:flexible-adapter:5.1.0' implementation 'eu.davidea:flexible-adapter-ui:1.0.0' @@ -256,7 +260,7 @@ dependencies { implementation 'com.elyeproj.libraries:loaderviewlibrary:2.0.0' testImplementation 'junit:junit:4.13' - testImplementation 'org.mockito:mockito-core:3.8.0' + testImplementation 'org.mockito:mockito-core:3.9.0' testImplementation "org.powermock:powermock-core:${powermockVersion}" testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}" testImplementation "org.powermock:powermock-api-mockito2:${powermockVersion}" From b434fbb72440200930daa9b077a2f8ebfae6ad45 Mon Sep 17 00:00:00 2001 From: drone Date: Tue, 27 Apr 2021 14:15:12 +0000 Subject: [PATCH 4/4] Drone: update Lint results to reflect reduced error/warning count [skip ci] Signed-off-by: drone --- scripts/analysis/lint-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt index fc50c4283..4ecbde733 100644 --- a/scripts/analysis/lint-results.txt +++ b/scripts/analysis/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 3 errors and 115 warnings + Lint Report: 3 errors and 114 warnings