Skip to content

Commit

Permalink
Revert "UPDATE_KOTLIN_VERSION: 2.0.0-dev-4562"
Browse files Browse the repository at this point in the history
This reverts commit 6fb3ea5.

(cherry picked from commit b1fefb3)
  • Loading branch information
ting-yuan committed Mar 7, 2024
1 parent ecf5adc commit 4cb4656
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ package com.google.devtools.ksp.symbol.impl.binary
import com.google.devtools.ksp.common.impl.KSNameImpl
import com.google.devtools.ksp.common.memoized
import com.google.devtools.ksp.symbol.*
import org.jetbrains.kotlin.backend.common.serialization.findPackage
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.descriptors.findPackage
import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor
import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
import org.jetbrains.kotlin.resolve.descriptorUtil.parents
Expand All @@ -50,7 +50,7 @@ abstract class KSDeclarationDescriptorImpl(private val descriptor: DeclarationDe
is ClassDescriptor -> KSClassDeclarationDescriptorImpl.getCached(containingDescriptor)
is FunctionDescriptor -> KSFunctionDeclarationDescriptorImpl.getCached(containingDescriptor)
else -> null
}
} as KSDeclaration?
}

override val parent: KSNode? by lazy {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ class KSPCmdLineOptionsIT(val useKSP2: Boolean) {
}.maxByOrNull { it.lastModified() }!!
val compilerArgs = mutableListOf(
"-no-stdlib",
"-language-version", "1.9",
"-Xplugin=${kspPluginJar.absolutePath}",
"-Xplugin=${kspApiJar.absolutePath}",
"-P", "plugin:$kspPluginId:apclasspath=${processorJar.absolutePath}",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ class PlaygroundIT(val useKSP2: Boolean) {
Assert.assertTrue(jarFile.getEntry("hello/HELLO.class").size > 0)
Assert.assertTrue(jarFile.getEntry("com/example/AClassBuilder.class").size > 0)
}
Assert.assertTrue(result.output.contains("w: Language version 2.0 is experimental"))
project.restore(buildFile.path)
}

Expand Down Expand Up @@ -262,6 +263,7 @@ class PlaygroundIT(val useKSP2: Boolean) {
Assert.assertTrue(jarFile.getEntry("hello/HELLO.class").size > 0)
Assert.assertTrue(jarFile.getEntry("com/example/AClassBuilder.class").size > 0)
}
Assert.assertTrue(result.output.contains("w: Language version 2.0 is experimental"))
project.restore(buildFile.path)
project.restore(gradleProperties.path)
}
Expand Down Expand Up @@ -302,12 +304,12 @@ class PlaygroundIT(val useKSP2: Boolean) {
gradleRunner.withArguments("build").buildAndFail().let {
Assert.assertEquals(TaskOutcome.SUCCESS, it.task(":workload:kspKotlin")?.outcome)
Assert.assertEquals(TaskOutcome.FAILED, it.task(":workload:compileKotlin")?.outcome)
Assert.assertTrue("Unresolved reference 'AClassBuilder'" in it.output)
Assert.assertTrue("Unresolved reference: AClassBuilder" in it.output)
}
gradleRunner.withArguments("build").buildAndFail().let {
Assert.assertEquals(TaskOutcome.UP_TO_DATE, it.task(":workload:kspKotlin")?.outcome)
Assert.assertEquals(TaskOutcome.FAILED, it.task(":workload:compileKotlin")?.outcome)
Assert.assertTrue("Unresolved reference 'AClassBuilder'" in it.output)
Assert.assertTrue("Unresolved reference: AClassBuilder" in it.output)
}

project.restore("workload/build.gradle.kts")
Expand Down

0 comments on commit 4cb4656

Please sign in to comment.