File tree Expand file tree Collapse file tree
gradle-plugin/src/test/kotlin/com/google/devtools/ksp/gradle
integration-tests/src/test/kotlin/com/google/devtools/ksp/test
src/main/kotlin/com/google/devtools/ksp/impl Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -95,8 +95,8 @@ subprojects {
9595 }
9696
9797 tasks.withType<JavaCompile >().configureEach {
98- sourceCompatibility = JavaVersion .VERSION_11 .toString()
99- targetCompatibility = JavaVersion .VERSION_11 .toString()
98+ sourceCompatibility = JavaVersion .VERSION_1_8 .toString()
99+ targetCompatibility = JavaVersion .VERSION_1_8 .toString()
100100 javaCompiler.set(
101101 javaToolchains.compilerFor {
102102 languageVersion.set(JavaLanguageVersion .of(17 ))
Original file line number Diff line number Diff line change @@ -180,7 +180,7 @@ class SourceSetConfigurationsTest {
180180 val baseVariant = (this as com.android.build.gradle.internal.api.BaseVariantImpl)
181181 val variantData = baseVariant::class.java.getMethod("getVariantData").invoke(baseVariant)
182182 as com.android.build.gradle.internal.variant.BaseVariantData
183- variantData.extraGeneratedSourceFoldersOnlyInModel .forEach {
183+ variantData.extraGeneratedSourceFolders .forEach {
184184 println("SRC:" + it.relativeTo(buildDir).path)
185185 }
186186 variantData.allPreJavacGeneratedBytecode.forEach {
@@ -238,6 +238,21 @@ class SourceSetConfigurationsTest {
238238 it.path.contains(" ksp" )
239239 }
240240 ).containsExactly(
241+ SourceFolder (
242+ " debug" , " SRC:generated/ksp/debug/java"
243+ ),
244+ SourceFolder (
245+ " release" , " SRC:generated/ksp/release/java"
246+ ),
247+ SourceFolder (
248+ " debugAndroidTest" , " SRC:generated/ksp/debugAndroidTest/java"
249+ ),
250+ SourceFolder (
251+ " debugUnitTest" , " SRC:generated/ksp/debugUnitTest/java"
252+ ),
253+ SourceFolder (
254+ " releaseUnitTest" , " SRC:generated/ksp/releaseUnitTest/java"
255+ ),
241256 SourceFolder (
242257 " debug" , " SRC:generated/ksp/debug/kotlin"
243258 ),
Original file line number Diff line number Diff line change 11# Copied from kotlinc
22org.gradle.jvmargs =-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx2200m -Dfile.encoding=UTF-8
33
4- kotlinBaseVersion =2.0.0-dev-9013
5- agpBaseVersion =7.2 .0
4+ kotlinBaseVersion =2.0.0-Beta1
5+ agpBaseVersion =7.0 .0
66intellijVersion =213.7172.25
77junitVersion =4.13.1
88junit5Version =5.8.2
99junitPlatformVersion =1.8.2
1010googleTruthVersion =1.1
1111
12- aaKotlinBaseVersion =2.0.0-dev-9013
12+ aaKotlinBaseVersion =2.0.0-dev-7674
1313aaIntellijVersion =213.7172.25
1414aaGuavaVersion =29.0-jre
1515aaAsmVersion =9.0
Original file line number Diff line number Diff line change 11distributionBase =GRADLE_USER_HOME
22distributionPath =wrapper/dists
3- distributionUrl =https\://services.gradle.org/distributions/gradle-7.5 -bin.zip
3+ distributionUrl =https\://services.gradle.org/distributions/gradle-7.2 -bin.zip
44zipStoreBase =GRADLE_USER_HOME
55zipStorePath =wrapper/dists
Original file line number Diff line number Diff line change @@ -3,7 +3,6 @@ package com.google.devtools.ksp.test
33import org.gradle.testkit.runner.GradleRunner
44import org.gradle.testkit.runner.TaskOutcome
55import org.junit.Assert
6- import org.junit.Assume
76import org.junit.Rule
87import org.junit.Test
98import org.junit.runner.RunWith
@@ -19,7 +18,6 @@ class MultiplatformIT(useKSP2: Boolean) {
1918
2019 @Test
2120 fun testJVM () {
22- Assume .assumeFalse(System .getProperty(" os.name" ).startsWith(" mac" , ignoreCase = true ))
2321 val gradleRunner = GradleRunner .create().withProjectDir(project.root)
2422
2523 val resultCleanBuild =
Original file line number Diff line number Diff line change @@ -80,7 +80,6 @@ import org.jetbrains.kotlin.cli.common.config.addKotlinSourceRoot
8080import org.jetbrains.kotlin.cli.common.config.addKotlinSourceRoots
8181import org.jetbrains.kotlin.cli.common.config.kotlinSourceRoots
8282import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCliJavaFileManagerImpl
83- import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreApplicationEnvironmentMode
8483import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreProjectEnvironment
8584import org.jetbrains.kotlin.cli.jvm.compiler.computeDefaultRootModules
8685import org.jetbrains.kotlin.cli.jvm.compiler.createSourceFilesFromSourceRoots
@@ -146,7 +145,8 @@ class KotlinSymbolProcessing(
146145 StandaloneProjectFactory .createProjectEnvironment(
147146 projectDisposable,
148147 applicationDisposable,
149- KotlinCoreApplicationEnvironmentMode .Production
148+ false ,
149+ classLoader = MockProject ::class .java.classLoader
150150 )
151151
152152 val application: Application = kotlinCoreProjectEnvironment.environment.application
Original file line number Diff line number Diff line change 5252// parent of Enum: Enum<(RGB..RGB?)>
5353// parent of Enum<(RGB..RGB?)>: RGB
5454// parent of RGB: File: B.java
55- // parent of RGB: synthetic constructor for RGB
56- // parent of synthetic constructor for RGB: RGB
5755// parent of R: RGB
5856// parent of G: RGB
5957// parent of B: RGB
You can’t perform that action at this time.
0 commit comments