Merge pull request #112 from truthencode/feature/antlr

Feature/antlr

.github/workflows/gradle.yml

@@ -13,26 +13,13 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-java@v3
-      with:
-        distribution: adopt
-        java-version: 11
-
-    - name: Setup Gradle
-      uses: gradle/gradle-build-action@v2
-      with:
-        gradle-version: wrapper
-        arguments: build --scan
-    - name: Run test and Coverage  
-      uses: gradle/gradle-build-action@v2
-      with:
-          gradle-version: wrapper
-          arguments: reportScoverage aggregateAllTestReports
-    - name: Upload to codecov
-      uses: codecov/codecov-action@v2
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
-        name: codecov-umbrella # optional 
-        verbose: true # optional (default = false)
-
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+        distribution: 'temurin'
+        java-version: '17'
+      - name: Run test and Coverage
+        uses: gradle/gradle-build-action@v2
+        with:
+            gradle-version: wrapper
+            arguments: reportScoverage aggregateAllTestReports -no-daemon

.trunk/trunk.yaml

@@ -33,7 +33,7 @@ lint:
         - linters: [ALL]
           paths:
               - incubating/**
-              - **/gradlew
+              - "**/gradlew"
 runtimes:
     enabled:
         - go@1.21.0

build-logic/src/main/kotlin/code-quality.gradle.kts

@@ -56,7 +56,7 @@ fun walkBack(
     fileName: String,
     recurse: Recursion,
     proj: Project = project.rootProject,
-): java.io.File? {
+): File? {
     val f = proj.file(fileName)
     return if (f.exists()) {
         f
@@ -143,10 +143,3 @@ configure<com.diffplug.gradle.spotless.SpotlessExtension> {
     }
 }
 
-sonar {
-    properties {
-        property("sonar.projectKey", "truthencode_ddo-calc")
-        property("sonar.organization", "truthencode")
-        property("sonar.host.url", "https://sonarcloud.io")
-    }
-}

build-logic/src/main/kotlin/djaxonomy.test-conventions.gradle.kts

@@ -28,15 +28,27 @@ plugins {
 
 tasks.withType(Test::class.java) {
     systemProperties["concordion.output.dir"] = "${reporting.baseDir}/tests"
+    val outputDir = reports.junitXml.outputLocation
+    jvmArgumentProviders.add(CommandLineArgumentProvider {
+        mutableListOf(
+            "-Djunit.platform.reporting.open.xml.enabled=false", // Legacy format for sonar
+            "-Djunit.platform.reporting.output.dir=${outputDir.get().asFile.absolutePath}"
+        )
+    })
 }
 
+
 val libs = the<LibrariesForLibs>()
 
 val extension = project.extensions.create<KotlinTestKitExtension>("KotlinTestKits")
 extension.useKotlinTestKit.convention(
     KotlinTestKits.KoTest,
 )
 
+dependencies {
+    testRuntimeOnly(libs.junit.platform.reporting)
+}
+
 fun JvmTestSuite.applyKoTest() {
     val koTestVersion: String = (findProperty("koTestVersion") ?: embeddedKotlinVersion).toString()
 

build.gradle.kts

@@ -16,6 +16,7 @@
 * limitations under the License.
 */
 import com.mooltiverse.oss.nyx.state.State
+
 import ru.vyarus.gradle.plugin.python.task.PythonTask
 import java.text.SimpleDateFormat
 import java.util.*
@@ -38,6 +39,7 @@ plugins {
     id("com.github.ben-manes.versions") version "0.41.0"
     id("nl.littlerobots.version-catalog-update") version "0.8.1"
     id("ru.vyarus.mkdocs")
+    id("org.sonarqube")
 
 //    id("ru.vyarus.mkdocs")  version "3.0.0" apply (false)
     //  id ("be.vbgn.ci-detect") version "0.1.0"
@@ -351,4 +353,14 @@ allprojects {
 //    tasks.withType<com.hierynomus.gradle.license.tasks.LicenseCheck> {
 //        mustRunAfter(syncVersionFiles)
 //    }
+}
+
+sonar {
+
+    properties {
+        property("sonar.projectKey", "truthencode_ddo-calc")
+        property("sonar.organization", "truthencode")
+        property("sonar.host.url", "https://sonarcloud.io")
+//        property()
+    }
 }

gradle.properties

@@ -16,8 +16,7 @@
 # limitations under the License.
 #
 
-sonar.projectKey=truthencode_ddo-calc
-sonar.organization=truthencode
+
 defaultJavaToolChainVersion=17
 
 # foojay
@@ -89,7 +88,7 @@ concordionVersion=4.0.1
 concordionExtEmbedVersion=1.2.0
 concordionExtCollapseOutputVersion=1.0.0
 
-// flexmark markdown extensions for concordion specs
+# flexmark markdown extensions for concordion specs
 flexmarkVersion=0.64.8
 
 # system properties
@@ -101,7 +100,7 @@ sysprop.concordion.output.dir=project.reporting.baseDir/spec
 # plugin configuration
 com.github.maiflai.gradle-scalatest.mode=append
 
-// Junit Scalatest runner (Helmethair)
+# Junit Scalatest runner (Helmethair)
 junitScalaTestVersion=0.1.10
 
 # Test Configuration / Version Management

gradle/libs.versions.toml

@@ -64,6 +64,7 @@ junit-platform-engine = { module = "org.junit.platform:junit-platform-engine", v
 junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform" }
 junit-platform-runner = { module = "org.junit.platform:junit-platform-runner", version.ref = "junit-engine" }
 junit-vintage-engine = { module = "org.junit.vintage:junit-vintage-engine", version.ref = "junit-engine" }
+junit-platform-reporting = { module = "org.junit.platform:junit-platform-reporting", version.ref = "junit-platform" }
 kotest-assertions-core-jvm = { module = "io.kotest:kotest-assertions-core-jvm", version.ref = "kotest" }
 kotest-property-jvm = { module = "io.kotest:kotest-property-jvm", version.ref = "kotest" }
 kotest-runner-junit-jvm = { module = "io.kotest:kotest-runner-junit5-jvm", version.ref = "kotest" }
@@ -103,14 +104,14 @@ wix-accord-scalatest-s213 = { module = "com.wix:accord-scalatest_2.13", version.
 
 [bundles]
 concordion = [
-  "concordion",
-  "concordion-collapse-output-extension",
-  "concordion-embed-extension",
+    "concordion",
+    "concordion-collapse-output-extension",
+    "concordion-embed-extension",
 ]
 kotest = [
-  "kotest-assertions-core-jvm",
-  "kotest-property-jvm",
-  "kotest-runner-junit-jvm",
+    "kotest-assertions-core-jvm",
+    "kotest-property-jvm",
+    "kotest-runner-junit-jvm",
 ]
 #scala-logging = ["typesafe-scala-logging-s213", "typesafe-config"]
 scala-wix = ["wix-accord-core-s213", "wix-accord-scalatest-s213"]

settings.gradle.kts

@@ -48,6 +48,8 @@ pluginManagement {
 //        id("net.thauvin.erik.gradle.semver") version semVerPluginVersion
         id("ru.vyarus.mkdocs") version "3.0.0"
         id("io.quarkus") version "3.3.3"
+        id("org.sonarqube") version "4.3.1.3277"
+
     }
 
     repositories {