Fix 'gradlew build'

Thijsiez · Jan 6, 2024 · 8b1d254 · 8b1d254
1 parent a72f92b
commit 8b1d254
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -23,4 +23,4 @@ jobs:
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
           SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
-        run: ./gradlew test sonar --no-daemon --continue --info
+        run: ./gradlew test jacocoTestReport sonar --no-daemon --continue --info
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Thijs Koppen
+ * Copyright 2023-2024 Thijs Koppen
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,18 +43,15 @@ configure(subprojects) {
         testImplementation("io.mockk:mockk:$mockkVersion")
     }
 
+    tasks.test {
+        useJUnitPlatform()
+    }
     tasks.jacocoTestReport {
-        dependsOn(tasks.test)
-        finalizedBy(tasks.jacocoTestCoverageVerification)
         reports {
             html.required = true
             xml.required = true
         }
     }
-    tasks.test {
-        useJUnitPlatform()
-        finalizedBy(tasks.jacocoTestReport)
-    }
 
     kotlin {
         jvmToolchain(11)

diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Thijs Koppen
+ * Copyright 2023-2024 Thijs Koppen
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ plugins {
 dependencies {
     implementation(project(":library"))
     ksp(project(":library"))
-    testImplementation("io.quarkus:quarkus-jdbc-h2")
+    implementation("io.quarkus:quarkus-jdbc-h2")
 }
 
 allOpen {

diff --git a/...src/test/resources/application.properties → ...src/main/resources/application.properties b/...src/test/resources/application.properties → ...src/main/resources/application.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2023 Thijs Koppen
+# Copyright 2023-2024 Thijs Koppen
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +14,9 @@
 # limitations under the License.
 #
 
-quarkus.datasource.db-kind=h2
 quarkus.datasource.jdbc.url=jdbc:h2:mem:test
+quarkus.datasource.username=sa
+quarkus.datasource.password=
 
 quarkus.hibernate-orm.database.generation=drop-and-create
 quarkus.hibernate-orm.packages=ch.icken.model
diff --git a/examples/src/test/resources/import.sql → examples/src/main/resources/import.sql b/examples/src/test/resources/import.sql → examples/src/main/resources/import.sql