OneBusAway · stainless-app · Sep 30, 2024 · Sep 30, 2024 · Sep 30, 2024
diff --git a/.github/workflows/publish-sonatype.yml b/.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.ONEBUSAWAY_SDK_SONATYPE_USERNAME || secrets.SONATYPE_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.ONEBUSAWAY_SDK_SONATYPE_PASSWORD || secrets.SONATYPE_PASSWORD }}

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "0.1.0-alpha.1"
+  ".": "0.1.0-alpha.2"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.1.0-alpha.2 (2024-09-30)
+
+Full Changelog: [v0.1.0-alpha.1...v0.1.0-alpha.2](https://github.com/OneBusAway/java-sdk/compare/v0.1.0-alpha.1...v0.1.0-alpha.2)
+
+### Features
+
+* **api:** manual updates ([#4](https://github.com/OneBusAway/java-sdk/issues/4)) ([e9c7b74](https://github.com/OneBusAway/java-sdk/commit/e9c7b741ad5a0469d4f44899a0be89fc14ad2246))
+
 ## 0.1.0-alpha.1 (2024-09-27)
 
 Full Changelog: [v0.0.1-alpha.0...v0.1.0-alpha.1](https://github.com/OneBusAway/java-sdk/compare/v0.0.1-alpha.0...v0.1.0-alpha.1)

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 <!-- x-release-please-start-version -->
 
-[![Maven Central](https://img.shields.io/maven-central/v/com.open_transit.api/onebusaway-sdk-java)](https://central.sonatype.com/artifact/com.open_transit.api/onebusaway-sdk-java/0.1.0-alpha.1)
+[![Maven Central](https://img.shields.io/maven-central/v/org.onebusaway/onebusaway-sdk-java)](https://central.sonatype.com/artifact/org.onebusaway/onebusaway-sdk-java/0.1.0-alpha.2)
 
 <!-- x-release-please-end -->
 
@@ -27,16 +27,16 @@ The REST API documentation can be found on [developer.onebusaway.org](https://d
 <!-- x-release-please-start-version -->
 
 ```kotlin
-implementation("com.open_transit.api:onebusaway-sdk-java:0.1.0-alpha.1")
+implementation("org.onebusaway:onebusaway-sdk-java:0.1.0-alpha.2")
 ```
 
 #### Maven
 
 ```xml
 <dependency>
-    <groupId>com.open_transit.api</groupId>
+    <groupId>org.onebusaway</groupId>
     <artifactId>onebusaway-sdk-java</artifactId>
-    <version>0.1.0-alpha.1</version>
+    <version>0.1.0-alpha.2</version>
 </dependency>
 ```
 
@@ -47,8 +47,8 @@ implementation("com.open_transit.api:onebusaway-sdk-java:0.1.0-alpha.1")
 Use `OnebusawaySdkOkHttpClient.builder()` to configure the client. At a minimum you need to set `.apiKey()`:
 
 ```java
-import com.open_transit.api.client.OnebusawaySdkClient;
-import com.open_transit.api.client.okhttp.OnebusawaySdkOkHttpClient;
+import org.onebusaway.client.OnebusawaySdkClient;
+import org.onebusaway.client.okhttp.OnebusawaySdkOkHttpClient;
 
 OnebusawaySdkClient client = OnebusawaySdkOkHttpClient.builder()
     .apiKey("My API Key")
@@ -81,8 +81,8 @@ To create a new current time, first use the `CurrentTimeRetrieveParams` builder
 then pass that to the `retrieve` method of the `currentTime` service.
 
 ```java
-import com.open_transit.api.models.CurrentTimeRetrieveParams;
-import com.open_transit.api.models.CurrentTimeRetrieveResponse;
+import org.onebusaway.models.CurrentTimeRetrieveParams;
+import org.onebusaway.models.CurrentTimeRetrieveResponse;
 
 CurrentTimeRetrieveParams params = CurrentTimeRetrieveParams.builder().build();
 CurrentTimeRetrieveResponse currentTime = client.currentTime().retrieve(params);
@@ -103,7 +103,7 @@ Sometimes, the API may support other properties that are not yet supported in th
 you can attach them using the `putAdditionalProperty` method.
 
 ```java
-import com.open_transit.api.models.core.JsonValue;
+import org.onebusaway.models.core.JsonValue;
 CurrentTimeRetrieveParams params = CurrentTimeRetrieveParams.builder()
     // ... normal properties
     .putAdditionalProperty("secret_param", JsonValue.from("4242"))

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,20 +1,10 @@
 plugins {
-    id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
+
 }
 
 allprojects {
-    group = "com.open_transit.api"
-    version = "0.1.0-alpha.1" // x-release-please-version
+    group = "org.onebusaway"
+    version = "0.1.0-alpha.2" // 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"))
-        }
-    }
-}
diff --git a/buildSrc/build.gradle.kts b/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")
 }
diff --git a/buildSrc/src/main/kotlin/onebusaway-sdk.java.gradle.kts b/buildSrc/src/main/kotlin/onebusaway-sdk.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(

diff --git a/buildSrc/src/main/kotlin/onebusaway-sdk.kotlin.gradle.kts b/buildSrc/src/main/kotlin/onebusaway-sdk.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("onebusaway-sdk.java")

diff --git a/buildSrc/src/main/kotlin/onebusaway-sdk.publish.gradle.kts b/buildSrc/src/main/kotlin/onebusaway-sdk.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("OneBusAway")
-                description.set("The OneBusAway REST API. For use with servers like\nhttps://api.pugetsound.onebusaway.org")
-                url.set("https://developer.onebusaway.org")
+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("Onebusaway SDK")
-                        email.set("[email protected]")
-                    }
-                }
+    this.coordinates(project.group.toString(), project.name, project.version.toString())
 
-                scm {
-                    connection.set("scm:git:git://github.com/OneBusAway/java-sdk.git")
-                    developerConnection.set("scm:git:git://github.com/OneBusAway/java-sdk.git")
-                    url.set("https://github.com/OneBusAway/java-sdk")
-                }
+    pom {
+        name.set("OneBusAway")
+        description.set("The OneBusAway REST API. For use with servers like\nhttps://api.pugetsound.onebusaway.org")
+        url.set("https://developer.onebusaway.org")
 
-                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("Onebusaway SDK")
+                email.set("[email protected]")
+            }
+        }
 
-tasks.named("publish") {
-    dependsOn(":closeAndReleaseSonatypeStagingRepository")
+        scm {
+            connection.set("scm:git:git://github.com/OneBusAway/java-sdk.git")
+            developerConnection.set("scm:git:git://github.com/OneBusAway/java-sdk.git")
+            url.set("https://github.com/OneBusAway/java-sdk")
+        }
+    }
 }
diff --git a/...transit/api/client/okhttp/OkHttpClient.kt → .../onebusaway/client/okhttp/OkHttpClient.kt b/...transit/api/client/okhttp/OkHttpClient.kt → .../onebusaway/client/okhttp/OkHttpClient.kt
@@ -1,14 +1,7 @@
-package com.open_transit.api.client.okhttp
+package org.onebusaway.client.okhttp
 
 import com.google.common.collect.ListMultimap
 import com.google.common.collect.MultimapBuilder
-import com.open_transit.api.core.RequestOptions
-import com.open_transit.api.core.http.HttpClient
-import com.open_transit.api.core.http.HttpMethod
-import com.open_transit.api.core.http.HttpRequest
-import com.open_transit.api.core.http.HttpRequestBody
-import com.open_transit.api.core.http.HttpResponse
-import com.open_transit.api.errors.OnebusawaySdkIoException
 import java.io.IOException
 import java.io.InputStream
 import java.net.Proxy
@@ -26,6 +19,13 @@ import okhttp3.RequestBody
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import okio.BufferedSink
+import org.onebusaway.core.RequestOptions
+import org.onebusaway.core.http.HttpClient
+import org.onebusaway.core.http.HttpMethod
+import org.onebusaway.core.http.HttpRequest
+import org.onebusaway.core.http.HttpRequestBody
+import org.onebusaway.core.http.HttpResponse
+import org.onebusaway.errors.OnebusawaySdkIoException
 
 class OkHttpClient
 private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val baseUrl: HttpUrl) :

diff --git a/...lient/okhttp/OnebusawaySdkOkHttpClient.kt → ...lient/okhttp/OnebusawaySdkOkHttpClient.kt b/...lient/okhttp/OnebusawaySdkOkHttpClient.kt → ...lient/okhttp/OnebusawaySdkOkHttpClient.kt
@@ -1,14 +1,14 @@
 // File generated from our OpenAPI spec by Stainless.
 
-package com.open_transit.api.client.okhttp
+package org.onebusaway.client.okhttp
 
 import com.fasterxml.jackson.databind.json.JsonMapper
-import com.open_transit.api.client.OnebusawaySdkClient
-import com.open_transit.api.client.OnebusawaySdkClientImpl
-import com.open_transit.api.core.ClientOptions
 import java.net.Proxy
 import java.time.Clock
 import java.time.Duration
+import org.onebusaway.client.OnebusawaySdkClient
+import org.onebusaway.client.OnebusawaySdkClientImpl
+import org.onebusaway.core.ClientOptions
 
 class OnebusawaySdkOkHttpClient private constructor() {
 

diff --git a/.../okhttp/OnebusawaySdkOkHttpClientAsync.kt → .../okhttp/OnebusawaySdkOkHttpClientAsync.kt b/.../okhttp/OnebusawaySdkOkHttpClientAsync.kt → .../okhttp/OnebusawaySdkOkHttpClientAsync.kt
@@ -1,14 +1,14 @@
 // File generated from our OpenAPI spec by Stainless.
 
-package com.open_transit.api.client.okhttp
+package org.onebusaway.client.okhttp
 
 import com.fasterxml.jackson.databind.json.JsonMapper
-import com.open_transit.api.client.OnebusawaySdkClientAsync
-import com.open_transit.api.client.OnebusawaySdkClientAsyncImpl
-import com.open_transit.api.core.ClientOptions
 import java.net.Proxy
 import java.time.Clock
 import java.time.Duration
+import org.onebusaway.client.OnebusawaySdkClientAsync
+import org.onebusaway.client.OnebusawaySdkClientAsyncImpl
+import org.onebusaway.core.ClientOptions
 
 class OnebusawaySdkOkHttpClientAsync private constructor() {
 

diff --git a/...transit/api/client/OnebusawaySdkClient.kt → .../onebusaway/client/OnebusawaySdkClient.kt b/...transit/api/client/OnebusawaySdkClient.kt → .../onebusaway/client/OnebusawaySdkClient.kt
@@ -2,10 +2,10 @@
 
 @file:Suppress("OVERLOADS_INTERFACE") // See https://youtrack.jetbrains.com/issue/KT-36102
 
-package com.open_transit.api.client
+package org.onebusaway.client
 
-import com.open_transit.api.models.*
-import com.open_transit.api.services.blocking.*
+import org.onebusaway.models.*
+import org.onebusaway.services.blocking.*
 
 interface OnebusawaySdkClient {
 

diff --git a/...it/api/client/OnebusawaySdkClientAsync.kt → ...usaway/client/OnebusawaySdkClientAsync.kt b/...it/api/client/OnebusawaySdkClientAsync.kt → ...usaway/client/OnebusawaySdkClientAsync.kt
@@ -2,10 +2,10 @@
 
 @file:Suppress("OVERLOADS_INTERFACE") // See https://youtrack.jetbrains.com/issue/KT-36102
 
-package com.open_transit.api.client
+package org.onebusaway.client
 
-import com.open_transit.api.models.*
-import com.open_transit.api.services.async.*
+import org.onebusaway.models.*
+import org.onebusaway.services.async.*
 
 interface OnebusawaySdkClientAsync {
 

diff --git a/...pi/client/OnebusawaySdkClientAsyncImpl.kt → ...ay/client/OnebusawaySdkClientAsyncImpl.kt b/...pi/client/OnebusawaySdkClientAsyncImpl.kt → ...ay/client/OnebusawaySdkClientAsyncImpl.kt
@@ -1,13 +1,13 @@
 // File generated from our OpenAPI spec by Stainless.
 
-package com.open_transit.api.client
-
-import com.open_transit.api.core.ClientOptions
-import com.open_transit.api.core.http.HttpResponse.Handler
-import com.open_transit.api.errors.OnebusawaySdkError
-import com.open_transit.api.models.*
-import com.open_transit.api.services.async.*
-import com.open_transit.api.services.errorHandler
+package org.onebusaway.client
+
+import org.onebusaway.core.ClientOptions
+import org.onebusaway.core.http.HttpResponse.Handler
+import org.onebusaway.errors.OnebusawaySdkError
+import org.onebusaway.models.*
+import org.onebusaway.services.async.*
+import org.onebusaway.services.errorHandler
 
 class OnebusawaySdkClientAsyncImpl
 constructor(