Skip to content
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
17 changes: 14 additions & 3 deletions packages/kotlin/src/android/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import com.android.build.api.variant.HostTestBuilder
import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import java.io.FileInputStream
import java.util.Properties

plugins {
// AGP 9+ has built-in Kotlin support; a separate kotlin-android plugin is no
// longer applied. See https://issuetracker.google.com/438678642.
alias(libs.plugins.android.library)
alias(libs.plugins.jetbrains.kotlin.android)
alias(libs.plugins.dokka)
alias(libs.plugins.mavenPublish)
`maven-publish`
Expand Down Expand Up @@ -81,15 +83,24 @@ kotlin {
}
}

// AGP 9 only generates unit-test tasks for the debug variant by default. Our
// pipeline runs tests against the release variant (matches published artifact),
// so enable the release host unit-test explicitly.
androidComponents {
beforeVariants(selector().withBuildType("release")) { variantBuilder ->
variantBuilder.hostTests[HostTestBuilder.UNIT_TEST_TYPE]?.enable = true
}
}

android {
namespace = project.group.toString()
compileSdk = 34
compileSdk = 37

defaultConfig {
minSdk = 26
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
aarMetadata {
minCompileSdk = 34
minCompileSdk = 37
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/kotlin/src/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
agp = "8.12.3"
agp = "9.3.1"
kotlin = "2.4.10"

kotlinx-coroutines = "1.11.0"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading