diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index ae5ef3fa7..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.28.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.28.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..036274115 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()) @@ -67,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 =