Skip to content

Bump Kotlin Analsys API to 2.3.20-dev-7064 #2749

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

Merged
ting-yuan merged 12 commits into from
Jan 14, 2026
+1,211 −1,182
Merged

Bump Kotlin Analsys API to 2.3.20-dev-7064 #2749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5c66bee
Revert "Downgrade AA to 2.3.0-dev-4967"
ting-yuan Dec 12, 2025
abf2236
UPDATE_AA_VERSION: 2.3.0-dev-10303
ting-yuan Dec 12, 2025
55d65f9
UPDATE_AA_VERSION: 2.3.20-dev-1363
ting-yuan Dec 16, 2025
ef5fd73
Switch to intellij's coroutines
ting-yuan Jan 13, 2026
d9ff485
UPDATE_AA_VERSION: 2.3.20-dev-2826
ting-yuan Dec 16, 2025
f1388fe
UPDATE_AA_VERSION: 2.3.20-dev-4294
ting-yuan Dec 16, 2025
9642bfe
Get rid of KotlinCoreEnvironment.createForTests()
ting-yuan Dec 18, 2025
01938dc
UPDATE_AA_VERSION: 2.3.20-dev-5706
ting-yuan Dec 18, 2025
c70b2f9
UPDATE_AA_VERSION: 2.3.20-dev-7064
ting-yuan Dec 18, 2025
071db1e
Remove JavaVersion.java
ting-yuan Jan 13, 2026
5e4f1ad
Update metalava to 1.0.0-alpha14
ting-yuan Jan 13, 2026
8af555b
Update shadow-validation-baseline.txt
ting-yuan Jan 14, 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
348 changes: 167 additions & 181 deletions api/api.base
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/com/google/devtools/ksp/ApiCheck.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ private fun Project.getCompileClasspath(): String =

