Merge pull request #9 from run-llama/stainless/release

Release SDK updates

Author: yongpark

.github/workflows/publish-sonatype.yml

@@ -33,7 +33,7 @@ jobs:
           export -- GPG_SIGNING_KEY_ID
           printenv -- GPG_SIGNING_KEY | gpg --batch --passphrase-fd 3 --import 3<<< "$GPG_SIGNING_PASSWORD"
           GPG_SIGNING_KEY_ID="$(gpg --with-colons --list-keys | awk -F : -- '/^pub:/ { getline; print "0x" substr($10, length($10) - 7) }')"
-          ./gradlew publish --no-configuration-cache
+          ./gradlew publishAndReleaseToMavenCentral --stacktrace -PmavenCentralUsername="$SONATYPE_USERNAME" -PmavenCentralPassword="$SONATYPE_PASSWORD" --no-configuration-cache
         env:
           SONATYPE_USERNAME: ${{ secrets.LLAMA_CLOUD_SONATYPE_USERNAME || secrets.SONATYPE_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.LLAMA_CLOUD_SONATYPE_PASSWORD || secrets.SONATYPE_PASSWORD }}

build.gradle.kts

@@ -1,5 +1,4 @@
 plugins {
-    id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
     id("org.jetbrains.dokka") version "2.0.0"
 }
 
@@ -34,15 +33,3 @@ tasks.named("dokkaJavadocCollector").configure {
         .filter { it.project.name != "llama-cloud" && it.name == "dokkaJavadocJar" }
         .forEach { mustRunAfter(it) }
 }
-
-nexusPublishing {
-    repositories {
-        sonatype {
-            nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
-            snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
-
-            username.set(System.getenv("SONATYPE_USERNAME"))
-            password.set(System.getenv("SONATYPE_PASSWORD"))
-        }
-    }
-}

buildSrc/build.gradle.kts

@@ -1,12 +1,15 @@
 plugins {
     `kotlin-dsl`
     kotlin("jvm") version "1.9.20"
+    id("com.vanniktech.maven.publish") version "0.28.0"
 }
 
 repositories {
     gradlePluginPortal()
+    mavenCentral()
 }
 
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20")
+    implementation("com.vanniktech:gradle-maven-publish-plugin:0.28.0")
 }

buildSrc/src/main/kotlin/llama-cloud.java.gradle.kts

@@ -8,11 +8,6 @@ repositories {
     mavenCentral()
 }
 
-configure<JavaPluginExtension> {
-    withJavadocJar()
-    withSourcesJar()
-}
-
 java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(21))
@@ -27,10 +22,6 @@ tasks.withType<JavaCompile>().configureEach {
     options.release.set(8)
 }
 
-tasks.named<Jar>("javadocJar") {
-    setZip64(true)
-}
-
 tasks.named<Jar>("jar") {
     manifest {
         attributes(mapOf(

buildSrc/src/main/kotlin/llama-cloud.publish.gradle.kts

@@ -1,68 +1,71 @@
+import com.vanniktech.maven.publish.JavadocJar
+import com.vanniktech.maven.publish.KotlinJvm
+import com.vanniktech.maven.publish.MavenPublishBaseExtension
+import com.vanniktech.maven.publish.SonatypeHost
+
 plugins {
-    `maven-publish`
-    signing
+    id("com.vanniktech.maven.publish")
+}
+
+publishing {
+  repositories {
+      if (project.hasProperty("publishLocal")) {
+          maven {
+              name = "LocalFileSystem"
+              url = uri("${rootProject.layout.buildDirectory.get()}/local-maven-repo")
+          }
+      }
+  }
 }
 
-configure<PublishingExtension> {
-    publications {
-        register<MavenPublication>("maven") {
-            from(components["java"])
+repositories {
+    gradlePluginPortal()
+    mavenCentral()
+}
 
-            pom {
-                name.set("Llama Platform")
-                description.set("An SDK library for llama-cloud")
-                url.set("https://developers.llamaindex.ai/")
+extra["signingInMemoryKey"] = System.getenv("GPG_SIGNING_KEY")
+extra["signingInMemoryKeyId"] = System.getenv("GPG_SIGNING_KEY_ID")
+extra["signingInMemoryKeyPassword"] = System.getenv("GPG_SIGNING_PASSWORD")
 
-                licenses {
-                    license {
-                        name.set("MIT")
-                    }
-                }
+configure<MavenPublishBaseExtension> {
+    if (!project.hasProperty("publishLocal")) {
+        signAllPublications()
+        publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
+    }
 
-                developers {
-                    developer {
-                        name.set("Llama Cloud")
-                    }
-                }
+    coordinates(project.group.toString(), project.name, project.version.toString())
+    configure(
+        KotlinJvm(
+            javadocJar = JavadocJar.Dokka("dokkaJavadoc"),
+            sourcesJar = true,
+        )
+    )
 
-                scm {
-                    connection.set("scm:git:git://github.com/run-llama/llama-parse-java.git")
-                    developerConnection.set("scm:git:git://github.com/run-llama/llama-parse-java.git")
-                    url.set("https://github.com/run-llama/llama-parse-java")
-                }
+    pom {
+        name.set("Llama Platform")
+        description.set("An SDK library for llama-cloud")
+        url.set("https://developers.llamaindex.ai/")
 
-                versionMapping {
-                    allVariants {
-                        fromResolutionResult()
-                    }
-                }
+        licenses {
+            license {
+                name.set("MIT")
             }
         }
-    }
-    repositories {
-        if (project.hasProperty("publishLocal")) {
-            maven {
-                name = "LocalFileSystem"
-                url = uri("${rootProject.layout.buildDirectory.get()}/local-maven-repo")
+
+        developers {
+            developer {
+                name.set("Llama Cloud")
             }
         }
-    }
-}
 
-signing {
-    val signingKeyId = System.getenv("GPG_SIGNING_KEY_ID")?.ifBlank { null }
-    val signingKey = System.getenv("GPG_SIGNING_KEY")?.ifBlank { null }
-    val signingPassword = System.getenv("GPG_SIGNING_PASSWORD")?.ifBlank { null }
-    if (signingKey != null && signingPassword != null) {
-        useInMemoryPgpKeys(
-            signingKeyId,
-            signingKey,
-            signingPassword,
-        )
-        sign(publishing.publications["maven"])
+        scm {
+            connection.set("scm:git:git://github.com/run-llama/llama-parse-java.git")
+            developerConnection.set("scm:git:git://github.com/run-llama/llama-parse-java.git")
+            url.set("https://github.com/run-llama/llama-parse-java")
+        }
     }
 }
 
-tasks.named("publish") {
-    dependsOn(":closeAndReleaseSonatypeStagingRepository")
+tasks.withType<Zip>().configureEach {
+    isZip64 = true
 }