commit 05bd1114d3d072407f48dda10bc83581fba6f704
author Alexander.Likhachev <Alexander.Likhachev@jetbrains.com> Thu Jun 01 03:10:20 2023 +0200
committer Alexander.Likhachev <Alexander.Likhachev@jetbrains.com> Thu Jun 01 20:52:25 2023 +0200
tree 1f3b023057f5dc200abad371dc97b21cd17b5801
parent 1005b8c776d697e939ad23e44a1f6d908ed2eca3

[Build] Make K/N backend sources publishing for IDE in a less hacky way

kotlin-native/backend.native/build.gradle

diff --git a/kotlin-native/backend.native/build.gradle b/kotlin-native/backend.native/build.gradle
index ebdc6f0..40841c7 100644
--- a/kotlin-native/backend.native/build.gradle
+++ b/kotlin-native/backend.native/build.gradle
@@ -249,3 +249,8 @@
         }
     }
 }
+
+ArtifactsKt.sourcesJar(project) {
+    it.from(sourceSets["cli_bc"].allSource)
+    it.from(sourceSets["compiler"].allSource)
+}
\ No newline at end of file

prepare/ide-plugin-dependencies/kotlin-backend-native-for-ide/build.gradle.kts

diff --git a/prepare/ide-plugin-dependencies/kotlin-backend-native-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-backend-native-for-ide/build.gradle.kts
index a51b8ee..06d4c79 100644
--- a/prepare/ide-plugin-dependencies/kotlin-backend-native-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/kotlin-backend-native-for-ide/build.gradle.kts
@@ -1,6 +1,5 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import org.gradle.api.internal.project.ProjectInternal
-import org.gradle.api.plugins.internal.JavaConfigurationVariantMapping
+import org.gradle.kotlin.dsl.support.serviceOf
 
 plugins {
     kotlin("jvm")
@@ -18,6 +17,14 @@
         }
     }
     val embedded by configurations
+    val backendNativeSourcesConfiguration by configurations.creating {
+        isCanBeResolved = true
+        isCanBeConsumed = false
+        attributes {
+            attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
+            attribute(DocsType.DOCS_TYPE_ATTRIBUTE, objects.named(DocsType.SOURCES))
+        }
+    }
 
     dependencies {
         embedded(project(":kotlin-native:backend.native")) { isTransitive = false }
@@ -26,6 +33,7 @@
         proguardLibraryJars(project(":kotlin-native:backend.native", "kotlin_stdlib_jar"))
         proguardLibraryJars(project(":kotlin-native:backend.native", "kotlin_reflect_jar"))
         proguardLibraryJars(project(":kotlin-native:backend.native", "cli_bcApiElements"))
+        backendNativeSourcesConfiguration(project(":kotlin-native:backend.native"))
     }
 
     noDefaultJar()
@@ -86,17 +94,11 @@
 
     publish()
 
-    // includes more sources than left by proguard
-    // TODO is this still required and have to be done in such a hacky way?
-    val variant = org.gradle.api.plugins.internal.JvmPluginsHelper.createDocumentationVariantWithArtifact(
-        JavaPlugin.SOURCES_ELEMENTS_CONFIGURATION_NAME,
-        null,
-        DocsType.SOURCES,
-        listOf(),
-        "sourcesJar",
-        project(":kotlin-native:backend.native").sourceSets["cli_bc"].allSource +
-                project(":kotlin-native:backend.native").sourceSets["compiler"].allSource,
-        project as ProjectInternal
-    )
-    (components["kotlinLibrary"] as AdhocComponentWithVariants).addVariantsFromConfiguration(variant, JavaConfigurationVariantMapping("runtime", true))
+    sourcesJar {
+        val archiveOperations = serviceOf<ArchiveOperations>()
+        from(backendNativeSourcesConfiguration.map { archiveOperations.zipTree(it) })
+        // For some reason mapping operation leads to losing information about how dependencies are being built, and failures like "Cannot expand ZIP '...' as it does not exist."
+        // Therefore we have to declare dependency explicitly
+        dependsOn(backendNativeSourcesConfiguration)
+    }
 }