azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build: Switch to prebuilt protobuf-lite from teamcity repo

Browse Source 
#KT-29202
This commit is contained in:
Vyacheslav Gerasimov
2019-01-16 01:43:12 +03:00
parent 1efd859909
commit b525146009
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+2 -1
View File
@@ -149,7 +149,7 @@ rootProject.apply {
IdeVersionConfigurator.setCurrentIde(this) IdeVersionConfigurator.setCurrentIde(this)
extra["versions.protobuf-java"] = "2.6.1" extra["versions.protobuf"] = "2.6.1"
extra["versions.javax.inject"] = "1" extra["versions.javax.inject"] = "1"
extra["versions.jsr305"] = "1.3.9" extra["versions.jsr305"] = "1.3.9"
extra["versions.jansi"] = "1.16" extra["versions.jansi"] = "1.16"
@@ -317,6 +317,7 @@ allprojects {
mirrorRepo?.let(::maven) mirrorRepo?.let(::maven)
bootstrapKotlinRepo?.let(::maven) bootstrapKotlinRepo?.let(::maven)
jcenter() jcenter()
maven(protobufRepo)
} }
configureJvmProject(javaHome!!, jvmTarget!!) configureJvmProject(javaHome!!, jvmTarget!!)
buildSrc/src/main/kotlin/dependencies.kt
+7 -2
View File
@@ -64,8 +64,13 @@ fun DependencyHandler.projectRuntimeJar(name: String): ProjectDependency = proje
fun DependencyHandler.projectArchives(name: String): ProjectDependency = project(name, configuration = "archives") fun DependencyHandler.projectArchives(name: String): ProjectDependency = project(name, configuration = "archives")
fun DependencyHandler.projectClasses(name: String): ProjectDependency = project(name, configuration = "classes-dirs") 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 val Project.protobufVersion: String get() = findProperty("versions.protobuf") as String
fun Project.protobufFull(): String = "org.jetbrains.kotlin:protobuf-relocated:" + findProperty("versions.protobuf-java") 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()) fun File.matchMaybeVersionedArtifact(baseName: String) = name.matches(baseName.toMaybeVersionedJarRegex())
settings.gradle
+2 -2
View File
@@ -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-serialization-unshaded').projectDir = file("$rootDir/libraries/tools/kotlin-serialization-unshaded")
project(':kotlin-idl2k').projectDir = file("$rootDir/libraries/tools/idl2k") project(':kotlin-idl2k').projectDir = file("$rootDir/libraries/tools/idl2k")
// Uncomment to use locally built protobuf-relocated
includeBuild("custom-dependencies/protobuf") // includeBuild("custom-dependencies/protobuf")