Merge pull request #2 from framefork/fp/consume-framefork-build

build: migrate to the org.framefork.build convention plugin

Author: fprochazka

.github/workflows/gradle-build.yml

@@ -11,33 +11,40 @@ env:
 
 jobs:
   gradle:
+    name: JDK ${{ matrix.jdk }}
+    runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        java: [21, 22, 23]
-    runs-on: ubuntu-latest
+        jdk: [21, 22, 23]
     steps:
       - uses: actions/checkout@v4
 
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: ${{ matrix.java }}
+          java-version: | # the last one is the daemon/compile JDK and must be >= 21 (org.framefork.build's module metadata needs a 21+ daemon); compilation stays on it while the matrix JDK is the test launcher via -Ptests.jdk.version (compile-once-test-many)
+            ${{ matrix.jdk }}
+            21
           cache: gradle
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
         with:
           add-job-summary-as-pr-comment: on-failure
 
+      - name: Gradle toolchains info
+        run: ./gradlew -q javaToolchains -Ptests.jdk.version=${{ matrix.jdk }}
+
       - name: Execute Gradle build
-        run: ./gradlew --continue build
+        run: ./gradlew --continue build -Ptests.jdk.version=${{ matrix.jdk }}
 
       - name: Upload Test Report
         uses: actions/upload-artifact@v4
         if: always() # always run even if the previous step fails
         with:
-          name: junit-test-results
+          name: junit-test-results-jdk${{ matrix.jdk }}
           path: '**/build/test-results/test/TEST-*.xml'
           retention-days: 1
           overwrite: true

build.gradle.kts

@@ -1,17 +1,11 @@
 plugins {
     id("base")
     id("idea")
-    id("org.barfuin.gradle.taskinfo") version ("2.2.0") // ./gradlew tiTree publish
-    id("be.vbgn.ci-detect") version ("0.5.0")
-}
-
-repositories {
-    mavenCentral()
-    mavenLocal()
+    id("org.barfuin.gradle.taskinfo") version ("3.0.2") // ./gradlew tiTree publish
 }
 
 group = "org.framefork"
-version = (properties["version"] as String).trim()
+version = providers.gradleProperty("version").get().trim()
 
 allprojects {
     group = rootProject.group
@@ -22,15 +16,10 @@ tasks.withType<Wrapper> {
     distributionType = Wrapper.DistributionType.ALL
 }
 
-tasks.register<Delete>("cleanAllPublications") {
-    outputs.upToDateWhen { false }
-    setDelete(rootProject.layout.buildDirectory.dir("staging-deploy"))
-}
-
 allprojects {
     apply(plugin = "project-report")
 
-    this.task("allDependencies", DependencyReportTask::class) {
+    this.tasks.register<DependencyReportTask>("allDependencies") {
         evaluationDependsOnChildren()
         this.setRenderer(org.gradle.api.tasks.diagnostics.internal.dependencies.AsciiDependencyReportRenderer().apply {
             outputFile = file(project.layout.buildDirectory.file("reports/dependencies.txt"))

buildSrc/build.gradle.kts

@@ -6,14 +6,9 @@ org.gradle.configuration-cache=false
 org.gradle.console=verbose
 org.gradle.warning.mode=all
 
-kapt.use.k2=true
-# Enable Kapt Incremental annotation processing requeste
-kapt.incremental.apt=true
-# Decrease gradle builds time
-kapt.use.worker.api=true
-# turn off AP discovery in compile path, and therefore turn on Compile Avoidance
-kapt.include.compile.classpath=false
-# Enable In Logcat to determine Kapt
-#kapt.verbose=true
+org.gradle.jvmargs="-XX:MaxMetaspaceSize=512m"
+
+org.gradle.java.installations.auto-detect=true
+org.gradle.java.installations.auto-download=false
 
 systemProp.file.encoding=UTF-8

buildSrc/src/main/kotlin/framefork.java-public.gradle.kts

@@ -1,11 +1,8 @@
 [versions]
-googleAutoService = "1.1.1"
 junit-jupiter = "5.10.3"
 spring-boot = "3.2.0"
 
 [libraries]
-autoService-processor = { group = "com.google.auto.service", name = "auto-service", version.ref = "googleAutoService" }
-autoService-annotations = { group = "com.google.auto.service", name = "auto-service-annotations", version.ref = "googleAutoService" }
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" }
 assertj = { module = "org.assertj:assertj-core", version = "3.11.1" }
 logback-classic = { module = "ch.qos.logback:logback-classic", version = "1.5.12" }

buildSrc/src/main/kotlin/framefork.java.gradle.kts

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-all.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists