diff --git a/buildSrc/src/main/kotlin/dependencies.kt b/buildSrc/src/main/kotlin/dependencies.kt index 105c05a3be5..05a5582dc81 100644 --- a/buildSrc/src/main/kotlin/dependencies.kt +++ b/buildSrc/src/main/kotlin/dependencies.kt @@ -64,8 +64,9 @@ fun DependencyHandler.projectRuntimeJar(name: String): ProjectDependency = proje fun DependencyHandler.projectArchives(name: String): ProjectDependency = project(name, configuration = "archives") fun DependencyHandler.projectClasses(name: String): ProjectDependency = project(name, configuration = "classes-dirs") -val protobufLiteProject = ":custom-dependencies:protobuf-lite" -val protobufRelocatedProject = ":custom-dependencies:protobuf-relocated" +val protobufLiteProject = ":custom-dependencies:protobuf:protobuf-lite" +val protobufRelocatedProject = ":custom-dependencies:protobuf:protobuf-relocated" + fun DependencyHandler.protobufLite(): ProjectDependency = project(protobufLiteProject, configuration = "default").apply { isTransitive = false } val protobufLiteTask = "$protobufLiteProject:prepare" diff --git a/custom-dependencies/protobuf-lite/build.gradle.kts b/custom-dependencies/protobuf/protobuf-lite/build.gradle.kts similarity index 95% rename from custom-dependencies/protobuf-lite/build.gradle.kts rename to custom-dependencies/protobuf/protobuf-lite/build.gradle.kts index 4b539e4578d..8ed785c1368 100644 --- a/custom-dependencies/protobuf-lite/build.gradle.kts +++ b/custom-dependencies/protobuf/protobuf-lite/build.gradle.kts @@ -16,8 +16,8 @@ val protobufJarPrefix = "protobuf-$protobufVersion" val outputJarPath = "$buildDir/libs/$protobufJarPrefix-lite.jar" dependencies { - relocatedProtobuf(project(":custom-dependencies:protobuf-relocated", configuration = "default")) - relocatedProtobufSources(project(":custom-dependencies:protobuf-relocated", configuration = "sources")) + relocatedProtobuf(project(":custom-dependencies:protobuf:protobuf-relocated", configuration = "default")) + relocatedProtobufSources(project(":custom-dependencies:protobuf:protobuf-relocated", configuration = "sources")) } task("prepare") { diff --git a/custom-dependencies/protobuf-relocated/build.gradle.kts b/custom-dependencies/protobuf/protobuf-relocated/build.gradle.kts similarity index 100% rename from custom-dependencies/protobuf-relocated/build.gradle.kts rename to custom-dependencies/protobuf/protobuf-relocated/build.gradle.kts diff --git a/settings.gradle b/settings.gradle index 0ce7ebec63a..da0cf825aad 100644 --- a/settings.gradle +++ b/settings.gradle @@ -73,8 +73,8 @@ include ":kotlin-build-common", ":core:metadata.jvm", ":core:builtins", ":core:util.runtime", - ":custom-dependencies:protobuf-relocated", - ":custom-dependencies:protobuf-lite", + ":custom-dependencies:protobuf:protobuf-relocated", + ":custom-dependencies:protobuf:protobuf-lite", ":custom-dependencies:android-sdk", ":idea:fir-view", ":idea:idea-jvm",