Merge pull request #928 from CruGlobal/renovate/com.android.tools.build-gradle-7.x

Update dependency com.android.tools.build:gradle to v7

Author: frett

.github/workflows/build.yml

@@ -52,11 +52,6 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
-      - name: Setup Java JDK
-        uses: actions/[email protected]
-        with:
-          distribution: 'adopt'
-          java-version: '8'
       - name: Cache Gradle
         uses: actions/cache@v2
         with:

build.gradle

@@ -7,7 +7,7 @@ buildscript {
             dagger              : '2.38.1',
             eventbus            : '3.2.0',
             facebookFlipper     : '0.100.0',
-            gradleAndroidPlugin : '4.2.2',
+            gradleAndroidPlugin : '7.0.0',
             gson                : '2.8.6',
             guava               : '30.1.1-android',
             hamcrest            : '2.2',
@@ -126,24 +126,21 @@ configure(subprojects.findAll { it.path.contains("gto-support") }) {
                 sourceCompatibility JavaVersion.VERSION_1_8
                 targetCompatibility JavaVersion.VERSION_1_8
             }
-            dexOptions {
-                preDexLibraries !project.hasProperty('disablePreDex')
-            }
             kotlinOptions {
                 jvmTarget = JavaVersion.VERSION_1_8.toString()
                 freeCompilerArgs += '-Xjvm-default=all'
             }
+            lintOptions {
+                // HACK: disable Timber lint checks until https://github.com/JakeWharton/timber/issues/408 is fixed
+                disable 'LogNotTimber','StringFormatInTimber','ThrowableNotAtBeginning','BinaryOperationInTimber','TimberArgCount','TimberArgTypes','TimberTagLength','TimberExceptionLogging'
+            }
             testOptions {
                 unitTests {
                     includeAndroidResources = true
 
                     all {
                         // increase unit tests max heap size
                         jvmArgs "-Xmx2g"
-
-                        // enable only SDKs we actually support in robolectric
-                        // TODO: SDK >= 29 requires Java 9 which we don't currently support
-                        systemProperty 'robolectric.enabledSdks', (android.defaultConfig.minSdkVersion.apiLevel..28).join(" ")
                     }
                 }
             }
@@ -177,6 +174,7 @@ configure(subprojects.findAll { it.path.contains("gto-support") }) {
                 force "androidx.lifecycle:lifecycle-viewmodel-savedstate:${deps.androidX.lifecycle}"
                 force "com.squareup.okio:okio:${deps.okio}"
                 force "junit:junit:${deps.junit}"
+                force "org.jetbrains.kotlinx:kotlinx-coroutines-core:${deps.kotlinCoroutines}"
                 force "org.jetbrains:annotations:${deps.jetbrainsAnnotations}"
 
                 dependencySubstitution {
@@ -267,6 +265,13 @@ junitJacoco {
     jacocoVersion = deps.jacoco
     includeNoLocationClasses = true
 }
+allprojects {
+    afterEvaluate {
+        tasks.withType(Test) {
+            jacoco.excludes = ['jdk.internal.*']
+        }
+    }
+}
 task jacocoTestReport {
     subprojects.each { dependsOn(it.tasks.withType(JacocoReport)) }
 }

gto-support-androidx-collection/src/test/resources/robolectric.properties

@@ -11,4 +11,5 @@ dependencies {
     api "androidx.viewpager2:viewpager2:${deps.androidX.viewPager2}"
 
     compileOnly "androidx.databinding:databinding-adapters:${deps.androidX.databinding}"
+    compileOnly "androidx.databinding:databinding-runtime:${deps.androidX.databinding}"
 }

gto-support-androidx-lifecycle/src/test/resources/robolectric.properties

@@ -27,11 +27,9 @@ import org.junit.runner.RunWith
 import org.mockito.internal.stubbing.answers.ClonesArguments
 import org.mockito.verification.VerificationMode
 import org.robolectric.Shadows.shadowOf
-import org.robolectric.annotation.Config
 import org.robolectric.shadows.ShadowLooper
 
 @RunWith(AndroidJUnit4::class)
-@Config(sdk = [19, 28])
 class PrimaryItemChangeObserverTest {
     @get:Rule
     val activityScenario = ActivityScenarioRule(Activity::class.java)

gto-support-androidx-viewpager2/build.gradle

@@ -18,9 +18,10 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
+import org.robolectric.annotation.Config.TARGET_SDK
 
 @RunWith(AndroidJUnit4::class)
-@Config(sdk = [19, 21, 28])
+@Config(sdk = [21, TARGET_SDK])
 class ViewPager2HeightWrapContentTest {
     private lateinit var framelayout: FrameLayout
     private lateinit var viewpager: ViewPager2

gto-support-androidx-viewpager2/src/test/java/org/ccci/gto/android/common/androidx/viewpager2/adapter/PrimaryItemChangeObserverTest.kt

@@ -14,9 +14,10 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
+import org.robolectric.annotation.Config.TARGET_SDK
 
 @RunWith(AndroidJUnit4::class)
-@Config(sdk = [19, 21, 28])
+@Config(sdk = [21, TARGET_SDK])
 class ViewPager2MaintainVisibleItemTest {
     private lateinit var viewpager: ViewPager2
     private lateinit var adapter: ItemsAdapter

gto-support-androidx-viewpager2/src/test/java/org/ccci/gto/android/common/androidx/viewpager2/widget/ViewPager2HeightWrapContentTest.kt

@@ -1,5 +1,6 @@
 package org.ccci.gto.android.common.db
 
+import android.annotation.SuppressLint
 import android.database.sqlite.SQLiteDatabase
 import androidx.concurrent.futures.CallbackToFutureAdapter
 import com.google.common.util.concurrent.ListenableFuture
@@ -25,6 +26,7 @@ interface AsyncDao : Dao {
 
     companion object {
         @JvmSynthetic
+        @SuppressLint("RestrictedApi")
         inline fun <T> AsyncDao.runAsync(crossinline block: () -> T): ListenableFuture<T> =
             CallbackToFutureAdapter.getFuture<T> {
                 backgroundExecutor.execute {

gto-support-androidx-viewpager2/src/test/java/org/ccci/gto/android/common/androidx/viewpager2/widget/ViewPager2MaintainVisibleItemTest.kt

@@ -1,11 +1,13 @@
 package org.ccci.gto.android.common.db
 
+import android.annotation.SuppressLint
 import android.os.Parcelable
 import androidx.annotation.RestrictTo
 import kotlinx.android.parcel.IgnoredOnParcel
 import kotlinx.android.parcel.Parcelize
 
 @Parcelize
+@SuppressLint("SupportAnnotationUsage")
 data class Join<S : Any, T : Any> private constructor(
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) val target: Table<T>,
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) val base: Join<S, *>? = null,

gto-support-core/src/test/resources/robolectric.properties

@@ -1,9 +1,11 @@
 package org.ccci.gto.android.common.db
 
+import android.annotation.SuppressLint
 import androidx.annotation.RestrictTo
 import androidx.annotation.VisibleForTesting
 import org.ccci.gto.android.common.db.AbstractDao.Companion.bindValues
 
+@SuppressLint("SupportAnnotationUsage")
 data class Query<T : Any> private constructor(
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     val table: Table<T>,

gto-support-dagger/src/test/resources/robolectric.properties

@@ -1,11 +1,13 @@
 package org.ccci.gto.android.common.db
 
+import android.annotation.SuppressLint
 import android.os.Parcelable
 import androidx.annotation.RestrictTo
 import kotlinx.android.parcel.IgnoredOnParcel
 import kotlinx.android.parcel.Parcelize
 
 @Parcelize
+@SuppressLint("SupportAnnotationUsage")
 data class Table<T : Any> internal constructor(
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) val type: Class<T>,
     private val alias: String? = null

gto-support-db-async/src/main/java/org/ccci/gto/android/common/db/AsyncDao.kt

@@ -18,5 +18,6 @@ dependencies {
     implementation "androidx.appcompat:appcompat:${deps.androidX.appCompat}"
 
     compileOnly "androidx.databinding:databinding-adapters:${deps.androidX.databinding}"
+    compileOnly "androidx.databinding:databinding-runtime:${deps.androidX.databinding}"
     compileOnly "com.squareup.okio:okio:${deps.okio}"
 }

gto-support-db/src/main/java/org/ccci/gto/android/common/db/Join.kt

@@ -17,9 +17,10 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.Robolectric
 import org.robolectric.annotation.Config
+import org.robolectric.annotation.Config.TARGET_SDK
 
 @RunWith(AndroidJUnit4::class)
-@Config(sdk = [16, 17, 23, 24, 28])
+@Config(sdk = [21, 23, 24, TARGET_SDK])
 class ContextTest {
     private lateinit var context: Context