From a543dee39a3eadaf69bdb5a14fc68f3630a6fdeb Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Mon, 11 Mar 2019 01:50:15 +0300
Subject: [PATCH] Build: Get jps-build-test directly from maven

---
 build.gradle.kts                              | 1 +
 buildSrc/prepare-deps/build.gradle.kts        | 3 ---
 buildSrc/src/main/kotlin/dependencies.kt      | 3 +++
 buildSrc/src/main/kotlin/localDependencies.kt | 4 ++--
 prepare/compiler/build.gradle.kts             | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 536c6a83ffe..64204009b0d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -307,6 +307,7 @@ allprojects {
         bootstrapKotlinRepo?.let(::maven)
         jcenter()
         maven(protobufRepo)
+        maven(intellijRepo)
     }
 
     configureJvmProject(javaHome!!, jvmTarget!!)
diff --git a/buildSrc/prepare-deps/build.gradle.kts b/buildSrc/prepare-deps/build.gradle.kts
index df2a5f17d65..8418246b7da 100644
--- a/buildSrc/prepare-deps/build.gradle.kts
+++ b/buildSrc/prepare-deps/build.gradle.kts
@@ -101,7 +101,6 @@ val intellijUltimate by configurations.creating
 val androidStudio by configurations.creating
 val sources by configurations.creating
 val jpsStandalone by configurations.creating
-val jpsBuildTest by configurations.creating
 val intellijCore by configurations.creating
 val nodeJS by configurations.creating
 val androidBuildTools by configurations.creating
@@ -141,7 +140,6 @@ dependencies {
 
     sources("com.jetbrains.intellij.idea:ideaIC:$intellijVersion:sources@jar")
     jpsStandalone("com.jetbrains.intellij.idea:jps-standalone:$intellijVersion")
-    jpsBuildTest("com.jetbrains.intellij.idea:jps-build-test:$intellijVersion")
     intellijCore("com.jetbrains.intellij.idea:intellij-core:$intellijVersion")
     if (intellijUltimateEnabled) {
         nodeJS("com.jetbrains.plugins:NodeJS:${rootProject.extra["versions.idea.NodeJS"]}@zip")
@@ -275,7 +273,6 @@ val build by tasks.creating {
         makeIntellijCore,
         makeIde,
         buildIvyRepositoryTask(jpsStandalone, customDepsOrg, customDepsRepoDir, null, sourcesFile),
-        buildIvyRepositoryTask(jpsBuildTest, customDepsOrg, customDepsRepoDir, null, sourcesFile),
         makeIntellijAnnotations,
         buildIvyRepoForAndroidDx
     )
diff --git a/buildSrc/src/main/kotlin/dependencies.kt b/buildSrc/src/main/kotlin/dependencies.kt
index a23ab6458e4..12aaefe9470 100644
--- a/buildSrc/src/main/kotlin/dependencies.kt
+++ b/buildSrc/src/main/kotlin/dependencies.kt
@@ -11,6 +11,9 @@ import org.gradle.kotlin.dsl.extra
 import org.gradle.kotlin.dsl.project
 import java.io.File
 
+val Project.isSnapshotIntellij get() = rootProject.extra["versions.intellijSdk"].toString().endsWith("SNAPSHOT")
+
+val Project.intellijRepo get() = "https://www.jetbrains.com/intellij-repository/" + if (isSnapshotIntellij) "snapshots" else "releases"
 
 fun Project.commonDep(coord: String): String {
     val parts = coord.split(':')
diff --git a/buildSrc/src/main/kotlin/localDependencies.kt b/buildSrc/src/main/kotlin/localDependencies.kt
index 48e6aa5262f..62f72f2997c 100644
--- a/buildSrc/src/main/kotlin/localDependencies.kt
+++ b/buildSrc/src/main/kotlin/localDependencies.kt
@@ -65,12 +65,12 @@ fun Project.intellijCoreDep() = "kotlin.build:intellij-core:${rootProject.extra[
 
 fun Project.jpsStandalone() = "kotlin.build:jps-standalone:${rootProject.extra["versions.intellijSdk"]}"
 
-fun Project.jpsBuildTest() = "kotlin.build:jps-build-test:${rootProject.extra["versions.intellijSdk"]}"
-
 fun Project.nodeJSPlugin() = "kotlin.build:NodeJS:${rootProject.extra["versions.idea.NodeJS"]}"
 
 fun Project.androidDxJar() = "kotlin.build:android-dx:${rootProject.extra["versions.androidBuildTools"]}"
 
+fun Project.jpsBuildTest() = "com.jetbrains.intellij.idea:jps-build-test:${rootProject.extra["versions.intellijSdk"]}"
+
 /**
  * Runtime version of annotations that are already in Kotlin stdlib (historically Kotlin has older version of this one).
  *
diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts
index a07ea4ad1ab..4b084a9426e 100644
--- a/prepare/compiler/build.gradle.kts
+++ b/prepare/compiler/build.gradle.kts
@@ -87,7 +87,7 @@ dependencies {
         }
     }
     fatJarContents(intellijDep()) { includeJars("jna-platform", "lz4-1.3.0") }
-    fatJarContentsStripServices(intellijDep("jps-standalone")) { includeJars("jps-model") }
+    fatJarContentsStripServices(jpsStandalone()) { includeJars("jps-model") }
     fatJarContentsStripMetadata(intellijDep()) { includeJars("oro-2.0.8", "jdom", "log4j" ) }
 }