From be951793ba56e4cd8b0b5aa638398a795fd219b8 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 18 May 2022 16:02:53 +0200 Subject: [PATCH 01/15] Bump gradle AS to 7.1.3 and gradle to 7.3.3 Signed-off-by: Andy Scherzinger --- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 1198b1522..a076b597f 100644 --- a/build.gradle +++ b/build.gradle @@ -34,10 +34,10 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:7.1.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}" classpath 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.5' - classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.19.0" + classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.20.0" classpath "org.jlleitschuh.gradle:ktlint-gradle:10.3.0" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0da862568..d793ae032 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip From 9d016e7005c66248f7d0fa3d60435bb8de5b3598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Brey?= Date: Wed, 18 May 2022 16:14:23 +0200 Subject: [PATCH 02/15] DownloadWebRtcTask: don't expose internal outputPath property MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the output file from app gradle instead Signed-off-by: Álvaro Brey --- app/build.gradle | 2 +- .../groovy/com/nextcloud/talk/gradle/DownloadWebRtcTask.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 86d64a56d..7bc9438a1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -236,7 +236,7 @@ dependencies { kapt "com.jakewharton:butterknife-compiler:${butterknifeVersion}" implementation 'eu.davidea:flexible-adapter:5.1.0' implementation 'eu.davidea:flexible-adapter-ui:1.0.0' - implementation fileTree(downloadWebRtc.getOutputPath()) + implementation fileTree(downloadWebRtc.libFile.path) implementation 'com.yarolegovich:lovely-dialog:1.1.1' implementation 'com.yarolegovich:mp:1.1.6' implementation 'me.zhanghai.android.effortlesspermissions:library:1.1.0' diff --git a/buildSrc/src/main/groovy/com/nextcloud/talk/gradle/DownloadWebRtcTask.groovy b/buildSrc/src/main/groovy/com/nextcloud/talk/gradle/DownloadWebRtcTask.groovy index 36d69f1d1..b581678d5 100644 --- a/buildSrc/src/main/groovy/com/nextcloud/talk/gradle/DownloadWebRtcTask.groovy +++ b/buildSrc/src/main/groovy/com/nextcloud/talk/gradle/DownloadWebRtcTask.groovy @@ -48,7 +48,7 @@ abstract class DownloadWebRtcTask extends DefaultTask { return "https://github.com/nextcloud-releases/talk-clients-webrtc/releases/download/${webRtcVersion}-RC1/${getFileName()}" } - String getOutputPath() { + private String getOutputPath() { return "${project.buildDir}/download/${getFileName()}" } From ba4f47309a408046c521211367aa8a1cf31cc576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Brey?= Date: Wed, 18 May 2022 16:40:00 +0200 Subject: [PATCH 03/15] workflows: use java 11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Brey --- .github/workflows/assembleFlavors.yml | 4 ++-- .github/workflows/check.yml | 4 ++-- .github/workflows/qa.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/assembleFlavors.yml b/.github/workflows/assembleFlavors.yml index 4c5fd592f..cb975d7ac 100644 --- a/.github/workflows/assembleFlavors.yml +++ b/.github/workflows/assembleFlavors.yml @@ -13,11 +13,11 @@ jobs: flavor: [ Generic, Gplay ] steps: - uses: actions/checkout@v3 - - name: set up JDK 8 + - name: set up JDK 11 uses: actions/setup-java@v3 with: distribution: "temurin" - java-version: 8.0 + java-version: 11 - name: Build ${{ matrix.flavor }} run: | echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" >> gradle.properties diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index c724b0cfd..0f1e10a78 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -13,10 +13,10 @@ jobs: task: [ detekt, ktlintCheck ] steps: - uses: actions/checkout@v3 - - name: Set up JDK 8 + - name: Set up JDK 11 uses: actions/setup-java@v3 with: distribution: "temurin" - java-version: 8.0 + java-version: 11 - name: Check ${{ matrix.task }} run: ./gradlew ${{ matrix.task }} diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index 4acfd94e9..b8c028da5 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -13,12 +13,12 @@ jobs: id: check-secrets - uses: actions/checkout@v3 if: ${{ steps.check-secrets.outputs.ok == 'true' }} - - name: set up JDK 8 + - name: set up JDK 11 if: ${{ steps.check-secrets.outputs.ok == 'true' }} uses: actions/setup-java@v3 with: distribution: "temurin" - java-version: 8.0 + java-version: 11 - name: Build QA if: ${{ steps.check-secrets.outputs.ok == 'true' }} env: From 741cb7501c57d6c3dc0945c71da8333f29f762f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Brey?= Date: Wed, 18 May 2022 16:40:29 +0200 Subject: [PATCH 04/15] drone: Use newer ci image with java 11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Brey --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4f33e4cd6..45b6b5ae6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,7 +4,7 @@ name: generic steps: - name: generic - image: nextcloudci/android:android-44 + image: ghcr.io/nextcloud/continuous-integration-android8:2 commands: - ./gradlew --console=plain assembleGeneric @@ -22,7 +22,7 @@ name: gplay steps: - name: gplay - image: nextcloudci/android:android-44 + image: ghcr.io/nextcloud/continuous-integration-android8:2 commands: - ./gradlew --console=plain assembleGplay @@ -40,7 +40,7 @@ name: tests steps: - name: all - image: nextcloudci/android:android-49 + image: ghcr.io/nextcloud/continuous-integration-android8:2 privileged: true commands: - emulator-headless -avd android-27 -no-snapshot -gpu swiftshader_indirect -no-window -no-audio -skin 500x833 & @@ -80,7 +80,7 @@ name: analysis steps: - name: analysis - image: nextcloudci/android:android-44 + image: ghcr.io/nextcloud/continuous-integration-android8:2 environment: GIT_USERNAME: from_secret: GIT_USERNAME From 19f3716183ddfb7534f951436b5e0b32c8b7060f Mon Sep 17 00:00:00 2001 From: drone Date: Wed, 18 May 2022 15:17:16 +0000 Subject: [PATCH 05/15] Drone: update FindBugs results to reflect reduced error/warning count [skip ci] Signed-off-by: drone --- scripts/analysis/findbugs-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/analysis/findbugs-results.txt b/scripts/analysis/findbugs-results.txt index a14c1ee5a..cde50ca2f 100644 --- a/scripts/analysis/findbugs-results.txt +++ b/scripts/analysis/findbugs-results.txt @@ -1 +1 @@ -180 \ No newline at end of file +179 \ No newline at end of file From 1230aa7773fa671951b02a53cf5ba99786ce12ee Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 18 May 2022 17:26:52 +0200 Subject: [PATCH 06/15] Mark opt-in use of camera2 implementation Signed-off-by: Andy Scherzinger --- .../java/com/nextcloud/talk/activities/TakePhotoActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/nextcloud/talk/activities/TakePhotoActivity.java b/app/src/main/java/com/nextcloud/talk/activities/TakePhotoActivity.java index b68e0dfd9..97ebab83d 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/TakePhotoActivity.java +++ b/app/src/main/java/com/nextcloud/talk/activities/TakePhotoActivity.java @@ -360,6 +360,7 @@ public class TakePhotoActivity extends AppCompatActivity { return rotate; } + @androidx.camera.camera2.interop.ExperimentalCamera2Interop private Preview getPreview(boolean crop) { Preview.Builder previewBuilder = new Preview.Builder() .setTargetAspectRatio(crop ? AspectRatio.RATIO_16_9 : AspectRatio.RATIO_4_3); From 0bbf14a2f02031d58c3b5dab780193203aae9270 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 18 May 2022 17:29:14 +0200 Subject: [PATCH 07/15] remove obsolete sdk version check Signed-off-by: Andy Scherzinger --- .../nextcloud/talk/webrtc/MagicProximitySensor.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/MagicProximitySensor.java b/app/src/main/java/com/nextcloud/talk/webrtc/MagicProximitySensor.java index 364820e06..d91908ce8 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/MagicProximitySensor.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/MagicProximitySensor.java @@ -170,14 +170,11 @@ public class MagicProximitySensor implements SensorEventListener { .append(", resolution: ").append(proximitySensor.getResolution()) .append(", max range: ").append(proximitySensor.getMaximumRange()) .append(", min delay: ").append(proximitySensor.getMinDelay()); - // Added in API level 20. info.append(", type: ").append(proximitySensor.getStringType()); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - // Added in API level 21. - info.append(", max delay: ").append(proximitySensor.getMaxDelay()) - .append(", reporting mode: ").append(proximitySensor.getReportingMode()) - .append(", isWakeUpSensor: ").append(proximitySensor.isWakeUpSensor()); - } + info.append(", max delay: ").append(proximitySensor.getMaxDelay()) + .append(", reporting mode: ").append(proximitySensor.getReportingMode()) + .append(", isWakeUpSensor: ").append(proximitySensor.isWakeUpSensor()); + Log.d(TAG, info.toString()); } } From c5ad7287a4407a05fc44109078b8f7307c8b1925 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 18 May 2022 17:31:45 +0200 Subject: [PATCH 08/15] bump lint score due to gradle updates Signed-off-by: Andy Scherzinger --- 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 d63b4d48a..7eea77ad5 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: 1 error and 104 warnings + Lint Report: 2 error and 130 warnings From d3827aac9fa4d0a3b05dfd90ba5d5adc9272ef2b Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 18 May 2022 17:49:56 +0200 Subject: [PATCH 09/15] Update plugin to 7.2.0 Signed-off-by: Andy Scherzinger --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a076b597f..2018861ec 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' + classpath 'com.android.tools.build:gradle:7.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}" classpath 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.5' classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.20.0" From 2c2d4aa306caee1caecb428102df3b5d5e1ad1db Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 18 May 2022 18:28:04 +0200 Subject: [PATCH 10/15] move lintOptions to lint block Signed-off-by: Andy Scherzinger --- app/build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7bc9438a1..bc4cb401c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -132,16 +132,16 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } - lintOptions { - abortOnError false - htmlReport true - htmlOutput file("$project.buildDir/reports/lint/lint.html") - disable 'MissingTranslation' - } buildFeatures { viewBinding true } + lint { + abortOnError false + disable 'MissingTranslation' + htmlOutput file("$project.buildDir/reports/lint/lint.html") + htmlReport true + } } ext { From c7e204172f5d76cc8656e9e6a6104184668e1087 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 18 May 2022 18:32:26 +0200 Subject: [PATCH 11/15] Migrate packagingOptions exclusions to packagingOptions / resources / exclusions Signed-off-by: Andy Scherzinger --- app/build.gradle | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bc4cb401c..b6abf2ad9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -95,16 +95,20 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - packagingOptions { - exclude 'META-INF/LICENSE.txt' - exclude 'META-INF/LICENSE' - exclude 'META-INF/NOTICE.txt' - exclude 'META-INF/NOTICE' - exclude 'META-INF/DEPENDENCIES' - exclude 'META-INF/rxjava.properties' + resources { + excludes += [ + 'META-INF/LICENSE.txt', + 'META-INF/LICENSE', + 'META-INF/NOTICE.txt', + 'META-INF/NOTICE', + 'META-INF/DEPENDENCIES', + 'META-INF/rxjava.properties' + ] + } } + android.applicationVariants.all { variant -> String variantName = variant.name String capVariantName = variantName.substring(0, 1).toUpperCase(Locale.ROOT) + variantName.substring(1) From 8b699963f3f63860fa9e093748ccacee7b0f38df Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 18 May 2022 18:32:44 +0200 Subject: [PATCH 12/15] replace Annotation Signed-off-by: Andy Scherzinger --- .../java/com/nextcloud/talk/activities/TakePhotoActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/TakePhotoActivity.java b/app/src/main/java/com/nextcloud/talk/activities/TakePhotoActivity.java index 97ebab83d..84b2e2262 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/TakePhotoActivity.java +++ b/app/src/main/java/com/nextcloud/talk/activities/TakePhotoActivity.java @@ -54,8 +54,8 @@ import java.util.concurrent.ExecutionException; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.annotation.OptIn; import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.content.res.AppCompatResources; import androidx.camera.camera2.interop.Camera2Interop; import androidx.camera.core.AspectRatio; import androidx.camera.core.Camera; @@ -360,7 +360,7 @@ public class TakePhotoActivity extends AppCompatActivity { return rotate; } - @androidx.camera.camera2.interop.ExperimentalCamera2Interop + @OptIn(markerClass = androidx.camera.camera2.interop.ExperimentalCamera2Interop.class) private Preview getPreview(boolean crop) { Preview.Builder previewBuilder = new Preview.Builder() .setTargetAspectRatio(crop ? AspectRatio.RATIO_16_9 : AspectRatio.RATIO_4_3); From b7873cdf7a0217c9e9bdad8add46996735b0cb46 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 18 May 2022 18:36:02 +0200 Subject: [PATCH 13/15] bump build tools to 32.0.0 Signed-off-by: Andy Scherzinger --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index b6abf2ad9..991b2ceb4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,7 +36,7 @@ apply plugin: "org.jlleitschuh.gradle.ktlint" android { compileSdkVersion 30 - buildToolsVersion '30.0.3' + buildToolsVersion '32.0.0' defaultConfig { minSdkVersion 21 targetSdkVersion 30 From 9679ca5fb6c94ab853ba778671cfc2977de3917f Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 18 May 2022 18:50:15 +0200 Subject: [PATCH 14/15] remove legacy dexOptions Signed-off-by: Andy Scherzinger --- app/build.gradle | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 991b2ceb4..1af0b66d4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -85,10 +85,6 @@ android { testInstrumentationRunnerArgument "TEST_SERVER_PASSWORD", "${NC_TEST_SERVER_PASSWORD}" } - dexOptions { - javaMaxHeapSize "4g" - } - buildTypes { release { minifyEnabled false From be0a3cf8a1b00d5539f1a088380267ff8608199f Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 18 May 2022 19:06:59 +0200 Subject: [PATCH 15/15] revert detekt plugin update Signed-off-by: Andy Scherzinger --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2018861ec..62bcbc01f 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,7 @@ buildscript { classpath 'com.android.tools.build:gradle:7.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}" classpath 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.5' - classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.20.0" + classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.19.0" classpath "org.jlleitschuh.gradle:ktlint-gradle:10.3.0" // NOTE: Do not place your application dependencies here; they belong