Skip to content
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.

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

update to 1.6.0 for release #725

Merged
merged 10 commits into from Nov 16, 2021
1 change: 1 addition & 0 deletions CONTRIBUTING.md
Expand Up @@ -36,6 +36,7 @@ The form of the test itself is flexible as long as the logic is being covered.
Here are some [sample test processors](compiler-plugin/src/test/kotlin/com/google/devtools/ksp/processor) for your reference.

#### Steps for writing a test
* KSP needs to be built with JDK 11+, because of some test dependencies.
* Create a test processor under the sample processor folder.
it should be extending [AbstractTestProcessor](compiler-plugin/src/test/kotlin/com/google/devtools/ksp/processor/AbstractTestProcessor.kt)
* Write your logic by overriding corresponding functions.
Expand Down
Expand Up @@ -381,7 +381,7 @@ public KspTestFile createFile(@Nullable TestModule module, @NotNull String fileN
}

@Override
public TestModule createModule(@NotNull String name, @NotNull List<String> dependencies, @NotNull List<String> friends) {
public TestModule createModule(@NotNull String name, @NotNull List<String> dependencies, @NotNull List<String> friends, @NotNull List<Integer> abiVersions) {
return new TestModule(name, dependencies, friends);
}
});
Expand Down
3 changes: 2 additions & 1 deletion compiler-plugin/testData/api/allFunctions.kt
Expand Up @@ -62,6 +62,7 @@
// spliterator(): java.util.Spliterator
// stream(): java.util.stream.Stream
// subList(kotlin.Int,kotlin.Int): kotlin.collections.List
// toArray(java.util.function.IntFunction): kotlin.Array
// toString(): kotlin.String
// class: JavaImplOfKotlinInterface
// x
Expand Down Expand Up @@ -128,4 +129,4 @@ class JavaImplOfKotlinInterface implements KotlinInterfaceWithProperty {
}
public void setX(int value) {
}
}
}
Expand Up @@ -41,6 +41,7 @@ import org.gradle.language.jvm.tasks.ProcessResources
import org.gradle.tooling.provider.model.ToolingModelBuilderRegistry
import org.gradle.util.GradleVersion
import org.gradle.util.internal.VersionNumber
import org.gradle.work.Incremental
import org.jetbrains.kotlin.cli.common.arguments.*
import org.jetbrains.kotlin.gradle.dsl.*
import org.jetbrains.kotlin.gradle.internal.CompilerArgumentsContributor
Expand Down Expand Up @@ -414,6 +415,7 @@ abstract class KspTaskJvm : KotlinCompile(KotlinJvmOptionsImpl()), KspTask {
@get:PathSensitive(PathSensitivity.NONE)
@get:Optional
@get:InputFiles
@get:Incremental
abstract val classpathStructure: ConfigurableFileCollection

@get:Input
Expand Down Expand Up @@ -449,9 +451,9 @@ abstract class KspTaskJvm : KotlinCompile(KotlinJvmOptionsImpl()), KspTask {
viewConfig.attributes.attribute(artifactType, CLASS_STRUCTURE_ARTIFACT_TYPE)
}.files
).disallowChanges()
useClasspathSnapshot.value(true).disallowChanges()
classpathSnapshotProperties.useClasspathSnapshot.value(true).disallowChanges()
} else {
useClasspathSnapshot.value(false).disallowChanges()
classpathSnapshotProperties.useClasspathSnapshot.value(false).disallowChanges()
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
@@ -1,9 +1,9 @@
# Copied from kotlinc
org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx2200m -Dfile.encoding=UTF-8

kotlinBaseVersion=1.5.31
kotlinBaseVersion=1.6.0
agpBaseVersion=7.0.0
intellijVersion=202.7660.26
intellijVersion=203.8084.24
junitVersion=4.12
googleTruthVersion=1.1
compilerTestEnabled=false
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.