Build: Rename custom-dependencies -> dependencies

This commit is contained in:
Vyacheslav Gerasimov
2019-03-04 22:19:40 +03:00
parent 07b0129a6a
commit f890cab145
8 changed files with 6 additions and 6 deletions
+1 -1
View File
@@ -122,7 +122,7 @@ private fun Task.useAndroidConfiguration(systemPropertyName: String, configName:
.also { .also {
dependencies.add( dependencies.add(
configName, configName,
dependencies.project(":custom-dependencies:android-sdk", configuration = configName) dependencies.project(":dependencies:android-sdk", configuration = configName)
) )
} }
} }
@@ -50,15 +50,15 @@ class CodeConformanceTest : TestCase() {
"compiler/testData/psi/kdoc", "compiler/testData/psi/kdoc",
"compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt", "compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt",
"compiler/util/src/org/jetbrains/kotlin/config/MavenComparableVersion.java", "compiler/util/src/org/jetbrains/kotlin/config/MavenComparableVersion.java",
"custom-dependencies/protobuf/protobuf-relocated/build" "dependencies/protobuf/protobuf-relocated/build"
).map(::File) ).map(::File)
private val COPYRIGHT_EXCLUDED_FILES_AND_DIRS = listOf( private val COPYRIGHT_EXCLUDED_FILES_AND_DIRS = listOf(
"dependencies", "dependencies",
"out", "out",
"dist", "dist",
"custom-dependencies/android-sdk/build", "dependencies/android-sdk/build",
"custom-dependencies/protobuf/protobuf-relocated/build", "dependencies/protobuf/protobuf-relocated/build",
"compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt", "compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt",
"idea/idea-jvm/src/org/jetbrains/kotlin/idea/copyright", "idea/idea-jvm/src/org/jetbrains/kotlin/idea/copyright",
"js/js.tests/.gradle", "js/js.tests/.gradle",
+2 -2
View File
@@ -75,7 +75,7 @@ include ":kotlin-build-common",
":core:metadata.jvm", ":core:metadata.jvm",
":core:builtins", ":core:builtins",
":core:util.runtime", ":core:util.runtime",
":custom-dependencies:android-sdk", ":dependencies:android-sdk",
":idea:fir-view", ":idea:fir-view",
":idea:idea-jvm", ":idea:idea-jvm",
":idea:idea-maven", ":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") project(':kotlin-serialization-unshaded').projectDir = file("$rootDir/libraries/tools/kotlin-serialization-unshaded")
// Uncomment to use locally built protobuf-relocated // Uncomment to use locally built protobuf-relocated
// includeBuild("custom-dependencies/protobuf") // includeBuild("dependencies/protobuf")