diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index a94b202..1a2491a 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -2,13 +2,38 @@ name: CI on: push: branches: [ master ] +env: + JAVA_VERSION: '21' + GRADLE_VERSION: '8.14.5' jobs: build: - runs-on: woryzen + name: Compile, test and publish + runs-on: hostinger + timeout-minutes: 30 + container: + image: gitea.woggioni.net/woggioni/gitea-runner/debian:latest steps: - - name: Checkout sources - uses: actions/checkout@v4 - - name: Execute Gradle build + - name: Checkout repository + uses: actions/checkout@v6 + with: + fetch-depth: 0 + - name: Set up JDK + uses: actions/setup-java@v5 + with: + distribution: 'oracle' + java-version: ${{ env.JAVA_VERSION }} + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v6 + with: + gradle-version: ${{ env.GRADLE_VERSION }} + # Only the main branch writes to the cache; PRs/feature branches read-only + cache-read-only: false + + - name: Run Gradle build + run: ./gradlew build --no-daemon + + - name: Publish to Gitea env: PUBLISHER_TOKEN: ${{ secrets.PUBLISHER_TOKEN }} run: ./gradlew build publish diff --git a/finalguard/src/main/java/net/woggioni/gradle/finalguard/FinalGuardPlugin.java b/finalguard/src/main/java/net/woggioni/gradle/finalguard/FinalGuardPlugin.java index b701787..2d244b8 100644 --- a/finalguard/src/main/java/net/woggioni/gradle/finalguard/FinalGuardPlugin.java +++ b/finalguard/src/main/java/net/woggioni/gradle/finalguard/FinalGuardPlugin.java @@ -16,6 +16,7 @@ import org.gradle.api.tasks.compile.JavaCompile; import javax.tools.Diagnostic; import java.io.File; import java.net.URL; +import java.util.Optional; import java.util.jar.Attributes; import java.util.jar.Manifest; @@ -56,7 +57,10 @@ public class FinalGuardPlugin implements Plugin { tasks.withType(JavaCompile.class, javaCompileTask -> { javaCompileTask.doFirst(t -> { final CompileOptions options = javaCompileTask.getOptions(); - options.setAnnotationProcessorPath(options.getAnnotationProcessorPath().plus(javacPluginConfiguration)); + options.setAnnotationProcessorPath(Optional.ofNullable(options.getAnnotationProcessorPath()) + .orElseGet(project::files) + .plus(javacPluginConfiguration) + ); final StringBuilder xpluginArg = new StringBuilder("-Xplugin:").append(JAVAC_PLUGIN_NAME); appendOption(xpluginArg, "default.level", finalGuardExtension.getDefaultLevel()); appendOption(xpluginArg, "local.variable.level", finalGuardExtension.getLocalVariableLevel()); diff --git a/gradle.properties b/gradle.properties index aab1de5..5798c7d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ lys.catalog.version=2026.06.08 -version.myGradlePlugins=2026.06.09 +version.myGradlePlugins=2026.07.13 version.gradle=8.14.5 gitea.maven.url = https://gitea.woggioni.net/api/packages/woggioni/maven