From 93fb40f3235422c244e0c3575893763ab0f97f7e Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 2 Jul 2020 11:29:00 +0200 Subject: [PATCH 1/5] (re-)Enable abortOnError for lint And fix a first issue (on unused code) --- vector/build.gradle | 3 +-- .../vector/riotx/features/form/FormEditTextWithButtonItem.kt | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vector/build.gradle b/vector/build.gradle index e497b156ae..92e7239dbf 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -232,8 +232,7 @@ android { lintOptions { lintConfig file("lint.xml") - // TODO Restore true once pb with WorkManager is fixed - abortOnError false + abortOnError true } compileOptions { diff --git a/vector/src/main/java/im/vector/riotx/features/form/FormEditTextWithButtonItem.kt b/vector/src/main/java/im/vector/riotx/features/form/FormEditTextWithButtonItem.kt index 0650c0f55c..799f6abe00 100644 --- a/vector/src/main/java/im/vector/riotx/features/form/FormEditTextWithButtonItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/form/FormEditTextWithButtonItem.kt @@ -56,6 +56,7 @@ abstract class FormEditTextWithButtonItem : VectorEpoxyModel Date: Thu, 2 Jul 2020 12:17:09 +0200 Subject: [PATCH 2/5] Clean code --- .../java/im/vector/riotx/VectorApplication.kt | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/vector/src/main/java/im/vector/riotx/VectorApplication.kt b/vector/src/main/java/im/vector/riotx/VectorApplication.kt index d0a3174227..ab7c3e1bf7 100644 --- a/vector/src/main/java/im/vector/riotx/VectorApplication.kt +++ b/vector/src/main/java/im/vector/riotx/VectorApplication.kt @@ -63,7 +63,13 @@ import java.util.Locale import java.util.concurrent.Executors import javax.inject.Inject -class VectorApplication : Application(), HasVectorInjector, MatrixConfiguration.Provider, androidx.work.Configuration.Provider { +import androidx.work.Configuration as WorkConfiguration + +class VectorApplication : + Application(), + HasVectorInjector, + MatrixConfiguration.Provider, + WorkConfiguration.Provider { lateinit var appContext: Context @Inject lateinit var legacySessionImporter: LegacySessionImporter @@ -85,6 +91,7 @@ class VectorApplication : Application(), HasVectorInjector, MatrixConfiguration. @Inject lateinit var webRtcPeerConnectionManager: WebRtcPeerConnectionManager lateinit var vectorComponent: VectorComponent + // font thread handler private var fontThreadHandler: Handler? = null @@ -157,7 +164,11 @@ class VectorApplication : Application(), HasVectorInjector, MatrixConfiguration. override fun providesMatrixConfiguration() = MatrixConfiguration(BuildConfig.FLAVOR_DESCRIPTION) - override fun getWorkManagerConfiguration() = androidx.work.Configuration.Builder().setExecutor(Executors.newCachedThreadPool()).build() + override fun getWorkManagerConfiguration(): WorkConfiguration { + return WorkConfiguration.Builder() + .setExecutor(Executors.newCachedThreadPool()) + .build() + } override fun injector(): VectorComponent { return vectorComponent From 1de819b0a3ab6dd3d4e878ed831c3416ce45de59 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 2 Jul 2020 12:21:23 +0200 Subject: [PATCH 3/5] Fix lint false-positive about WorkManger (#1012) --- CHANGES.md | 2 +- matrix-sdk-android/src/main/AndroidManifest.xml | 6 ------ vector/src/main/AndroidManifest.xml | 6 ++++++ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 4a7d0d70af..378ea2279a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,7 +17,7 @@ SDK API changes ⚠️: - Build 🧱: - - + - Fix lint false-positive about WorkManger (#1012) Other changes: - diff --git a/matrix-sdk-android/src/main/AndroidManifest.xml b/matrix-sdk-android/src/main/AndroidManifest.xml index 94b2db2bf1..c02f34f1c9 100644 --- a/matrix-sdk-android/src/main/AndroidManifest.xml +++ b/matrix-sdk-android/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ @@ -8,11 +7,6 @@ - + + + Date: Thu, 2 Jul 2020 12:44:07 +0200 Subject: [PATCH 4/5] Upgrade build-tools from 3.5.3 to 3.6.6 and gradle from 5.4.1 to 5.6.4 --- CHANGES.md | 2 ++ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 378ea2279a..3555894bf4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -18,6 +18,8 @@ SDK API changes ⚠️: Build 🧱: - Fix lint false-positive about WorkManger (#1012) + - Upgrade build-tools from 3.5.3 to 3.6.6 + - Upgrade gradle from 5.4.1 to 5.6.4 Other changes: - diff --git a/build.gradle b/build.gradle index 74a62f0d17..5f1fa78620 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:3.5.3' + classpath 'com.android.tools.build:gradle:3.6.3' classpath 'com.google.gms:google-services:4.3.2' classpath "com.airbnb.okreplay:gradle-plugin:1.5.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 51b92600a0..4da2435f42 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Sep 27 10:10:35 CEST 2019 +#Thu Jul 02 12:33:07 CEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip From d4050a7b9d18a92b56960c192d5662f2b48184ba Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 2 Jul 2020 23:39:42 +0200 Subject: [PATCH 5/5] Due to a bug introduced in Android gradle plugin 3.6.0, we have to specify the ndk version to use --- vector/build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vector/build.gradle b/vector/build.gradle index 92e7239dbf..f966f441b2 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -106,6 +106,11 @@ def buildNumber = System.env.BUILDKITE_BUILD_NUMBER as Integer ?: 0 android { compileSdkVersion 29 + + // Due to a bug introduced in Android gradle plugin 3.6.0, we have to specify the ndk version to use + // Ref: https://issuetracker.google.com/issues/144111441 + ndkVersion "21.3.6528147" + defaultConfig { applicationId "im.vector.app" // Set to API 21: see #405