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

Don't add Kotlin specific attributes to legacy 'default' configuration

Browse Source 
^KT-51913 Fixed
This commit is contained in:
Yahor Berdnikau
2022-04-26 17:34:38 +02:00
committed by Space
parent c2bb8d6de0
commit cb35e868cc
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/GradleCommon.kt
+7 -4
View File
@@ -267,10 +267,13 @@ fun Project.reconfigureMainSourcesSetForGradlePlugin(
wireGradleVariantToCommonGradleVariant(this, commonSourceSet)
// https://youtrack.jetbrains.com/issue/KT-51913
configurations["default"].attributes.attribute(
TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE,
objects.named(TargetJvmEnvironment::class, "no-op")
)
// Remove workaround after bootstrap update
if (configurations["default"].attributes.contains(TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE)) {
configurations["default"].attributes.attribute(
TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE,
objects.named(TargetJvmEnvironment::class, "no-op")
)
}
plugins.withType<JavaLibraryPlugin>().configureEach {
this@reconfigureMainSourcesSetForGradlePlugin