From ef8e4654ab55c9ed631f99faff264511e357a626 Mon Sep 17 00:00:00 2001 From: Mutsuki Date: Wed, 2 Sep 2026 18:03:32 +0800 Subject: [PATCH] Fix Eclipse source attachment for the core JAR --- .../openai/gradle/VerifyCoreCompilationArtifactTask.kt | 5 ++--- openai-java-core/build.gradle.kts | 8 +------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/buildSrc/src/main/kotlin/com/openai/gradle/VerifyCoreCompilationArtifactTask.kt b/buildSrc/src/main/kotlin/com/openai/gradle/VerifyCoreCompilationArtifactTask.kt index f8c598c24..93732ef0c 100644 --- a/buildSrc/src/main/kotlin/com/openai/gradle/VerifyCoreCompilationArtifactTask.kt +++ b/buildSrc/src/main/kotlin/com/openai/gradle/VerifyCoreCompilationArtifactTask.kt @@ -51,8 +51,7 @@ abstract class VerifyCoreCompilationArtifactTask : DefaultTask() { actual = binaryEntries.keys.filterTo(sortedSetOf()) { it.endsWith(".class") }, ) - val expectedSources = - relativeFiles(sourceDirectory.get().asFile, ".kt").mapTo(sortedSetOf()) { "main/$it" } + val expectedSources = relativeFiles(sourceDirectory.get().asFile, ".kt").toSortedSet() check(expectedSources.isNotEmpty()) { "The core source directory is empty." } val sourceEntries = zipEntryCounts(sourcesJar.get().asFile) @@ -72,7 +71,7 @@ abstract class VerifyCoreCompilationArtifactTask : DefaultTask() { "Public API class must appear exactly once in the core jar: $className" } - val sourceEntry = "main/${className.substringBefore('$').replace('.', '/')}.kt" + val sourceEntry = "${className.substringBefore('$').replace('.', '/')}.kt" check(sourceEntries[sourceEntry] == 1) { "Public API source must appear exactly once in the core sources jar: $className" } diff --git a/openai-java-core/build.gradle.kts b/openai-java-core/build.gradle.kts index bfd85f640..a240d3fd3 100644 --- a/openai-java-core/build.gradle.kts +++ b/openai-java-core/build.gradle.kts @@ -88,13 +88,7 @@ val coreJar = tasks.named("jar") { val coreSourcesJar = tasks.named("kotlinSourcesJar") { duplicatesStrategy = DuplicatesStrategy.FAIL - from( - fileTree("src/main/kotlin").matching { - include(CoreCompilationClaimedSourceIncludeSpec()) - } - ) { - into("main") - } + from(fileTree("src/main/kotlin").matching { include(CoreCompilationClaimedSourceIncludeSpec()) }) } val verifyCoreCompilationArtifact =