From 9918710d4100a99c5affa99712079d5801004aea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Aug 2026 00:06:20 +0000 Subject: [PATCH 1/3] build(deps): bump com.vanniktech:gradle-maven-publish-plugin in / Bumps [com.vanniktech:gradle-maven-publish-plugin](https://github.com/vanniktech/gradle-maven-publish-plugin) in `/` from 0.28.0 to 0.37.0. Updates `com.vanniktech:gradle-maven-publish-plugin` from 0.28.0 to 0.37.0 - [Release notes](https://github.com/vanniktech/gradle-maven-publish-plugin/releases) - [Changelog](https://github.com/vanniktech/gradle-maven-publish-plugin/blob/main/CHANGELOG.md) - [Commits](https://github.com/vanniktech/gradle-maven-publish-plugin/compare/0.28.0...0.37.0) --- updated-dependencies: - dependency-name: com.vanniktech:gradle-maven-publish-plugin dependency-version: 0.37.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gradle ... Signed-off-by: dependabot[bot] --- buildSrc/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 11f2dd741..1869b06e3 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,7 +1,7 @@ plugins { `kotlin-dsl` kotlin("jvm") version "1.9.20" - id("com.vanniktech.maven.publish") version "0.28.0" + id("com.vanniktech.maven.publish") version "0.37.0" } repositories { @@ -11,7 +11,7 @@ repositories { dependencies { implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20") - implementation("com.vanniktech:gradle-maven-publish-plugin:0.28.0") + implementation("com.vanniktech:gradle-maven-publish-plugin:0.37.0") testImplementation(kotlin("test")) testImplementation("org.junit.jupiter:junit-jupiter:5.9.3") From 0345d4cb38be99f46db366178683835ed16acaad Mon Sep 17 00:00:00 2001 From: Daniel Piet Date: Thu, 24 Sep 2026 12:14:05 -0400 Subject: [PATCH 2/3] fix(build): use a compatible Maven Publish release and preserve signing --- buildSrc/build.gradle.kts | 4 ++-- .../src/main/kotlin/openai.publish.gradle.kts | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index cb672706b..b8ba6878b 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,7 +1,7 @@ plugins { `kotlin-dsl` kotlin("jvm") version "1.9.20" - id("com.vanniktech.maven.publish") version "0.37.0" + id("com.vanniktech.maven.publish") version "0.34.0" } repositories { @@ -11,7 +11,7 @@ repositories { dependencies { implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20") - implementation("com.vanniktech:gradle-maven-publish-plugin:0.37.0") + implementation("com.vanniktech:gradle-maven-publish-plugin:0.34.0") testImplementation(kotlin("test")) testImplementation("org.junit.jupiter:junit-jupiter:6.1.3") diff --git a/buildSrc/src/main/kotlin/openai.publish.gradle.kts b/buildSrc/src/main/kotlin/openai.publish.gradle.kts index c645c2ed9..cbc16fce8 100644 --- a/buildSrc/src/main/kotlin/openai.publish.gradle.kts +++ b/buildSrc/src/main/kotlin/openai.publish.gradle.kts @@ -1,7 +1,7 @@ import com.vanniktech.maven.publish.JavadocJar import com.vanniktech.maven.publish.KotlinJvm import com.vanniktech.maven.publish.MavenPublishBaseExtension -import com.vanniktech.maven.publish.SonatypeHost +import org.gradle.plugins.signing.SigningExtension plugins { id("com.vanniktech.maven.publish") @@ -23,14 +23,17 @@ repositories { mavenCentral() } -extra["signingInMemoryKey"] = System.getenv("GPG_SIGNING_KEY") -extra["signingInMemoryKeyId"] = System.getenv("GPG_SIGNING_KEY_ID") -extra["signingInMemoryKeyPassword"] = System.getenv("GPG_SIGNING_PASSWORD") - configure { if (!project.hasProperty("publishLocal")) { signAllPublications() - publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL) + configure { + useInMemoryPgpKeys( + System.getenv("GPG_SIGNING_KEY_ID"), + System.getenv("GPG_SIGNING_KEY"), + System.getenv("GPG_SIGNING_PASSWORD"), + ) + } + publishToMavenCentral() } coordinates(project.group.toString(), project.name, project.version.toString()) From 5415ada99f19bfa57148b7047a7140333f31a9d9 Mon Sep 17 00:00:00 2001 From: Daniel Piet Date: Thu, 24 Sep 2026 12:30:14 -0400 Subject: [PATCH 3/3] fix(build): verify the published sources task after plugin upgrade --- buildSrc/src/main/kotlin/openai.publish.gradle.kts | 7 +++++++ openai-java-core/build.gradle.kts | 10 +--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/buildSrc/src/main/kotlin/openai.publish.gradle.kts b/buildSrc/src/main/kotlin/openai.publish.gradle.kts index cbc16fce8..036274115 100644 --- a/buildSrc/src/main/kotlin/openai.publish.gradle.kts +++ b/buildSrc/src/main/kotlin/openai.publish.gradle.kts @@ -70,6 +70,13 @@ configure { } } +// Preserve Kotlin source paths when Maven Publish uses Gradle's Java sources task. +tasks.named("sourcesJar") { + filesMatching("**/*.kt") { + path = "main/$path" + } +} + tasks.withType().configureEach { isZip64 = true } diff --git a/openai-java-core/build.gradle.kts b/openai-java-core/build.gradle.kts index bfd85f640..f2d05d30f 100644 --- a/openai-java-core/build.gradle.kts +++ b/openai-java-core/build.gradle.kts @@ -1,4 +1,3 @@ -import com.openai.gradle.CoreCompilationClaimedSourceIncludeSpec import com.openai.gradle.CoreCompilationClaimedSourceSpec import com.openai.gradle.CoreCompilationDependencies import com.openai.gradle.CoreCompilationShards @@ -86,15 +85,8 @@ val coreJar = tasks.named("jar") { duplicatesStrategy = DuplicatesStrategy.FAIL } -val coreSourcesJar = tasks.named("kotlinSourcesJar") { +val coreSourcesJar = tasks.named("sourcesJar") { duplicatesStrategy = DuplicatesStrategy.FAIL - from( - fileTree("src/main/kotlin").matching { - include(CoreCompilationClaimedSourceIncludeSpec()) - } - ) { - into("main") - } } val verifyCoreCompilationArtifact =