Support AGP's built-in Kotlin compilation #2122
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
scott-pollom
force-pushed
the
built_in_kotlin
branch
from
ab1eded
to
2363507
Compare
ting-yuan
reviewed
Oct 1, 2024
gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspConfigurations.kt
Show resolved
Hide resolved
gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle/GradleCompilationTest.kt
Outdated
Show resolved
Hide resolved
gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspConfigurations.kt
Show resolved
Hide resolved
scott-pollom
force-pushed
the
built_in_kotlin
branch
from
2363507
to
c5a041d
Compare
ting-yuan
approved these changes
Oct 2, 2024
scott-pollom
force-pushed
the
built_in_kotlin
branch
from
c5a041d
to
1b09388
Compare
scott-pollom
force-pushed
the
built_in_kotlin
branch
from
1b09388
to
6968aeb
Compare
ting-yuan
reviewed
Oct 2, 2024
| @Rule | ||
| @JvmField | ||
| val project: TemporaryTestProject = TemporaryTestProject("playground-android-multi", "playground", useKSP2) | ||
|
|
||
| @Test | ||
| fun testDependencyResolutionCheck() { | ||
| val gradleRunner = GradleRunner.create().withProjectDir(project.root).withGradleVersion("7.6.3") | ||
|
|
||
| File(project.root, "gradle.properties").appendText("\nagpVersion=7.4.1") |
There was a problem hiding this comment.
Can we keep this? We need to cover users of older Gradle and AGP versions.
There was a problem hiding this comment.
I only changed this because the CI test was failing with the following error:
Could not determine the dependencies of task ':workload:compileDebugKotlin'.
> Failed to install the following SDK components:
tools Android SDK Tools
It was passing for me locally, so I wasn't sure how to troubleshoot.
This test isn't really specific to AGP 7.4.1... it will fail similarly with AGP 8.7.0 if resolving dependencies early.
FWIW, there is still AGP731IT which is a similar test using AGP 7.3.1 and the same Gradle version.
But the bottom line is that I'm happy to leave this test as-is, but I don't know how to troubleshoot the test failure :)
scott-pollom
force-pushed
the
built_in_kotlin
branch
3 times, most recently
from
a1a7678
to
3331de1
Compare
Previously, the sourceSet-specific KSP configurations (e.g., kspTest) weren't being created when AGP's built-in Kotlin compilation was enabled. This change also increases the AGP version to 8.7.0 in order to test against a version of AGP with the built-in Kotlin support. This change also configures the AGP compatibility tests (AGP731IT and AGP741IT) to run one test at a time to avoid race conditions seen when the old AGP versions were trying to download SDKs simultaneously. Bug: b/362279380 Test: GradleCompilationTest
scott-pollom
force-pushed
the
built_in_kotlin
branch
from
3331de1
to
7cca0af
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, the sourceSet-specific KSP configurations (e.g., kspTest) weren't being created when AGP's built-in Kotlin compilation was enabled.
This change also increases the AGP version to 8.7.0-beta01 in order to test against a version of AGP with the built-in Kotlin support.
Bug: b/362279380
Test: GradleCompilationTest