[gradle-plugin] Add maven libraries into a tooling model

tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanLibrariesSpec.kt

@@ -153,6 +153,7 @@ open class KonanLibrariesSpec(val task: KonanArtifactWithLibrariesTask, val proj
     fun asFiles(resolver: SearchPathResolver): List<File> = mutableListOf<File>().apply {
         files.flatMapTo(this) { it.files }
         addAll(artifactFiles)
+        addAll(task.platformConfiguration.files)
         namedKlibs.mapTo(this) { project.file(resolver.resolve(it).absolutePath) }
     }
 }

tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanPlugin.kt

@@ -82,9 +82,8 @@ internal fun Project.konanDefaultDefFile(libName: String)
         = file("${projectDir.canonicalPath}/src/main/c_interop/$libName.def")
 
 @Suppress("UNCHECKED_CAST")
-internal val Project.konanArtifactsContainer: NamedDomainObjectContainer<KonanBuildingConfig<*>>
-    get() = extensions.getByName(KonanPlugin.ARTIFACTS_CONTAINER_NAME)
-            as NamedDomainObjectContainer<KonanBuildingConfig<*>>
+internal val Project.konanArtifactsContainer: KonanArtifactContainer
+    get() = extensions.getByName(KonanPlugin.ARTIFACTS_CONTAINER_NAME) as KonanArtifactContainer
 
 // TODO: The Kotlin/Native compiler is downloaded manually by a special task so the compilation tasks
 // are configured without the compile distribution. After target management refactoring

tools/kotlin-native-gradle-plugin/src/test/kotlin/ToolingModelTests.kt

@@ -16,12 +16,19 @@
 
 package org.jetbrains.kotlin.gradle.plugin.test
 
+import org.gradle.api.internal.FeaturePreviews
+import org.gradle.api.internal.project.ProjectInternal
+import org.gradle.testfixtures.ProjectBuilder
+import org.jetbrains.kotlin.gradle.plugin.KonanPlugin
+import org.jetbrains.kotlin.gradle.plugin.konanArtifactsContainer
+import org.jetbrains.kotlin.gradle.plugin.model.KonanToolingModelBuilder
 import org.jetbrains.kotlin.konan.KonanVersion
 import org.junit.Rule
 import org.junit.rules.TemporaryFolder
 import java.io.File
 import java.nio.file.Paths
 import kotlin.test.Test
+import kotlin.test.assertEquals
 
 open class ToolingModelTests {
     val tmpFolder = TemporaryFolder()
@@ -30,6 +37,8 @@ open class ToolingModelTests {
     val projectDirectory: File
         get() = tmpFolder.root
 
+    fun String.escapeBackSlashes() = KonanProject.escapeBackSlashes(this)
+
     @Test
     fun `The model should be serialized without exceptions`() {
         val project = KonanProject.createEmpty(projectDirectory).apply {
@@ -200,4 +209,59 @@ open class ToolingModelTests {
         }
         project.createRunner().withArguments("testModelData").build()
     }
+
+    @Test
+    fun `The model should support maven libraries`() {
+        val repoDir = projectDirectory.resolve("repo").absolutePath.escapeBackSlashes()
+        val dependency = KonanProject.createEmpty(projectDirectory).apply {
+            buildFile.appendText("""
+                group 'test'
+                version '1.0'
+
+                konanArtifacts {
+                    library('foo')
+                }
+
+                apply plugin: 'maven-publish'
+
+                publishing {
+                    repositories {
+                        maven {
+                            url = '$repoDir'
+                        }
+                    }
+                }
+            """.trimIndent())
+            propertiesFile.appendText("konan.publication.enabled=true")
+            settingsFile.appendText("enableFeaturePreview('GRADLE_METADATA')")
+            generateSrcFile("main.kt")
+        }
+        dependency.createRunner().withArguments("build", "publish").build()
+
+        val dependentDir = projectDirectory.resolve("dependent").apply {
+            mkdirs()
+        }
+
+
+        val dependnent = ProjectBuilder.builder().withProjectDir(dependentDir).build() as ProjectInternal
+
+        with(dependnent) {
+            gradle.services.get(FeaturePreviews::class.java).enableFeature(FeaturePreviews.Feature.GRADLE_METADATA)
+            pluginManager.apply(KonanPlugin::class.java)
+            konanArtifactsContainer.library("bar")
+            repositories.maven {
+                it.setUrl(repoDir)
+            }
+            dependencies.apply {
+                add("artifactbar", "test:foo:1.0")
+            }
+        }
+        val model = KonanToolingModelBuilder.buildAll("konanModel", dependnent)
+        assertEquals(1, model.artifacts.size, "Incorrect number of artifacts.")
+        val libraries = model.artifacts[0].libraries
+        assertEquals(1, libraries.size, "Incorrect number of libraries.")
+        val library = libraries[0].name
+        assertEquals("foo.klib", library, "Incorrect library name.")
+    }
+
 }