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
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import com.android.build.api.dsl.ApplicationExtension
import common.BuildTypes
import common.SdkVersions
import common.addDefaultRobolectricConfig
import common.configureAndroidApplication
import org.gradle.api.Plugin
import org.gradle.api.Project
Expand Down Expand Up @@ -51,6 +52,7 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
unitTests.isIncludeAndroidResources = true
execution = "ANDROIDX_TEST_ORCHESTRATOR"
animationsDisabled = true
unitTests.all { testTask -> addDefaultRobolectricConfig(target, testTask) }
}

bundle.language.enableSplit = false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import com.android.build.api.dsl.LibraryExtension
import common.addDefaultRobolectricConfig
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.configure
Expand All @@ -16,6 +17,7 @@ class TestingUnitConventionPlugin : Plugin<Project> {
testOptions {
unitTests.isReturnDefaultValues = true
unitTests.isIncludeAndroidResources = true
unitTests.all { testTask -> addDefaultRobolectricConfig(target, testTask) }
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ internal fun Project.configureKotlinCompiler() {

internal fun Project.configureAndroidApplication(extension: ApplicationExtension) {
extension.apply {
compileSdk = SdkVersions.TARGET
compileSdk = SdkVersions.COMPILE

defaultConfig {
minSdk = SdkVersions.MIN
Expand All @@ -38,7 +38,7 @@ internal fun Project.configureAndroidApplication(extension: ApplicationExtension

internal fun Project.configureAndroidLibrary(extension: LibraryExtension) {
extension.apply {
compileSdk = SdkVersions.TARGET
compileSdk = SdkVersions.COMPILE

defaultConfig {
minSdk = SdkVersions.MIN
Expand Down
24 changes: 24 additions & 0 deletions build-logic/convention/src/main/kotlin/common/RobolectricConfig.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package common

import org.gradle.api.Project
import org.gradle.api.tasks.testing.Test
import java.io.File

/**
* Injects a default robolectric.properties into the test task classpath if the module doesn't
* provide its own. This prevents Robolectric from failing when targetSdkVersion exceeds its max
* supported SDK. Module-specific files in src/test/resources/ always take priority.
*/
fun addDefaultRobolectricConfig(project: Project, testTask: Test) {
if (project.file("src/test/resources/robolectric.properties").exists()) return

val generatedDir = project.layout.buildDirectory.dir("generated/robolectric")
testTask.doFirst {
val dir = generatedDir.get().asFile
dir.mkdirs()
File(dir, "robolectric.properties").apply {
if (!exists()) writeText("sdk=28\ninstrumentedPackages=androidx.loader.content\n")
}
}
testTask.classpath = project.files(generatedDir) + testTask.classpath
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import org.gradle.api.JavaVersion

object SdkVersions {
const val MIN = 23
const val COMPILE = 37
const val TARGET = 36

val JAVA_TARGET = JavaVersion.VERSION_21
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ kotlin_serialization_version = "1.11.0"

android_gradlePlugin_version = "9.2.1"
androidx_version = "1.7.0"
androidx_core_version = "1.18.0"
androidx_core_version = "1.19.0"
androidx_app_compat_version = "1.7.1"
androidx_fragment_version = "1.8.9"
androidx_navigation_version = "2.9.8"
Expand Down
3 changes: 0 additions & 3 deletions id/src/test/resources/robolectric.properties

This file was deleted.

3 changes: 0 additions & 3 deletions infra/events/src/test/resources/robolectric.properties

This file was deleted.