From aae0f5123ea833a15cd95c23a854c720930800bb Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Wed, 13 Jun 2018 18:18:35 +0300
Subject: [PATCH] Build: Specify metadata source for ivy repositories

Otherwise composite build with Kotlin Native fails unable to resolve metadata files
---
 buildSrc/prepare-deps/android-dx/build.gradle.kts   | 3 +++
 buildSrc/prepare-deps/intellij-sdk/build.gradle.kts | 6 ++++++
 buildSrc/src/main/kotlin/intellijDependencies.kt    | 5 +++++
 3 files changed, 14 insertions(+)

diff --git a/buildSrc/prepare-deps/android-dx/build.gradle.kts b/buildSrc/prepare-deps/android-dx/build.gradle.kts
index 20a6bd51ee7..0c7ed3c4a1c 100644
--- a/buildSrc/prepare-deps/android-dx/build.gradle.kts
+++ b/buildSrc/prepare-deps/android-dx/build.gradle.kts
@@ -26,6 +26,9 @@ repositories {
     ivy {
         artifactPattern("https://dl-ssl.google.com/android/repository/[artifact]_[revision](-[classifier]).[ext]")
         artifactPattern("https://android.googlesource.com/platform/dalvik/+archive/android-$dxSourcesVersion/[artifact].[ext]")
+        metadataSources {
+            artifact()
+        }
     }
 }
 
diff --git a/buildSrc/prepare-deps/intellij-sdk/build.gradle.kts b/buildSrc/prepare-deps/intellij-sdk/build.gradle.kts
index dc3434d5c02..f6b2bcb670e 100644
--- a/buildSrc/prepare-deps/intellij-sdk/build.gradle.kts
+++ b/buildSrc/prepare-deps/intellij-sdk/build.gradle.kts
@@ -61,12 +61,18 @@ repositories {
     if (androidStudioRelease != null) {
         ivy {
             artifactPattern("https://dl.google.com/dl/android/studio/ide-zips/$androidStudioRelease/[artifact]-[revision]-$studioOs.zip")
+            metadataSources {
+                artifact()
+            }
         }
     }
     maven { setUrl("$intellijRepo/$intellijReleaseType") }
     maven { setUrl("https://plugins.jetbrains.com/maven") }
     ivy {
         artifactPattern("https://raw.github.com/JetBrains/intellij-community/[revision]/lib/src/[artifact].zip")
+        metadataSources {
+            artifact()
+        }
     }
 }
 
diff --git a/buildSrc/src/main/kotlin/intellijDependencies.kt b/buildSrc/src/main/kotlin/intellijDependencies.kt
index 3ad1e99b742..49da948695f 100644
--- a/buildSrc/src/main/kotlin/intellijDependencies.kt
+++ b/buildSrc/src/main/kotlin/intellijDependencies.kt
@@ -43,12 +43,17 @@ fun RepositoryHandler.intellijSdkRepo(project: Project): IvyArtifactRepository =
 
     ivyPattern("${baseDir.canonicalPath}/[organisation]/[revision]/[module].ivy.xml")
     ivyPattern("${baseDir.canonicalPath}/[organisation]/[revision]/intellij.plugin.[module].ivy.xml")
+    ivyPattern("${baseDir.canonicalPath}/[organisation]/[revision]/plugins-[module].ivy.xml")
     artifactPattern("${baseDir.canonicalPath}/[organisation]/[revision]/[module]/lib/[artifact](-[classifier]).jar")
     artifactPattern("${baseDir.canonicalPath}/[organisation]/[revision]/intellij/plugins/[module]/lib/[artifact](-[classifier]).jar")
     artifactPattern("${baseDir.canonicalPath}/[organisation]/[revision]/plugins-[module]/[module]/lib/[artifact](-[classifier]).jar")
     artifactPattern("${baseDir.canonicalPath}/[organisation]/[revision]/[module]/[artifact].jar")
     artifactPattern("${baseDir.canonicalPath}/[organisation]/[revision]/[module]/[artifact](-[revision])(-[classifier]).jar")
     artifactPattern("${baseDir.canonicalPath}/[organisation]/[revision]/sources/[artifact]-[revision]-[classifier].[ext]")
+
+    metadataSources {
+        ivyDescriptor()
+    }
 }
 
 fun Project.intellijDep(module: String = "intellij") = "kotlin.build.custom.deps:$module:${rootProject.extra["versions.intellijSdk"]}"