From f890cab145faf60a0252b060052d9509e330f794 Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Mon, 4 Mar 2019 22:19:40 +0300
Subject: [PATCH] Build: Rename custom-dependencies -> dependencies

---
 buildSrc/src/main/kotlin/tasks.kt                           | 2 +-
 .../tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt  | 6 +++---
 .../android-sdk/build.gradle.kts                            | 0
 .../protobuf/build.gradle.kts                               | 0
 .../protobuf/protobuf-lite/build.gradle.kts                 | 0
 .../protobuf/protobuf-relocated/build.gradle.kts            | 0
 .../protobuf/settings.gradle                                | 0
 settings.gradle                                             | 4 ++--
 8 files changed, 6 insertions(+), 6 deletions(-)
 rename {custom-dependencies => dependencies}/android-sdk/build.gradle.kts (100%)
 rename {custom-dependencies => dependencies}/protobuf/build.gradle.kts (100%)
 rename {custom-dependencies => dependencies}/protobuf/protobuf-lite/build.gradle.kts (100%)
 rename {custom-dependencies => dependencies}/protobuf/protobuf-relocated/build.gradle.kts (100%)
 rename {custom-dependencies => dependencies}/protobuf/settings.gradle (100%)

diff --git a/buildSrc/src/main/kotlin/tasks.kt b/buildSrc/src/main/kotlin/tasks.kt
index dfb8e0b9019cd..7bd0655df09de 100644
--- a/buildSrc/src/main/kotlin/tasks.kt
+++ b/buildSrc/src/main/kotlin/tasks.kt
@@ -122,7 +122,7 @@ private fun Task.useAndroidConfiguration(systemPropertyName: String, configName:
             .also {
                 dependencies.add(
                     configName,
-                    dependencies.project(":custom-dependencies:android-sdk", configuration = configName)
+                    dependencies.project(":dependencies:android-sdk", configuration = configName)
                 )
             }
     }
diff --git a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt
index a24d0107679d9..43595736f7257 100644
--- a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt
@@ -50,15 +50,15 @@ class CodeConformanceTest : TestCase() {
                 "compiler/testData/psi/kdoc",
                 "compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt",
                 "compiler/util/src/org/jetbrains/kotlin/config/MavenComparableVersion.java",
-                "custom-dependencies/protobuf/protobuf-relocated/build"
+                "dependencies/protobuf/protobuf-relocated/build"
         ).map(::File)
 
         private val COPYRIGHT_EXCLUDED_FILES_AND_DIRS = listOf(
             "dependencies",
             "out",
             "dist",
-            "custom-dependencies/android-sdk/build",
-            "custom-dependencies/protobuf/protobuf-relocated/build",
+            "dependencies/android-sdk/build",
+            "dependencies/protobuf/protobuf-relocated/build",
             "compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt",
             "idea/idea-jvm/src/org/jetbrains/kotlin/idea/copyright",
             "js/js.tests/.gradle",
diff --git a/custom-dependencies/android-sdk/build.gradle.kts b/dependencies/android-sdk/build.gradle.kts
similarity index 100%
rename from custom-dependencies/android-sdk/build.gradle.kts
rename to dependencies/android-sdk/build.gradle.kts
diff --git a/custom-dependencies/protobuf/build.gradle.kts b/dependencies/protobuf/build.gradle.kts
similarity index 100%
rename from custom-dependencies/protobuf/build.gradle.kts
rename to dependencies/protobuf/build.gradle.kts
diff --git a/custom-dependencies/protobuf/protobuf-lite/build.gradle.kts b/dependencies/protobuf/protobuf-lite/build.gradle.kts
similarity index 100%
rename from custom-dependencies/protobuf/protobuf-lite/build.gradle.kts
rename to dependencies/protobuf/protobuf-lite/build.gradle.kts
diff --git a/custom-dependencies/protobuf/protobuf-relocated/build.gradle.kts b/dependencies/protobuf/protobuf-relocated/build.gradle.kts
similarity index 100%
rename from custom-dependencies/protobuf/protobuf-relocated/build.gradle.kts
rename to dependencies/protobuf/protobuf-relocated/build.gradle.kts
diff --git a/custom-dependencies/protobuf/settings.gradle b/dependencies/protobuf/settings.gradle
similarity index 100%
rename from custom-dependencies/protobuf/settings.gradle
rename to dependencies/protobuf/settings.gradle
diff --git a/settings.gradle b/settings.gradle
index 46648fc6144bc..a5848d459e774 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -75,7 +75,7 @@ include ":kotlin-build-common",
         ":core:metadata.jvm",
         ":core:builtins",
         ":core:util.runtime",
-        ":custom-dependencies:android-sdk",
+        ":dependencies:android-sdk",
         ":idea:fir-view",
         ":idea:idea-jvm",
         ":idea:idea-maven",
@@ -354,4 +354,4 @@ project(':kotlin-serialization').projectDir = file("$rootDir/libraries/tools/kot
 project(':kotlin-serialization-unshaded').projectDir = file("$rootDir/libraries/tools/kotlin-serialization-unshaded")
 
 // Uncomment to use locally built protobuf-relocated
-// includeBuild("custom-dependencies/protobuf")
+// includeBuild("dependencies/protobuf")