Add library descriptors as git submodule

Author: ileasile

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "libraries"]
+	path = libraries
+	url = https://github.com/Kotlin/kotlin-jupyter-libraries.git

docs/README-STUB.md

@@ -52,7 +52,7 @@ Uninstall: `pip uninstall kotlin-jupyter-kernel`
 ### From sources
 
 ```bash
-git clone [[repo_url]]
+git clone --recurse-submodules [[repo_url]]
 cd kotlin-jupyter
 ./gradlew install
 ```

docs/README.md

@@ -52,7 +52,7 @@ Uninstall: `pip uninstall kotlin-jupyter-kernel`
 ### From sources
 
 ```bash
-git clone https://github.com/Kotlin/kotlin-jupyter.git
+git clone --recurse-submodules https://github.com/Kotlin/kotlin-jupyter.git
 cd kotlin-jupyter
 ./gradlew install
 ```

gradle.properties

@@ -25,6 +25,8 @@ githubRepoName=kotlin-jupyter
 projectRepoUrl=https://github.com/Kotlin/kotlin-jupyter
 docsRepo=[email protected]:ileasile/kotlin-jupyter-docs.git
 pushRepoUrl=[email protected]:Kotlin/kotlin-jupyter.git
+librariesRepoUrl=[email protected]:Kotlin/kotlin-jupyter-libraries.git
+librariesRepoUserAndName=Kotlin/kotlin-jupyter-libraries
 
 # Workaround for https://github.com/Kotlin/dokka/issues/1405
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=1024m -Xmx2048m

kotlin-jupyter-plugin/src/main/kotlin/org/jetbrains/kotlinx/jupyter/build/versionDetection.kt

@@ -4,9 +4,14 @@ import org.gradle.api.Project
 import org.gradle.kotlin.dsl.extra
 import org.gradle.kotlin.dsl.invoke
 import java.io.ByteArrayOutputStream
+import java.io.File
 import java.nio.file.Path
 
-fun Project.getPropertyByCommand(propName: String, cmdArgs: Array<String>): String {
+fun Project.getPropertyByCommand(
+    propName: String,
+    cmdArgs: Array<String>,
+    workingDir: File? = null,
+): String {
     val prop = project.findProperty(propName) as String?
 
     if (prop != null) {
@@ -17,6 +22,7 @@ fun Project.getPropertyByCommand(propName: String, cmdArgs: Array<String>): Stri
     val result = exec {
         commandLine(*cmdArgs)
         standardOutput = outputStream
+        workingDir?.let { this.workingDir = it }
     }
 
     val output = outputStream.toString()

kotlin-jupyter-plugin/src/main/kotlin/org/jetbrains/kotlinx/jupyter/build/versionUpdating.kt

@@ -31,9 +31,6 @@ private val Project.libParamValue get() = prop<String>("jupyter.lib.param.value"
 private val Project.prGithubUser get() = prop<String>("jupyter.github.user")
 private val Project.prGithubToken get() = prop<String>("jupyter.github.token")
 
-private val Project.githubRepoOwner get() = prop<String>("githubRepoUser")
-private val Project.githubRepoName get() = prop<String>("githubRepoName")
-
 @Serializable
 class NewPrData(
     val title: String,
@@ -89,11 +86,12 @@ fun ProjectWithInstallOptions.prepareKotlinVersionUpdateTasks() {
     val pushChangesTask = tasks.register("pushChanges") {
         dependsOn(updateLibraryParamTask)
 
+        val librariesDir = projectDir.resolve(librariesPath)
         fun execGit(vararg args: String, configure: ExecSpec.() -> Unit = {}): ExecResult {
             return exec {
                 this.executable = "git"
                 this.args = args.asList()
-                this.workingDir = projectDir
+                this.workingDir = librariesDir
 
                 configure()
             }
@@ -106,8 +104,13 @@ fun ProjectWithInstallOptions.prepareKotlinVersionUpdateTasks() {
             execGit("add", ".")
             execGit("commit", "-m", "[AUTO] Update library version")
 
-            val repoUrl = rootProject.property("pushRepoUrl") as String
-            execGit("push", "--force", "-u", repoUrl, getCurrentBranch() + ":refs/heads/" + updateLibBranchName!!) {
+            val repoUrl = rootProject.property("librariesRepoUrl") as String
+            val currentBranch = getPropertyByCommand(
+                "build.libraries.branch",
+                arrayOf("git", "rev-parse", "--abbrev-ref", "HEAD"),
+                librariesDir,
+            )
+            execGit("push", "--force", "-u", repoUrl, "$currentBranch:refs/heads/" + updateLibBranchName!!) {
                 this.standardOutput = object : OutputStream() {
                     override fun write(b: Int) { }
                 }
@@ -123,6 +126,7 @@ fun ProjectWithInstallOptions.prepareKotlinVersionUpdateTasks() {
         doLast {
             val user = rootProject.prGithubUser
             val password = rootProject.prGithubToken
+            val repoUserAndName = rootProject.property("librariesRepoUserAndName") as String
             fun githubRequest(
                 method: Method,
                 request: String,
@@ -141,9 +145,8 @@ fun ProjectWithInstallOptions.prepareKotlinVersionUpdateTasks() {
                 return response
             }
 
-            val fullRepo = "${rootProject.githubRepoOwner}/${rootProject.githubRepoName}"
             val prResponse = githubRequest(
-                Method.POST, "repos/$fullRepo/pulls",
+                Method.POST, "repos/$repoUserAndName/pulls",
                 Json.encodeToJsonElement(
                     NewPrData(
                         title = "Update `${rootProject.libName}` library to `${rootProject.libParamValue}`",
@@ -157,7 +160,7 @@ fun ProjectWithInstallOptions.prepareKotlinVersionUpdateTasks() {
 
             val prNumber = (prResponse.jsonObject["number"] as JsonPrimitive).int
             githubRequest(
-                Method.POST, "repos/$fullRepo/issues/$prNumber/labels",
+                Method.POST, "repos/$repoUserAndName/issues/$prNumber/labels",
                 Json.encodeToJsonElement(
                     SetLabelsData(listOf("no-changelog", "library-descriptors"))
                 )