Initial gradle build

.github/workflows/build.yml

@@ -30,7 +30,7 @@ jobs:
 
       - name: Retrieve current version from gradle.properties
         run: |
-          echo RELEASE_VERSION=$(./gradlew properties --no-daemon --console=plain -q | grep "^version:" | awk '{print $2}') >> $GITHUB_ENV
+          echo RELEASE_VERSION=$(./gradlew properties --no-daemon --console=plain -q | grep "^version:" | awk '{print $2}')  | sed "s/-SNAPSHOT//" >> $GITHUB_ENV
           echo GIT_HASH_SHORT=$(git rev-parse --short "$GITHUB_SHA") >> $GITHUB_ENV
 
       - name: Remove SNAPSHOT suffix for release
@@ -41,7 +41,7 @@ jobs:
       - name: Add git run number and git hash to snapshot release
         if: startsWith(github.ref, 'refs/tags/') && !startsWith(github.ref, 'refs/tags/v')
         run: |
-          echo CHANGELIST=${{ env.CHANGELIST }}.${{ env.GIT_HASH_SHORT }} >> $GITHUB_ENV
+          echo CHANGELIST=${{ env.CHANGELIST }}#$GITHUB_RUN_NUMBER-${{ env.GIT_HASH_SHORT }} >> $GITHUB_ENV
 
       - name: Run headless test
         uses: GabrielBB/xvfb-action@v1
@@ -61,7 +61,7 @@ jobs:
 
       - name: Build package and download license information
         run: |
-          ./gradlew build -x test -Prevision=${{ env.RELEASE_VERSION }} -Pchangelist=${{ env.CHANGELIST }}
+          ./gradlew build -x test -Prevision=${{ env.RELEASE_VERSION }} -Pchangelist=${{ env.CHANGELIST }} -PexecutableSDCcc
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

build-logic/src/main/kotlin/com.draeger.medical.executable-conventions.gradle.kts

@@ -49,19 +49,20 @@ tasks.register<Copy>("copyRuntimeLibs") {
     into("${layout.buildDirectory.get().asFile}/lib")
 }
 
