Build: Move protobuf projects to subdirectory
#KT-29202
This commit is contained in:
@@ -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"
|
||||
|
||||
+2
-2
@@ -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") {
|
||||
+2
-2
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user