Build: Rename custom-dependencies -> dependencies

sprigogin · Mar 20, 2019 · f890cab · f890cab
1 parent 07b0129
commit f890cab
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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/...dependencies/android-sdk/build.gradle.kts → dependencies/android-sdk/build.gradle.kts b/...dependencies/android-sdk/build.gradle.kts → dependencies/android-sdk/build.gradle.kts
diff --git a/...om-dependencies/protobuf/build.gradle.kts → dependencies/protobuf/build.gradle.kts b/...om-dependencies/protobuf/build.gradle.kts → dependencies/protobuf/build.gradle.kts
diff --git a/...s/protobuf/protobuf-lite/build.gradle.kts → ...s/protobuf/protobuf-lite/build.gradle.kts b/...s/protobuf/protobuf-lite/build.gradle.kts → ...s/protobuf/protobuf-lite/build.gradle.kts
diff --git a/...tobuf/protobuf-relocated/build.gradle.kts → ...tobuf/protobuf-relocated/build.gradle.kts b/...tobuf/protobuf-relocated/build.gradle.kts → ...tobuf/protobuf-relocated/build.gradle.kts
diff --git a/custom-dependencies/protobuf/settings.gradle → dependencies/protobuf/settings.gradle b/custom-dependencies/protobuf/settings.gradle → dependencies/protobuf/settings.gradle
diff --git 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")