Skip to content

Update to Android Gradle Plugin 9.0.1 #481

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.

Sign up for GitHub

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

Open
inktomi wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update to Android Gradle Plugin 9.0.1 #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f766039
Applied Android Studio JVM migration
inktomi Mar 2, 2026
ade5d9f
Updated project to use Android Gradle Plugin 9.0.1. Fixes #478
inktomi Mar 2, 2026
4a086dc
Lint fixes - converting runAndFail() functions from block body to exp…
inktomi Mar 2, 2026
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
1 change: 0 additions & 1 deletion android-library-no-tests/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id("com.android.library")
kotlin("android")
}

android {
Expand Down
3 changes: 1 addition & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ buildscript {

plugins {
alias(libs.plugins.agp) apply false
alias(libs.plugins.kgp) apply false
alias(libs.plugins.ben.manes.versions)
id "com.osacky.fulladle"
alias(libs.plugins.kotlinter)
Expand All @@ -22,7 +21,7 @@ fladle {
}

tasks.wrapper.configure {
gradleVersion = '8.14.3'
gradleVersion = '9.1.0'
}

def isNonStable = { String version ->
Expand Down
18 changes: 9 additions & 9 deletions fladle-plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ plugins {
alias(libs.plugins.vanniktech.publish)
}

// See https://github.com/slackhq/keeper/pull/11#issuecomment-579544375 for context
val isReleaseMode : Boolean = hasProperty("fladle.releaseMode")

dependencies {
compileOnly(gradleApi())
if (isReleaseMode) {
compileOnly(libs.agp)
} else {
implementation(libs.agp)
compileOnly(libs.agp) {
exclude(group = "org.jetbrains.kotlin", module = "kotlin-compiler-embeddable")
exclude(group = "org.jetbrains.kotlin", module = "kotlin-compiler-runner")
}
compileOnly(libs.gradle.enterprise)

// AGP must be on the runtime classpath so GradleTestKit's withPluginClasspath()
// can resolve the com.android.application and com.android.library plugins.
runtimeOnly(libs.agp)

testImplementation(gradleTestKit())
testImplementation(libs.junit)
testImplementation(libs.truth)
Expand Down Expand Up @@ -106,8 +106,8 @@ tasks.withType(ValidatePlugins::class.java).configureEach {
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class.java).configureEach {
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
languageVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_7)
apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_7)
languageVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
}
}

Expand Down
4 changes: 4 additions & 0 deletions fladle-plugin/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
rootProject.name = "fladle"

plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
}

dependencyResolutionManagement {
versionCatalogs {
create("libs") {
Expand Down
7 changes: 3 additions & 4 deletions fladle-plugin/src/main/java/com/osacky/flank/gradle/FladleConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,11 @@ interface FladleConfig {
@get:Input
val testTargets: ListProperty<String>

// The maximum number of shards. Value will be overwritten by [maxTestShards] if both used in configuration
@Deprecated(
message = "testShards is deprecated. Use maxTestShards instead",
replaceWith = ReplaceWith("maxTestShards"),
)
/**
* The maximum number of shards. Value will be overwritten by [maxTestShards] if both used in configuration
*/
@get:Input
@get:Optional
val testShards: Property<Int>
Expand Down Expand Up @@ -473,7 +471,8 @@ interface FladleConfig {

@Internal
fun getPresentProperties() =
this::class.memberProperties
this::class
.memberProperties
.filter {
when (val prop = it.call(this)) {
is Property<*> -> prop.isPresent
Expand Down
Loading