Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions buildSrc/src/main/kotlin/Projects.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion coil-base/src/main/java/coil/util/Contexts.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading