Migrate to AGP 7 and update to Gradle 6.8.2

This is needed to get started with Compose

Author: jossiwolf

app/build.gradle.kts

@@ -21,13 +21,13 @@ android {
         }
     }
 
-    lintOptions {
+    lint {
         disable("ResourceName", "MissingTranslation", "DuplicateStrings")
     }
 
     compileOptions {
-        setSourceCompatibility(JavaVersion.VERSION_1_8)
-        setTargetCompatibility(JavaVersion.VERSION_1_8)
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 }
 

auth/build.gradle.kts

@@ -1,5 +1,3 @@
-import com.android.build.gradle.internal.dsl.TestOptions
-
 android {
     buildTypes {
         named("release").configure {
@@ -8,7 +6,7 @@ android {
         }
     }
 
-    lintOptions {
+    lint {
         disable("UnusedQuantity")
         disable("UnknownNullness")  // TODO fix in future PR
         disable("TypographyQuotes") // Straight versus directional quotes
@@ -19,9 +17,9 @@ android {
     }
 
     testOptions {
-        unitTests(closureOf<TestOptions.UnitTestOptions> {
+        unitTests {
             isIncludeAndroidResources = true
-        })
+        }
     }
 }
 

build.gradle.kts

@@ -88,7 +88,7 @@ fun Project.configureAndroid() {
             minSdkVersion(Config.SdkVersions.min)
             targetSdkVersion(Config.SdkVersions.target)
 
-            versionName = Config.version
+            buildConfigField("String", "VERSION_NAME", "\"${Config.version}\"")
             versionCode = 1
 
             resourcePrefix("fui_")
@@ -132,7 +132,7 @@ fun Project.configureQuality() {
 
 fun Project.setupPublishing() {
     val sourcesJar = tasks.register<Jar>("sourcesJar") {
-        classifier = "sources"
+        archiveClassifier.set("sources")
         from(project.the<BaseExtension>().sourceSets["main"].java.srcDirs)
     }
 
@@ -141,7 +141,8 @@ fun Project.setupPublishing() {
         classpath += files(project.the<BaseExtension>().bootClasspath)
 
         project.the<LibraryExtension>().libraryVariants.configureEach {
-            dependsOn(assemble)
+            dependsOn(assembleProvider)
+            // TODO 07.03.2021: Migrate to lazy task API
             classpath += files((javaCompiler as AbstractCompile).classpath)
         }
 
@@ -151,7 +152,7 @@ fun Project.setupPublishing() {
 
     val javadocJar = tasks.register<Jar>("javadocJar") {
         dependsOn(javadoc)
-        classifier = "javadoc"
+        archiveClassifier.set("javadoc")
         from(javadoc.get().destinationDir)
     }
 

buildSrc/src/main/kotlin/Config.kt

@@ -11,7 +11,7 @@ object Config {
     }
 
     object Plugins {
-        const val android = "com.android.tools.build:gradle:4.0.0"
+        const val android = "com.android.tools.build:gradle:7.0.0-alpha08"
         const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         const val google = "com.google.gms:google-services:4.3.3"
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

library/build.gradle.kts

@@ -1,7 +1,7 @@
 tasks.named("check").configure { dependsOn("testAll", "prepareArtifacts") }
 
 android {
-    lintOptions {
+    lint {
         isAbortOnError = false
     }
 }