private fun Project.getMetalavaConfiguration(): Configuration {
return configurations.findByName("metalava") ?: configurations.create("metalava") {
val dependency = dependencies.create("com.android.tools.metalava:metalava:1.0.0-alpha08")
val dependency = dependencies.create("com.android.tools.metalava:metalava:1.0.0-alpha14")
it.dependencies.add(dependency)
}
}
2 changes: 1 addition & 1 deletion gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspAATask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ abstract class KspAATask @Inject constructor(
),
project.dependencies.create("org.jetbrains.kotlin:kotlin-stdlib:$KSP_KOTLIN_BASE_VERSION"),
project.dependencies.create(
"org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:$KSP_COROUTINES_VERSION"
"org.jetbrains.intellij.deps.kotlinx:kotlinx-coroutines-core-jvm:$KSP_COROUTINES_VERSION"
),
).apply {
isTransitive = false
Expand Down
10 changes: 4 additions & 6 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,20 @@ org.gradle.parallel=true

kotlinBaseVersion=2.3.0-RC
agpBaseVersion=9.0.0-beta05
intellijVersion=241.19416.19
junitVersion=4.13.1
junit5Version=5.8.2
junitPlatformVersion=1.8.2
googleTruthVersion=1.1

aaKotlinBaseVersion=2.3.0-dev-4967
aaTestFrameworkVersion=2.3.0-dev-7225
aaIntellijVersion=241.19416.19
aaKotlinBaseVersion=2.3.20-dev-7064
aaIntellijVersion=251.27812.49
aaGuavaVersion=33.2.0-jre
aaAsmVersion=9.0
aaFastutilVersion=8.5.13-jb4
aaFastutilVersion=8.5.14-jb1
aaStax2Version=4.2.1
aaAaltoXmlVersion=1.3.0
aaStreamexVersion=0.7.2
aaCoroutinesVersion=1.6.4
aaCoroutinesVersion=1.8.0-intellij-14

compilerTestEnabled=false

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {
testImplementation(project(":api"))
testImplementation(project(":gradle-plugin"))
testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:$aaCoroutinesVersion")
testImplementation("org.jetbrains.intellij.deps.kotlinx:kotlinx-coroutines-core-jvm:$aaCoroutinesVersion")
}

fun Test.configureCommonSettings() {
Expand Down
20 changes: 14 additions & 6 deletions kotlin-analysis-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ val libsForTesting: Configuration by configurations.creating
val libsForTestingCommon: Configuration by configurations.creating

val aaKotlinBaseVersion: String by project
val aaTestFrameworkVersion: String by project
val aaIntellijVersion: String by project
val aaGuavaVersion: String by project
val aaAsmVersion: String by project
Expand Down Expand Up @@ -46,6 +45,7 @@ dependencies {
"com.jetbrains.intellij.platform:util-text-matching",
"com.jetbrains.intellij.platform:util",
"com.jetbrains.intellij.platform:util-base",
"com.jetbrains.intellij.platform:util-coroutines",
"com.jetbrains.intellij.platform:util-xml-dom",
"com.jetbrains.intellij.platform:core",
"com.jetbrains.intellij.platform:core-impl",
Expand Down Expand Up @@ -97,7 +97,8 @@ dependencies {
implementation("javax.inject:javax.inject:1")
implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.10")
implementation("org.lz4:lz4-java:1.7.1") { isTransitive = false }
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:$aaCoroutinesVersion") { isTransitive = false }
compileOnly("org.jetbrains.intellij.deps.kotlinx:kotlinx-coroutines-core-jvm:$aaCoroutinesVersion")
compileOnly("org.jetbrains.intellij.deps.kotlinx:kotlinx-coroutines-core:$aaCoroutinesVersion")
implementation(
"org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil:$aaFastutilVersion"
) {
Expand All @@ -119,17 +120,20 @@ dependencies {
testRuntimeOnly("org.junit.jupiter:junit-jupiter-params:$junit5Version")
testRuntimeOnly("org.junit.platform:junit-platform-suite:$junitPlatformVersion")
testImplementation("org.jetbrains.kotlin:kotlin-compiler:$aaKotlinBaseVersion")
testImplementation("org.jetbrains.kotlin:kotlin-compiler-internal-test-framework:$aaTestFrameworkVersion")
testImplementation("org.jetbrains.kotlin:kotlin-compiler-internal-test-framework:$aaKotlinBaseVersion")
testImplementation(project(":common-deps"))
testImplementation(project(":test-utils"))
testImplementation("org.jetbrains.kotlin:analysis-api-test-framework:$aaTestFrameworkVersion")

testImplementation("org.jetbrains.kotlin:analysis-api-test-framework:$aaKotlinBaseVersion")
testImplementation("org.jetbrains.intellij.deps.kotlinx:kotlinx-coroutines-core-jvm:$aaCoroutinesVersion")
testImplementation("org.jetbrains.intellij.deps.kotlinx:kotlinx-coroutines-core:$aaCoroutinesVersion")
libsForTesting(kotlin("stdlib", aaKotlinBaseVersion))
libsForTesting(kotlin("test", aaKotlinBaseVersion))
libsForTesting(kotlin("script-runtime", aaKotlinBaseVersion))
libsForTestingCommon(kotlin("stdlib-common", aaKotlinBaseVersion))

depJarsForCheck("org.jetbrains.kotlin", "kotlin-stdlib", kotlinBaseVersion)
depJarsForCheck("org.jetbrains.intellij.deps.kotlinx:kotlinx-coroutines-core-jvm:$aaCoroutinesVersion")
depJarsForCheck("org.jetbrains.intellij.deps.kotlinx:kotlinx-coroutines-core:$aaCoroutinesVersion")
depJarsForCheck(project(":api"))
depJarsForCheck(project(":common-deps"))

Expand Down Expand Up @@ -264,7 +268,11 @@ publishing {

asNode().appendNode("dependencies").apply {
addDependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlinBaseVersion)
addDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core-jvm", aaCoroutinesVersion)
addDependency(
"org.jetbrains.intellij.deps.kotlinx",
"kotlinx-coroutines-core-jvm",
aaCoroutinesVersion
)
addDependency("com.google.devtools.ksp", "symbol-processing-api", version)
addDependency("com.google.devtools.ksp", "symbol-processing-common-deps", version)
}
Expand Down
Loading
Loading