Feature/key

.github/dependabot.yml

@@ -1,18 +1,18 @@
 version: 2
 updates:
-  - package-ecosystem: "maven"
+  - package-ecosystem: "gradle"
     directory: "/"
     schedule:
       interval: "weekly"
     groups:
-      maven-deps:
+      deps:
         patterns:
           - "*"      
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
     groups:
-      gh-actions:
+      deps:
         patterns:
           - "*"

.github/workflows/formatting_check.yml

@@ -39,9 +39,9 @@ jobs:
         with:
           java-version: '21'
           distribution: 'zulu'
-          cache: 'maven'
+          cache: 'gradle'
       - name: Validate Project Checkstyle
-        run: ./mvnw -B checkstyle:check
+        run: ./gradlew checkstyleMain
 
   spotless_check:
     name: Spotless check
@@ -56,10 +56,10 @@ jobs:
         with:
           java-version: '21'
           distribution: 'zulu'
-          cache: 'maven'
+          cache: 'gradle'
       - name: Generate code and format
         run: |
-          ./run_core_metamodel_generator.sh
-          # ./run_core_generators.sh automatically runs ./mvnw spotless:apply
-          ./run_core_generators.sh
+          ./gradlew :jmlparser-metamodel-generators:run
+          ./gradlew :jmlparser-core-generators:run
+          ./gradlew spotlessCheck
           git diff --exit-code

.github/workflows/maven_tests.yml → .github/workflows/gradle_tests.yml

@@ -35,7 +35,7 @@ jobs:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
         ## Different JDK versions have different implementations etc. -- test on all combinations (ideally 8 to latest).
         ### exclude pre-8 (min development version jdk8)
-        jdk: [ 21 ]
+        jdk: [ 21, 25 ]
 
 
     env:
@@ -58,7 +58,7 @@ jobs:
           distribution: 'zulu'              # v2 requires explicitly stating the distribution - `zulu` and `adopt` supported at time of writing
           java-version: ${{ matrix.jdk }}   # Use matrix to select which JDK level to use
           java-package: jdk                 # optional (jdk or jre) - defaults to jdk
-          cache: 'maven'
+          cache: 'gradle'
 
       ## Given that the build matrix only specifies the major version (configurable), output the precise version used.
       - name: Echo exact java version being used
@@ -79,16 +79,17 @@ jobs:
       ### test : run the maven lifecycle stage `test`
       ### -P,--activate-profiles : Comma-delimited list of profiles to activate
       ### AlsoSlowTests : by default, only quick tests are run - the profile `AlsoSlowTests` runs the full test suite
-      - name: Test with Maven (incl. slow tests)
+      - name: Test with Gradle (incl. slow tests)
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: "./mvnw --fail-at-end -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --activate-profiles AlsoSlowTests  -B --errors clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=wadoon_jmlparser"
+        run: |
+          ./gradlew --continue --parallel test
 
       - name: Test reporting
         uses: dorny/test-reporter@v2
         if: success() || failure()
         with:
           name: Test Report
-          path: "**/target/surefire-reports/*.xml"
+          path: "**/build/reports/tests/test/**/*.xml"
           reporter: java-junit

.gitignore

@@ -22,6 +22,7 @@ hs_err_pid*
 *.ipr
 *.iws
 build-*
+!build-logic
 *.asc
 build
 out

build-logic/build.gradle.kts

@@ -0,0 +1,28 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+
+val libs: VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
+
+plugins {
+    `kotlin-dsl`
+    `kotlin-dsl-precompiled-script-plugins`
+}
+
+repositories {
+    gradlePluginPortal()
+    mavenCentral()
+}
+
+dependencies {
+    implementation("com.diffplug.gradle.spotless:com.diffplug.gradle.spotless.gradle.plugin:8.3.0")
+
+    add("implementation", libs.findLibrary("kotlin-gradle").get())
+
+    // https://github.com/Kotlin/dokka
+    // Dokka is a documentation engine for Kotlin like JavaDoc for Java
+    //add("implementation", libs.findLibrary("dokka-gradle").get())
+
+    // https://detekt.dev/docs/gettingstarted/gradle/
+    // A static code analyzer for Kotlin
+    //add("implementation", libs.findLibrary("detekt-gradle").get())
+}

build-logic/settings.gradle.kts

@@ -0,0 +1,12 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+    @Suppress("UnstableApiUsage")
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}

build-logic/src/main/kotlin/buildlogic.java-conventions.gradle.kts

@@ -0,0 +1,66 @@
+plugins {
+    `java-library`
+    `maven-publish`
+    id("test-report-aggregation")
+    id("com.diffplug.spotless")
+    checkstyle
+}
+
+group = "io.github.jmltoolkit"
+version = "3.28.0-J8.0-K13.5"
+
+repositories {
+    maven {
+        url = uri("https://repo.maven.apache.org/maven2/")
+    }
+}
+
+dependencies {
+}
+
+// Apply a specific Java toolchain to ease working on different environments.
+
+java {
+    // Auto JDK setup
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of("21"))
+    }
+    withSourcesJar()
+    withJavadocJar()
+}
+
+publishing {
+    publications.create<MavenPublication>("maven") {
+        from(components["java"])
+    }
+}
+
+tasks.withType<JavaCompile> {
+    options.encoding = "UTF-8"
+}
+
+tasks.withType<Javadoc> {
+    options.encoding = "UTF-8"
+}
+
+tasks.withType<Test> {
+    workingDir = projectDir
+    useJUnitPlatform()
+}
+
+configure<com.diffplug.gradle.spotless.SpotlessExtension> {
+    java {
+        removeUnusedImports()
+        palantirJavaFormat("2.86.0").formatJavadoc(false).style("PALANTIR")
+    }
+}
+
+configure<CheckstyleExtension> {
+    toolVersion = "13.1.0"
+    configFile = file("$rootDir/dev-files/JavaParser-CheckStyle.xml")
+    isShowViolations = true
+}
+
+tasks.checkstyleMain {
+    source("src/main/java")
+}