Bump com.android.tools.build:gradle from 8.0.2 to 8.1.0 (#1825)

* Bump com.android.tools.build:gradle from 8.0.2 to 8.1.0 Bumps com.android.tools.build:gradle from 8.0.2 to 8.1.0. --- updated-dependencies: - dependency-name: com.android.tools.build:gradle dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Fix issues. * Assemble debug only for now. * Revert. --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Colin White <[email protected]>
coil-kt · Jul 25, 2023 · 34ae727 · 34ae727
1 parent d97de00
commit 34ae727
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -40,7 +40,7 @@ jobs:
               run: ./gradlew apiCheck || { exit_code=$?; printf "*** This PR changes Coil's public API. If this change is intentional, run './gradlew apiDump' and commit the new API files. ***"; exit $exit_code; }
 
             - name: Check assemble
-              run: ./gradlew assemble
+              run: ./gradlew assembleDebug
 
     unit-tests:
         name: Unit tests

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -60,7 +60,8 @@ allprojects {
     }
 
     tasks.withType<DokkaTaskPartial>().configureEach {
-        @Suppress("DEPRECATION") // https://github.com/Kotlin/dokka/issues/2993
+        // https://github.com/Kotlin/dokka/issues/2993
+        @Suppress("DEPRECATION", "KotlinRedundantDiagnosticSuppress")
         dokkaSourceSets.configureEach {
             jdkVersion by 8
             failOnWarning by true

diff --git a/buildSrc/src/main/kotlin/Projects.kt b/buildSrc/src/main/kotlin/Projects.kt
@@ -8,12 +8,10 @@ import com.android.build.gradle.TestExtension
 import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
 import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
-import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.withType
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 fun Project.setupLibraryModule(
@@ -143,5 +141,5 @@ private fun Project.kotlin(action: KotlinJvmCompile.() -> Unit) {
 }
 
 private fun BaseExtension.lint(action: Lint.() -> Unit) {
-    (this as CommonExtension<*, *, *, *>).lint(action)
+    (this as CommonExtension<*, *, *, *, *>).lint(action)
 }
diff --git a/coil-base/src/main/java/coil/util/Contexts.kt b/coil-base/src/main/java/coil/util/Contexts.kt
@@ -35,7 +35,7 @@ internal fun Resources.getDrawableCompat(@DrawableRes resId: Int, theme: Resourc
  *
  * Prefer using [Context.getDrawableCompat] for resources that are part of the current package.
  */
-internal fun Context.getXmlDrawableCompat(resources: Resources, @XmlRes resId: Int): Drawable {
+internal fun Context.getXmlDrawableCompat(resources: Resources, @XmlRes @DrawableRes resId: Int): Drawable {
     // Find the XML's start tag.
     val parser = resources.getXml(resId)
     var type = parser.next()

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ dokka = "org.jetbrains.dokka:1.8.20"
 spotless = "com.diffplug.spotless:6.20.0"
 
 [libraries]
-gradlePlugin-android = "com.android.tools.build:gradle:8.0.2"
+gradlePlugin-android = "com.android.tools.build:gradle:8.1.0"
 gradlePlugin-kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
 gradlePlugin-mavenPublish = "com.vanniktech:gradle-maven-publish-plugin:0.25.3"
 gradlePlugin-paparazzi = "app.cash.paparazzi:paparazzi-gradle-plugin:1.3.1"