From 42967ef45fab1d84ce0c8340ea0bdc4aa3d33c74 Mon Sep 17 00:00:00 2001 From: tzugen Date: Sun, 18 Apr 2021 22:18:41 +0200 Subject: [PATCH 1/5] Remove warning about deprecated 'variant.getGenerateBuildConfig()' --- core/subsonic-api-image-loader/build.gradle | 4 ++-- gradle_scripts/android-module-bootstrap.gradle | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/core/subsonic-api-image-loader/build.gradle b/core/subsonic-api-image-loader/build.gradle index 40c63863..72736d35 100644 --- a/core/subsonic-api-image-loader/build.gradle +++ b/core/subsonic-api-image-loader/build.gradle @@ -1,8 +1,8 @@ apply from: bootstrap.androidModule android { - libraryVariants.all { - generateBuildConfig.enabled = true + buildFeatures { + buildConfig = true } } diff --git a/gradle_scripts/android-module-bootstrap.gradle b/gradle_scripts/android-module-bootstrap.gradle index f80b31c7..96a26cc9 100644 --- a/gradle_scripts/android-module-bootstrap.gradle +++ b/gradle_scripts/android-module-bootstrap.gradle @@ -39,10 +39,8 @@ android { } } - // Disable generating BuildConfig class by default - // Replace it with https://issuetracker.google.com/issues/72050365 once released. - libraryVariants.all { - generateBuildConfig.enabled = false + buildFeatures { + buildConfig = false } } From b5806cbbbf172a7afddb0b587281fbce13c01b2a Mon Sep 17 00:00:00 2001 From: tzugen Date: Sun, 18 Apr 2021 22:21:34 +0200 Subject: [PATCH 2/5] Set language level 1.8 correctly also to Kotlin compiler, removed unused variables. --- core/library/build.gradle | 7 +++++++ core/subsonic-api-image-loader/build.gradle | 7 +++++++ gradle_scripts/android-module-bootstrap.gradle | 7 +++++-- gradle_scripts/kotlin-module-bootstrap.gradle | 3 --- ultrasonic/build.gradle | 4 ++++ 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/core/library/build.gradle b/core/library/build.gradle index 6f63a004..0a7ec71e 100644 --- a/core/library/build.gradle +++ b/core/library/build.gradle @@ -6,6 +6,13 @@ android { baselineFile file("lint-baseline.xml") abortOnError true } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } } dependencies { diff --git a/core/subsonic-api-image-loader/build.gradle b/core/subsonic-api-image-loader/build.gradle index 72736d35..dc8324b7 100644 --- a/core/subsonic-api-image-loader/build.gradle +++ b/core/subsonic-api-image-loader/build.gradle @@ -4,6 +4,13 @@ android { buildFeatures { buildConfig = true } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } } dependencies { diff --git a/gradle_scripts/android-module-bootstrap.gradle b/gradle_scripts/android-module-bootstrap.gradle index 96a26cc9..bea1ddaa 100644 --- a/gradle_scripts/android-module-bootstrap.gradle +++ b/gradle_scripts/android-module-bootstrap.gradle @@ -17,7 +17,12 @@ android { targetSdkVersion versions.targetSdk } + kotlinOptions { + jvmTarget = "1.8" + } + compileOptions { + // Sets Java compatibility to Java 8 sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } @@ -44,8 +49,6 @@ android { } } -sourceCompatibility = JavaVersion.VERSION_1_8 -targetCompatibility = JavaVersion.VERSION_1_8 tasks.withType(Test) { useJUnitPlatform() diff --git a/gradle_scripts/kotlin-module-bootstrap.gradle b/gradle_scripts/kotlin-module-bootstrap.gradle index 1c406a2a..7dc53a05 100644 --- a/gradle_scripts/kotlin-module-bootstrap.gradle +++ b/gradle_scripts/kotlin-module-bootstrap.gradle @@ -3,9 +3,6 @@ apply plugin: 'kotlin' apply plugin: 'jacoco' apply from: "${project.rootDir}/gradle_scripts/code_quality.gradle" -sourceCompatibility = JavaVersion.VERSION_1_8 -targetCompatibility = JavaVersion.VERSION_1_8 - sourceSets { main.java.srcDirs += "${projectDir}/src/main/kotlin" test.java.srcDirs += "${projectDir}/src/test/kotlin" diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle index 6c64e17a..a1a1b99d 100644 --- a/ultrasonic/build.gradle +++ b/ultrasonic/build.gradle @@ -54,6 +54,10 @@ android { kotlinOptions { jvmTarget = "1.8" } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } tasks.withType(Test) { From f1ce568b5ed72d5d31b7ed3bde08944fd016c2b2 Mon Sep 17 00:00:00 2001 From: tzugen Date: Mon, 19 Apr 2021 11:59:47 +0200 Subject: [PATCH 3/5] Update kotlin, room, okhttp --- dependencies.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 91a1951b..8f84cf07 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -17,14 +17,14 @@ ext.versions = [ androidSupportDesign : "1.2.1", constraintLayout : "2.0.1", multidex : "2.0.1", - room : "2.2.5", - kotlin : "1.3.72", + room : "2.2.6", + kotlin : "1.4.32", kotlinxCoroutines : "1.3.9", viewModelKtx : "2.2.0", retrofit : "2.4.0", jackson : "2.9.5", - okhttp : "3.10.0", + okhttp : "3.14.9", semver : "1.0.0", twitterSerial : "0.1.6", koin : "2.2.2", From 9cb2ed335610974d51ce76df552343dfc7533e95 Mon Sep 17 00:00:00 2001 From: tzugen Date: Sat, 17 Apr 2021 14:32:04 +0200 Subject: [PATCH 4/5] Update gradle plugin and androidxcore We need core at 1.5.0-rc01 to be able to clearActions() --- build.gradle | 2 +- dependencies.gradle | 6 ++++-- ultrasonic/build.gradle | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 8f012662..96f03ef1 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { maven { url "https://plugins.gradle.org/m2/" } } dependencies { - classpath gradlePlugins.androidTools + classpath gradlePlugins.gradle classpath gradlePlugins.kotlin classpath gradlePlugins.ktlintGradle classpath gradlePlugins.detekt diff --git a/dependencies.gradle b/dependencies.gradle index 8f84cf07..907d1699 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -5,7 +5,8 @@ ext.versions = [ gradle : '6.5', navigation : "2.3.2", - androidTools : "4.0.0", + gradlePlugin : "4.1.2", + androidxcore : "1.5.0-rc01", ktlint : "0.37.1", ktlintGradle : "9.2.1", detekt : "1.0.0.RC6-4", @@ -44,7 +45,7 @@ ext.versions = [ ] ext.gradlePlugins = [ - androidTools : "com.android.tools.build:gradle:$versions.androidTools", + gradle : "com.android.tools.build:gradle:$versions.gradlePlugin", kotlin : "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin", ktlintGradle : "org.jlleitschuh.gradle:ktlint-gradle:$versions.ktlintGradle", detekt : "gradle.plugin.io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$versions.detekt", @@ -52,6 +53,7 @@ ext.gradlePlugins = [ ] ext.androidSupport = [ + core : "androidx.core:core-ktx:$versions.androidxcore", support : "androidx.legacy:legacy-support-v4:$versions.androidLegacySupport", design : "com.google.android.material:material:$versions.androidSupportDesign", annotations : "com.android.support:support-annotations:$versions.androidSupport", diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle index a1a1b99d..ec595e98 100644 --- a/ultrasonic/build.gradle +++ b/ultrasonic/build.gradle @@ -71,6 +71,7 @@ dependencies { implementation project(':core:subsonic-api-image-loader') implementation project(':core:cache') + implementation androidSupport.core implementation androidSupport.support implementation androidSupport.design implementation androidSupport.multidex From d0ad8cef7d35213aa15413f6e98488a7c0f4c289 Mon Sep 17 00:00:00 2001 From: tzugen Date: Mon, 19 Apr 2021 12:21:02 +0200 Subject: [PATCH 5/5] Remove deprecated kotlin-android-extension plugin --- gradle_scripts/android-module-bootstrap.gradle | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gradle_scripts/android-module-bootstrap.gradle b/gradle_scripts/android-module-bootstrap.gradle index bea1ddaa..f9fa091a 100644 --- a/gradle_scripts/android-module-bootstrap.gradle +++ b/gradle_scripts/android-module-bootstrap.gradle @@ -1,12 +1,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' apply plugin: 'jacoco' apply from: "${project.rootDir}/gradle_scripts/code_quality.gradle" -androidExtensions { - experimental = true -} android { compileSdkVersion versions.compileSdk