Build: Switch to prebuilt protobuf-lite from teamcity repo
#KT-29202
This commit is contained in:
+2
-1
@@ -149,7 +149,7 @@ rootProject.apply {
|
||||
|
||||
IdeVersionConfigurator.setCurrentIde(this)
|
||||
|
||||
extra["versions.protobuf-java"] = "2.6.1"
|
||||
extra["versions.protobuf"] = "2.6.1"
|
||||
extra["versions.javax.inject"] = "1"
|
||||
extra["versions.jsr305"] = "1.3.9"
|
||||
extra["versions.jansi"] = "1.16"
|
||||
@@ -317,6 +317,7 @@ allprojects {
|
||||
mirrorRepo?.let(::maven)
|
||||
bootstrapKotlinRepo?.let(::maven)
|
||||
jcenter()
|
||||
maven(protobufRepo)
|
||||
}
|
||||
|
||||
configureJvmProject(javaHome!!, jvmTarget!!)
|
||||
|
||||
@@ -64,8 +64,13 @@ 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")
|
||||
|
||||
fun Project.protobufLite(): String = "org.jetbrains.kotlin:protobuf-lite:" + findProperty("versions.protobuf-java") as String
|
||||
fun Project.protobufFull(): String = "org.jetbrains.kotlin:protobuf-relocated:" + findProperty("versions.protobuf-java") as String
|
||||
val Project.protobufVersion: String get() = findProperty("versions.protobuf") as String
|
||||
|
||||
val Project.protobufRepo: String get() =
|
||||
"https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_Protobuf),status:SUCCESS,pinned:true,tag:$protobufVersion/artifacts/content/internal/repo/"
|
||||
|
||||
fun Project.protobufLite(): String = "org.jetbrains.kotlin:protobuf-lite:$protobufVersion"
|
||||
fun Project.protobufFull(): String = "org.jetbrains.kotlin:protobuf-relocated:$protobufVersion"
|
||||
|
||||
fun File.matchMaybeVersionedArtifact(baseName: String) = name.matches(baseName.toMaybeVersionedJarRegex())
|
||||
|
||||
|
||||
+2
-2
@@ -348,5 +348,5 @@ project(':kotlin-serialization').projectDir = file("$rootDir/libraries/tools/kot
|
||||
project(':kotlin-serialization-unshaded').projectDir = file("$rootDir/libraries/tools/kotlin-serialization-unshaded")
|
||||
project(':kotlin-idl2k').projectDir = file("$rootDir/libraries/tools/idl2k")
|
||||
|
||||
|
||||
includeBuild("custom-dependencies/protobuf")
|
||||
// Uncomment to use locally built protobuf-relocated
|
||||
// includeBuild("custom-dependencies/protobuf")
|
||||
|
||||
Reference in New Issue
Block a user