feat(api): update via SDK Studio

.github/workflows/ci.yml

@@ -35,3 +35,4 @@ jobs:
       - name: Run lints
         run: ./scripts/lint
 
+

.github/workflows/publish-sonatype.yml

@@ -30,7 +30,7 @@ jobs:
 
       - name: Publish to Sonatype
         run: |
-          ./gradlew --parallel --no-daemon publish
+          ./gradlew publishAndReleaseToMavenCentral --stacktrace -PmavenCentralUsername="$SONATYPE_USERNAME" -PmavenCentralPassword="$SONATYPE_PASSWORD"
         env:
           SONATYPE_USERNAME: ${{ secrets.OPENLAYER_SONATYPE_USERNAME || secrets.SONATYPE_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.OPENLAYER_SONATYPE_PASSWORD || secrets.SONATYPE_PASSWORD }}

build.gradle.kts

@@ -1,20 +1,10 @@
 plugins {
-    id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
+
 }
 
 allprojects {
     group = "com.openlayer.api"
     version = "0.1.0-alpha.1" // x-release-please-version
 }
 
-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,16 @@
 plugins {
     `kotlin-dsl`
+    kotlin("jvm") version "1.9.22"
+    id("com.vanniktech.maven.publish") version "0.28.0"
 }
 
 repositories {
     gradlePluginPortal()
+    mavenCentral()
 }
 
 dependencies {
     implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23")
+    implementation("com.vanniktech:gradle-maven-publish-plugin:0.28.0")
 }

buildSrc/src/main/kotlin/openlayer.java.gradle.kts

