From 55bfea222c6bcfe792c1679c644cabe12c9cafd1 Mon Sep 17 00:00:00 2001 From: Joshua Gleitze Date: Sat, 28 Feb 2026 10:51:58 +0100 Subject: [PATCH 1/3] ci: read Java version from .sdkmanrc --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 4 ++-- .tool-versions | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 .tool-versions diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44466a9..0ed784e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0 with: - java-version-file: .tool-versions + java-version-file: .sdkmanrc distribution: temurin - name: Setup Gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 56366c6..93449b3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: - name: Setup JDK uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0 with: - java-version-file: .tool-versions + java-version-file: .sdkmanrc distribution: temurin - name: Setup Gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 @@ -45,7 +45,7 @@ jobs: - name: Setup JDK uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0 with: - java-version-file: .tool-versions + java-version-file: .sdkmanrc distribution: temurin - name: Setup Gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 diff --git a/.tool-versions b/.tool-versions deleted file mode 100644 index c3d34cf..0000000 --- a/.tool-versions +++ /dev/null @@ -1 +0,0 @@ -java 25.0.1 \ No newline at end of file From 611ef6da04aa2211d9503caf10fcf3518277df50 Mon Sep 17 00:00:00 2001 From: Joshua Gleitze Date: Sat, 28 Feb 2026 10:57:58 +0100 Subject: [PATCH 2/3] build: include sourcesJar and dokkaJar in assemble --- build.gradle.kts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 8acde15..d5bd213 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -54,6 +54,7 @@ tasks.withType().configureEach { } } +val assemble = tasks.named("assemble") val githubRepository: String? by project val githubOwner = githubRepository?.split("/")?.get(0) @@ -65,6 +66,7 @@ val sourcesJar by tasks.registering(Jar::class) { archiveClassifier = "sources" from(sourceSets.main.map { it.allSource }) } +assemble { dependsOn(sourcesJar) } dokka { dokkaSourceSets.main { @@ -82,6 +84,7 @@ val dokkaJar by tasks.registering(Jar::class) { archiveClassifier.set("javadoc") from(tasks.named("dokkaGeneratePublicationJavadoc")) } +assemble { dependsOn(dokkaJar) } lateinit var publication: MavenPublication lateinit var githubPackages: ArtifactRepository From 3603da6bbca6d96bed718bce965cb73ad7415fa9 Mon Sep 17 00:00:00 2001 From: Joshua Gleitze Date: Sat, 28 Feb 2026 10:58:58 +0100 Subject: [PATCH 3/3] ci: run only gradle build --- .github/workflows/ci.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ed784e..8ce9c0e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,12 +25,8 @@ jobs: distribution: temurin - name: Setup Gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 - - name: Prepare - run: ./gradlew clean dependencies - name: Build - run: ./gradlew assemble testClasses - - name: Test - run: ./gradlew test -PtestTargetJavaVersion=${{ matrix.java-version }} + run: ./gradlew build -PtestTargetJavaVersion=${{ matrix.java-version }} - name: Publish Test Report uses: scacap/action-surefire-report@c38a2d74b9840ae8950a4387ae02b637421d0f39 # v1.13.0 if: failure()