Merge pull request #424 from tzugen/gradle

Remove gradle warning

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

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 {

core/subsonic-api-image-loader/build.gradle

@@ -1,8 +1,15 @@
 apply from: bootstrap.androidModule
 
 android {
-    libraryVariants.all {
+    buildFeatures {
-        generateBuildConfig.enabled = true
+        buildConfig = true
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
     }
 }
 

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",
@@ -17,14 +18,14 @@ ext.versions = [
         androidSupportDesign : "1.2.1",
         constraintLayout     : "2.0.1",
         multidex             : "2.0.1",
-        room                 : "2.2.5",
+        room                 : "2.2.6",
-        kotlin               : "1.3.72",
+        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",
@@ -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",

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
@@ -17,7 +13,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
     }
@@ -39,15 +40,11 @@ android {
         }
     }
 
-    // Disable generating BuildConfig class by default
+    buildFeatures {
-    // Replace it with https://issuetracker.google.com/issues/72050365 once released.
+        buildConfig = false
-    libraryVariants.all {
-        generateBuildConfig.enabled = false
     }
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
 
 tasks.withType(Test) {
     useJUnitPlatform()

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"

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) {
@@ -67,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