azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix JPS import from Gradle in KGP

Browse Source
This commit is contained in:
Yahor Berdnikau
2023-04-24 20:44:28 +02:00
committed by Space Team
parent d96c33e080
commit 861e9392de
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-build-tools-enum-compat/build.gradle.kts
+1 -1
View File
@@ -9,7 +9,7 @@ configureKotlinCompileTasksGradleCompatibility()
extensions.extraProperties["kotlin.stdlib.default.dependency"] = "false" extensions.extraProperties["kotlin.stdlib.default.dependency"] = "false"
dependencies { dependencies {
compileOnly(project(":kotlin-stdlib")) compileOnly(kotlinStdlib())
} }
tasks.withType<KotlinJvmCompile>().configureEach { tasks.withType<KotlinJvmCompile>().configureEach {
libraries/tools/kotlin-gradle-plugin/build.gradle.kts
+9 -7
View File
@@ -90,13 +90,15 @@ dependencies {
exclude(group = "*") exclude(group = "*")
} }
// Adding workaround KT-57317 for Gradle versions where Kotlin runtime <1.8.0 if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
mainEmbedded(project(":kotlin-build-tools-enum-compat")) // Adding workaround KT-57317 for Gradle versions where Kotlin runtime <1.8.0
gradle70Embedded(project(":kotlin-build-tools-enum-compat")) "mainEmbedded"(project(":kotlin-build-tools-enum-compat"))
gradle71Embedded(project(":kotlin-build-tools-enum-compat")) "gradle70Embedded"(project(":kotlin-build-tools-enum-compat"))
gradle74Embedded(project(":kotlin-build-tools-enum-compat")) "gradle71Embedded"(project(":kotlin-build-tools-enum-compat"))
gradle75Embedded(project(":kotlin-build-tools-enum-compat")) "gradle74Embedded"(project(":kotlin-build-tools-enum-compat"))
gradle76Embedded(project(":kotlin-build-tools-enum-compat")) "gradle75Embedded"(project(":kotlin-build-tools-enum-compat"))
"gradle76Embedded"(project(":kotlin-build-tools-enum-compat"))
}
testCompileOnly(project(":compiler")) testCompileOnly(project(":compiler"))
testCompileOnly(project(":kotlin-annotation-processing")) testCompileOnly(project(":kotlin-annotation-processing"))