Skip to content

bump agp 8 version for tests #5549

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
eymar wants to merge 2 commits into
base: master
Choose a base branch
from
+17 −21
Open

bump agp 8 version for tests #5549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8050c1b
bump agp 8 version for tests
eymar Mar 3, 2026
f42b32b
run only 1 test class
eymar Mar 3, 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
6 changes: 3 additions & 3 deletions .github/workflows/gradle-plugin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ['ubuntu-24.04', 'macos-15-xlarge', 'windows-2022']
os: ['windows-2022']
gradle: ['8.13', '9.3.0']
agp: ['8.12.3', '9.0.0']
agp: ['8.13.2', '9.0.0']
runs-on: ${{ matrix.os }}
steps:
- name: Checkout Repository
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
working-directory: gradle-plugins
run: |
./gradlew assemble
./gradlew --continue :preview-rpc:test :compose:test ':compose:test-Gradle(${{ matrix.gradle }})-Agp(${{ matrix.agp }})'
./gradlew --continue :preview-rpc:test :compose:test ':compose:test-Gradle(${{ matrix.gradle }})-Agp(${{ matrix.agp }})' --tests "org.jetbrains.compose.test.tests.integration.WebCompatibilityDistributionTest"

- name: Upload Reports
uses: actions/upload-artifact@v4
Expand Down
30 changes: 13 additions & 17 deletions ...ins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,25 +450,21 @@ class ResourcesTest : GradlePluginTestBase() {
}
}

// TODO: remove skip after https://youtrack.jetbrains.com/issue/CMP-9845/
val skipWebCheck = currentOS == OS.Windows && defaultTestEnvironment.agpVersion.contains("8.12.3")
if (!skipWebCheck) {
gradle(":webApp:build").checks {
check.taskSuccessful(":sharedUI:wasmJsCopyHierarchicalMultiplatformResources")
check.taskSuccessful(":sharedUI:jsCopyHierarchicalMultiplatformResources")

val jsBuildDir = file("webApp/build/dist/js/productionExecutable")
commonResourcesFiles.forEach { res ->
assertTrue(jsBuildDir.resolve(res).exists())
}
assertEquals("js", jsBuildDir.resolve("$repackDir/files/platform.txt").readText())
gradle(":webApp:build").checks {
check.taskSuccessful(":sharedUI:wasmJsCopyHierarchicalMultiplatformResources")
check.taskSuccessful(":sharedUI:jsCopyHierarchicalMultiplatformResources")

val wasmJsBuildDir = file("webApp/build/dist/wasmJs/productionExecutable")
commonResourcesFiles.forEach { res ->
assertTrue(wasmJsBuildDir.resolve(res).exists())
}
assertEquals("wasm", wasmJsBuildDir.resolve("$repackDir/files/platform.txt").readText())
val jsBuildDir = file("webApp/build/dist/js/productionExecutable")
commonResourcesFiles.forEach { res ->
assertTrue(jsBuildDir.resolve(res).exists())
}
assertEquals("js", jsBuildDir.resolve("$repackDir/files/platform.txt").readText())

val wasmJsBuildDir = file("webApp/build/dist/wasmJs/productionExecutable")
commonResourcesFiles.forEach { res ->
assertTrue(wasmJsBuildDir.resolve(res).exists())
}
assertEquals("wasm", wasmJsBuildDir.resolve("$repackDir/files/platform.txt").readText())
}


Expand Down
2 changes: 1 addition & 1 deletion gradle-plugins/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ compose.tests.kotlin.version=2.3.10
# and Publish.Subtasks.buildTypes.gradle.GradlePluginTestKt#gradleVersions in the TC config
# minimal and current gradle version
compose.tests.gradle.versions=8.13, 9.3.0
compose.tests.agp.versions=8.12.3, 9.0.0
compose.tests.agp.versions=8.13.2, 9.0.0
# gradle and agp versions should be compatible:
# https://developer.android.com/build/releases/gradle-plugin#updating-plugin
compose.tests.gradle-agp.exclude=8.13/9.0.0
Expand Down