[Build] Update protobuf repacking build script

1. Update protobuf version to `4.29.3`
2. Update the script of repacking protobuf-lite. In the current
version it is a separate artifact and not the part of common
`protobuf-java`.

#KT-74258

Author: ivandev0

dependencies/protobuf/build.gradle.kts

@@ -6,8 +6,8 @@ How to Publish
 3. Execute `./gradlew -p dependencies/protobuf publish -PkotlinSpaceUsername=usr -PkotlinSpacePassword=token`
  */
 
-val protobufVersion by extra("2.6.1")
-val publishedVersion by extra("2.6.1-1")
+val protobufVersion by extra("4.29.3")
+val publishedVersion by extra("4.29.3-1")
 
 allprojects {
     group = "org.jetbrains.kotlin"

dependencies/protobuf/protobuf-lite/build.gradle.kts

@@ -1,126 +1,64 @@
-
-import java.io.BufferedOutputStream
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import java.io.File
-import java.io.FileOutputStream
-import java.util.jar.JarEntry
-import java.util.jar.JarFile
-import java.util.zip.ZipOutputStream
 
 plugins {
-    base
+    `java-base`
     `maven-publish`
+    id("com.github.johnrengelman.shadow") version "4.0.3" apply false
+}
+
+repositories {
+    mavenCentral()
 }
 
 val relocatedProtobuf by configurations.creating
 val relocatedProtobufSources by configurations.creating
 
 val protobufVersion: String by rootProject.extra
-val outputJarPath = "$buildDir/libs/protobuf-lite-$protobufVersion.jar"
-val sourcesJarName = "protobuf-lite-$protobufVersion-sources.jar"
+
+val renamedSources = "${layout.buildDirectory.get()}/renamedSrc/"
+val outputJarsPath = "${layout.buildDirectory.get()}/libs"
 
 dependencies {
-    relocatedProtobuf(project(":protobuf-relocated"))
+    relocatedProtobuf("com.google.protobuf:protobuf-javalite:$protobufVersion") { isTransitive = false }
+    relocatedProtobufSources("com.google.protobuf:protobuf-javalite:$protobufVersion:sources") { isTransitive = false }
 }
 
-val prepare by tasks.registering {
-    inputs.files(relocatedProtobuf) // this also adds a dependency
-    outputs.file(outputJarPath)
-    doFirst {
-        File(outputJarPath).parentFile.mkdirs()
-    }
-    doLast {
-        val INCLUDE_START = "<include>**/"
-        val INCLUDE_END = ".java</include>"
-        val POM_PATH = "META-INF/maven/com.google.protobuf/protobuf-java/pom.xml"
-
-        fun loadAllFromJar(file: File): Map<String, Pair<JarEntry, ByteArray>> {
-            val result = hashMapOf<String, Pair<JarEntry, ByteArray>>()
-            JarFile(file).use { jar ->
-                for (jarEntry in jar.entries()) {
-                    result[jarEntry.name] = Pair(jarEntry, jar.getInputStream(jarEntry).readBytes())
-                }
-            }
-            return result
-        }
-
-        val mainJar = relocatedProtobuf.resolvedConfiguration.resolvedArtifacts.single {
-            it.name == "protobuf-relocated" && it.classifier == null
-        }.file
-
-        val allFiles = loadAllFromJar(mainJar)
-
-        val keepClasses = arrayListOf<String>()
+val prepare = tasks.register<ShadowJar>("prepare") {
+    destinationDirectory.set(File(outputJarsPath))
+    archiveVersion.set(protobufVersion)
+    archiveClassifier.set("")
+    from(relocatedProtobuf)
 
-        val pomBytes = allFiles[POM_PATH]?.second ?: error("pom.xml is not found in protobuf jar at $POM_PATH")
-        val lines = String(pomBytes).lines()
-
-        var liteProfileReached = false
-        for (lineUntrimmed in lines) {
-            val line = lineUntrimmed.trim()
-
-            if (liteProfileReached && line == "</includes>") {
-                break
-            }
-            else if (line == "<id>lite</id>") {
-                liteProfileReached = true
-                continue
-            }
-
-            if (liteProfileReached && line.startsWith(INCLUDE_START) && line.endsWith(INCLUDE_END)) {
-                keepClasses.add(line.removeSurrounding(INCLUDE_START, INCLUDE_END))
-            }
-        }
-
-        assert(liteProfileReached && keepClasses.isNotEmpty()) { "Wrong pom.xml or the format has changed, check its contents at $POM_PATH" }
-
-        val outputFile = File(outputJarPath).apply { delete() }
-        ZipOutputStream(BufferedOutputStream(FileOutputStream(outputFile))).use { output ->
-            for ((name, value) in allFiles) {
-                val className = name.substringAfter("org/jetbrains/kotlin/protobuf/").substringBeforeLast(".class")
-                if (keepClasses.any { className == it || className.startsWith(it + "$") }) {
-                    val (entry, bytes) = value
-                    output.putNextEntry(entry)
-                    output.write(bytes)
-                    output.closeEntry()
-                }
-            }
-        }
+    relocate("com.google.protobuf", "org.jetbrains.kotlin.protobuf" ) {
+        exclude("META-INF/maven/com.google.protobuf/protobuf-javalite/pom.properties")
     }
 }
 
-val prepareSources = tasks.register<Copy>("prepareSources") {
-    dependsOn(":protobuf-relocated:prepareSources")
-    from(provider {
-        relocatedProtobuf
-                .resolvedConfiguration
-                .resolvedArtifacts
-                .single { it.name == "protobuf-relocated" && it.classifier == "sources" }.file
-    })
+val relocateSources = task<Copy>("relocateSources") {
+    from(
+        provider {
+            zipTree(relocatedProtobufSources.files.single())
+        }
+    )
 
-    into("$buildDir/libs/")
-    rename { sourcesJarName }
-}
+    into(renamedSources)
 
-val mainArtifact = artifacts.add(
-    "default",
-    provider {
-        prepare.get().outputs.files.singleFile
-    }
-) {
-    builtBy(prepare)
-    classifier = ""
+    filter { it.replace("com.google.protobuf", "org.jetbrains.kotlin.protobuf") }
 }
 
-val sourcesArtifact = artifacts.add("default", File("$buildDir/libs/$sourcesJarName")) {
-    builtBy(prepareSources)
-    classifier = "sources"
+val prepareSources = task<Jar>("prepareSources") {
+    destinationDirectory.set(File(outputJarsPath))
+    archiveVersion.set(protobufVersion)
+    archiveClassifier.set("sources")
+    from(relocateSources)
 }
 
 publishing {
     publications {
         create<MavenPublication>("maven") {
-            artifact(mainArtifact)
-            artifact(sourcesArtifact)
+            artifact(prepare)
+            artifact(prepareSources)
         }
     }
 

dependencies/protobuf/protobuf-relocated/build.gradle.kts

@@ -15,38 +15,30 @@ val baseProtobuf by configurations.creating
 val baseProtobufSources by configurations.creating
 
 val protobufVersion: String by rootProject.extra
-val protobufJarPrefix = "protobuf-$protobufVersion"
 
-val renamedSources = "$buildDir/renamedSrc/"
-val outputJarsPath = "$buildDir/libs"
+val renamedSources = "${layout.buildDirectory.get()}/renamedSrc/"
+val outputJarsPath = "${layout.buildDirectory.get()}/libs"
 
 dependencies {
-    baseProtobuf("com.google.protobuf:protobuf-java:$protobufVersion")
-    baseProtobufSources("com.google.protobuf:protobuf-java:$protobufVersion:sources")
+    baseProtobuf("com.google.protobuf:protobuf-java:$protobufVersion") { isTransitive = false }
+    baseProtobufSources("com.google.protobuf:protobuf-java:$protobufVersion:sources") { isTransitive = false }
 }
 
 val prepare = tasks.register<ShadowJar>("prepare") {
     destinationDirectory.set(File(outputJarsPath))
     archiveVersion.set(protobufVersion)
     archiveClassifier.set("")
-    from(
-        provider {
-            baseProtobuf.files.find { it.name.startsWith("protobuf-java") }?.canonicalPath
-        }
-    )
+    from(baseProtobuf)
 
     relocate("com.google.protobuf", "org.jetbrains.kotlin.protobuf" ) {
         exclude("META-INF/maven/com.google.protobuf/protobuf-java/pom.properties")
     }
 }
 
-artifacts.add("default", prepare)
-
 val relocateSources = task<Copy>("relocateSources") {
     from(
         provider {
-            zipTree(baseProtobufSources.files.find { it.name.startsWith("protobuf-java") && it.name.endsWith("-sources.jar") }
-                        ?: throw GradleException("sources jar not found among ${baseProtobufSources.files}"))
+            zipTree(baseProtobufSources.files.single())
         }
     )
 
@@ -62,8 +54,6 @@ val prepareSources = task<Jar>("prepareSources") {
     from(relocateSources)
 }
 
-artifacts.add("default", prepareSources)
-
 publishing {
     publications {
         create<MavenPublication>("maven") {