@@ -1,6 +1,9 @@
 import com.diffplug.gradle.spotless.SpotlessExtension
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
-import java.util.Locale
+import com.vanniktech.maven.publish.JavaLibrary
+import com.vanniktech.maven.publish.JavadocJar
+import com.vanniktech.maven.publish.MavenPublishBaseExtension
+import com.vanniktech.maven.publish.SonatypeHost
 
 plugins {
     `java-library`
@@ -11,11 +14,6 @@ repositories {
     mavenCentral()
 }
 
-configure<JavaPluginExtension> {
-    withJavadocJar()
-    withSourcesJar()
-}
-
 configure<SpotlessExtension> {
     java {
         importOrder()
@@ -35,10 +33,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/openlayer.kotlin.gradle.kts

@@ -1,5 +1,6 @@
 import com.diffplug.gradle.spotless.SpotlessExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import com.vanniktech.maven.publish.*
 
 plugins {
     id("openlayer.java")

buildSrc/src/main/kotlin/openlayer.publish.gradle.kts

@@ -3,65 +3,52 @@ import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.register
 import org.gradle.kotlin.dsl.get
+import com.vanniktech.maven.publish.JavaLibrary
+import com.vanniktech.maven.publish.JavadocJar
+import com.vanniktech.maven.publish.MavenPublishBaseExtension
+import com.vanniktech.maven.publish.SonatypeHost
 
 plugins {
-    `maven-publish`
-    `signing`
+    id("com.vanniktech.maven.publish")
 }
 
-configure<PublishingExtension> {
-    publications {
-        register<MavenPublication>("maven") {
-            from(components["java"])
+repositories {
+    gradlePluginPortal()
+    mavenCentral()
+}
 
-            pom {
-                name.set("Openlayer API")
-                description.set("API for interacting with the Openlayer server.")
-                url.set("https://openlayer.com/docs/api-reference/rest/overview")
+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("Apache-2.0")
-                    }
-                }
+configure<MavenPublishBaseExtension> {
+    signAllPublications()
+    publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
 
-                developers {
-                    developer {
-                        name.set("Openlayer")
-                        email.set("[email protected]")
-                    }
-                }
+    this.coordinates(project.group.toString(), project.name, project.version.toString())
 
-                scm {
-                    connection.set("scm:git:git://github.com/openlayer-ai/openlayer-java.git")
-                    developerConnection.set("scm:git:git://github.com/openlayer-ai/openlayer-java.git")
-                    url.set("https://github.com/openlayer-ai/openlayer-java")
-                }
+    pom {
+        name.set("Openlayer API")
+        description.set("API for interacting with the Openlayer server.")
+        url.set("https://openlayer.com/docs/api-reference/rest/overview")
 
-                versionMapping {
-                    allVariants {
-                        fromResolutionResult()
-                    }
-                }
+        licenses {
+            license {
+                name.set("Apache-2.0")
             }
         }
-    }
-}
 
-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"])
-    }
-}
+        developers {
+            developer {
+                name.set("Openlayer")
+                email.set("[email protected]")
+            }
+        }
 
-tasks.named("publish") {
-    dependsOn(":closeAndReleaseSonatypeStagingRepository")
+        scm {
+            connection.set("scm:git:git://github.com/openlayer-ai/openlayer-java.git")
+            developerConnection.set("scm:git:git://github.com/openlayer-ai/openlayer-java.git")
+            url.set("https://github.com/openlayer-ai/openlayer-java")
+        }
+    }
 }

openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/BinaryResponseContent.kt

@@ -1,13 +1,14 @@
 package com.openlayer.api.core.http
 
-import java.io.Closeable
 import java.io.IOException
 import java.io.InputStream
 import java.io.OutputStream
+import java.lang.AutoCloseable
+import java.util.Optional
 
-interface BinaryResponseContent : Closeable {
+interface BinaryResponseContent : AutoCloseable {
 
-    fun contentType(): String?
+    fun contentType(): Optional<String>
 
     fun body(): InputStream
 

openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/HttpClient.kt

@@ -1,10 +1,10 @@
 package com.openlayer.api.core.http
 
 import com.openlayer.api.core.RequestOptions
-import java.io.Closeable
+import java.lang.AutoCloseable
 import java.util.concurrent.CompletableFuture
 
-interface HttpClient : Closeable {
+interface HttpClient : AutoCloseable {
 
     fun execute(
         request: HttpRequest,

openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/HttpRequestBody.kt

@@ -1,10 +1,10 @@
 package com.openlayer.api.core.http
 
-import java.io.Closeable
 import java.io.IOException
 import java.io.OutputStream
+import java.lang.AutoCloseable
 
-interface HttpRequestBody : Closeable {
+interface HttpRequestBody : AutoCloseable {
 
     @Throws(IOException::class) fun writeTo(outputStream: OutputStream)
 

openlayer-java-core/src/main/kotlin/com/openlayer/api/core/http/HttpResponse.kt

@@ -1,10 +1,10 @@
 package com.openlayer.api.core.http
 
 import com.google.common.collect.ListMultimap
-import java.io.Closeable
 import java.io.InputStream
+import java.lang.AutoCloseable
 
-interface HttpResponse : Closeable {
+interface HttpResponse : AutoCloseable {
 
     fun statusCode(): Int
 

openlayer-java-core/src/main/kotlin/com/openlayer/api/services/Handlers.kt

@@ -19,6 +19,7 @@ import com.openlayer.api.errors.UnexpectedStatusCodeException
 import com.openlayer.api.errors.UnprocessableEntityException
 import java.io.InputStream
 import java.io.OutputStream
+import java.util.Optional
 
 @JvmSynthetic internal fun emptyHandler(): Handler<Void?> = EmptyHandler
 
@@ -38,7 +39,18 @@ private object StringHandler : Handler<String> {
 
 private object BinaryHandler : Handler<BinaryResponseContent> {
     override fun handle(response: HttpResponse): BinaryResponseContent {
-        return BinaryResponseContentImpl(response)
+        return object : BinaryResponseContent {
+            override fun contentType(): Optional<String> =
+                Optional.ofNullable(response.headers().get("Content-Type").firstOrNull())
+
+            override fun body(): InputStream = response.body()
+
+            override fun close() = response.close()
+
+            override fun writeTo(outputStream: OutputStream) {
+                response.body().copyTo(outputStream)
+            }
+        }
     }
 }
 
@@ -107,24 +119,3 @@ internal fun <T> Handler<T>.withErrorHandler(errorHandler: Handler<OpenlayerErro
         }
     }
 }
-
-class BinaryResponseContentImpl
-constructor(
-    private val response: HttpResponse,
-) : BinaryResponseContent {
-    override fun contentType(): String? {
-        return response.headers().get("Content-Type").firstOrNull()
-    }
-
-    override fun body(): InputStream {
-        return response.body()
-    }
-
-    override fun writeTo(outputStream: OutputStream) {
-        response.body().copyTo(outputStream)
-    }
-
-    override fun close() {
-        response.body().close()
-    }
-}

scripts/mock

@@ -21,7 +21,7 @@ echo "==> Starting mock server with URL ${URL}"
 
 # Run prism mock on the given spec
 if [ "$1" == "--daemon" ]; then
-  npm exec --package=@stainless-api/[email protected].4 -- prism mock "$URL" &> .prism.log &
+  npm exec --package=@stainless-api/[email protected].5 -- prism mock "$URL" &> .prism.log &
 
   # Wait for server to come online
   echo -n "Waiting for server"
@@ -37,5 +37,5 @@ if [ "$1" == "--daemon" ]; then
 
   echo
 else
-  npm exec --package=@stainless-api/[email protected].4 -- prism mock "$URL"
+  npm exec --package=@stainless-api/[email protected].5 -- prism mock "$URL"
 fi