-val projectName = "SDCcc-gradle"
+val projectName = if (project.name == "sdccc") "SDCcc" else project.name
+val projectVersion = rootProject.extra["projectVersion"] as String
 
 tasks.createExe {
     headerType = "console"
-    jar = "${layout.buildDirectory.get().asFile}/libs/${projectName}-${project.version}.jar"
-    outfile = "${projectName}-${project.version}.exe" // Absolute path not allowed. File gets placed in build/launch4j
+    jar = "${layout.buildDirectory.get().asFile}/libs/${projectName}-${projectVersion}.jar"
+    outfile = "${projectName}-${projectVersion}.exe" // Absolute path not allowed. File gets placed in build/launch4j
     mainClassName = "com.draeger.medical.sdccc.TestSuite"
     classpath = setOf("lib/**")
     jreMinVersion = javaVersion
     bundledJrePath = "../${jreFullPath}"
 
-    version = "${project.version}.0"
-    textVersion = "${project.version}"
+    version = "${projectVersion}.0"
+    textVersion = "${projectVersion}"
     fileDescription = "${project.name}"
     copyright = "2023-2024 Draegerwerk AG & Co. KGaA"
 
@@ -77,4 +78,3 @@ tasks.named("createExe") {
 tasks.named("build") {
     dependsOn("createExe")
 }
-

build-logic/src/main/kotlin/com.draeger.medical.kotlin-conventions.gradle.kts

@@ -18,17 +18,22 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
 
 val detekt by configurations.creating
 
+val detektConfigPath = projectDir.path + File.separator +
+    (project.findProperty("detektConfigFilePath")?.toString() ?: "dev_config/detekt.yml")
+
 val detektTask = tasks.register<JavaExec>("detekt") {
+    dependsOn("assemble")
     mainClass.set("io.gitlab.arturbosch.detekt.cli.Main")
     classpath = detekt
 
     val input = projectDir
-    val config = "$projectDir/../dev_config/detekt.yml"
+    val config = detektConfigPath
     val exclude = ".*/build/.*,.*/resources/.*,**/build.gradle.kts,**/settings.gradle.kts"
     val classpathNeededForDetekt = files(
         sourceSets.main.get().runtimeClasspath,
         sourceSets.test.get().runtimeClasspath
-    )
+    ).asPath
+
     val jdkHome = System.getProperty("java.home")
     args(
         "--input", input.absolutePath,
@@ -42,11 +47,8 @@ val detektTask = tasks.register<JavaExec>("detekt") {
     )
 }
 
-tasks.check {
-    dependsOn(detektTask)
-}
-
 dependencies {
     detekt(libs.detekt.cli)
+    detekt(libs.detekt.formatting)
     api(libs.org.jetbrains.kotlin.kotlin.stdlib)
 }

gradle/libs.versions.toml

@@ -39,6 +39,7 @@ com-github-jk1-license = "2.9"
 com-google-inject-guice = { module = "com.google.inject:guice", version.ref = "guice" }
 com-google-inject-extensions-guice-assistedinject = { module = "com.google.inject.extensions:guice-assistedinject", version.ref = "guice" }
 detekt-cli = { module = "io.gitlab.arturbosch.detekt:detekt-cli", version.ref = "detekt" }
+detekt-formatting = { group = "io.gitlab.arturbosch.detekt", name = "detekt-formatting", version.ref = "detekt" }
 io-github-threeten-jaxb-threeten-jaxb-core = { module = "io.github.threeten-jaxb:threeten-jaxb-core", version.ref = "threeten-jaxb-core" }
 jakarta-xml-bind-jakarta-xml-bind-api = { module = "jakarta.xml.bind:jakarta.xml.bind-api", version.ref = "jakarta-xml-bind" }
 org-checkerframework-checker-qual = { module = "org.checkerframework:checker-qual", version.ref = "org-checkerframework" }

sdccc/build.gradle.kts

@@ -1,17 +1,10 @@
 plugins {
     id("com.draeger.medical.java-conventions")
     id("com.draeger.medical.kotlin-conventions")
-    id("com.draeger.medical.executable-conventions")
-    id("com.draeger.medical.java-analysis")
-    id("com.example.license-report")
 }
 
 val javaVersion = property("javaVersion").toString()
 
-tasks.named("build") {
-    dependsOn("generateLicenseReport")
-}
-
 dependencies {
     api(libs.org.junit.jupiter.junit.jupiter.api)
     api(libs.org.junit.jupiter.junit.jupiter.engine)
@@ -56,9 +49,37 @@ dependencies {
 
 description = "sdccc"
 
-tasks.test {
-    useJUnitPlatform()
-    exclude("it/com/draeger/medical/sdccc/testsuite_it_mock_tests/**")
-    maxHeapSize = "3g"
-    maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).coerceAtLeast(1)
+val skipModuleTests: Boolean = project.hasProperty("noTestSDCcc")
+val createExecutable: Boolean = project.hasProperty("executableSDCcc")
+
+if (!skipModuleTests) {
+    apply(plugin = "com.draeger.medical.java-analysis")
+
+    tasks.check {
+        dependsOn("detekt")
+    }
+
+    tasks.test {
+        useJUnitPlatform()
+        exclude("it/com/draeger/medical/sdccc/testsuite_it_mock_tests/**")
+        maxHeapSize = "3g"
+        maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).coerceAtLeast(1)
+    }
+}
+
+if (createExecutable) {
+    apply(plugin = "com.example.license-report")
+    tasks.named("build") {
+        dependsOn("generateLicenseReport")
+    }
+    apply(plugin = "com.draeger.medical.executable-conventions")
+}
+
+val testsJar by tasks.registering(Jar::class) {
+    archiveClassifier.set("tests")
+    from(sourceSets["test"].output)
+}
+
+artifacts {
+    add("archives", tasks.named("testsJar"))
 }

sdccc/gradle.properties

@@ -0,0 +1 @@
+detektConfigFilePath = ../dev_config/detekt.yml

settings.gradle.kts

@@ -14,3 +14,11 @@ include(":biceps-model")
 include(":dpws-model")
 include(":sdccc")
 
+val defaultVersion = "9.1.0-SNAPSHOT"
+
+val actualRevision = providers.gradleProperty("revision").orElse(defaultVersion).get()
+val actualChangelist = providers.gradleProperty("changelist").orElse("").get()
+
+gradle.rootProject {
+    extra["projectVersion"] = "$actualRevision$actualChangelist"
+}