Merge pull request #13 from PascalHonegger/fix/jooq_generation

Fix/jooq generation
PascalHonegger · Feb 24, 2023 · c734f5f · c734f5f
2 parents 7a54d02 + 2ee8aef
commit c734f5f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 26 deletions.
diff --git a/.github/workflows/gradle-dependency-submission.yml b/.github/workflows/gradle-dependency-submission.yml
@@ -1,4 +1,3 @@
-
 name: Gradle Dependency Submission
 on:
   push:
@@ -12,23 +11,18 @@ jobs:
     permissions:
       contents: write
     steps:
-      - name: Checkout Gradle Build Cache
-        uses: actions/cache@v3
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-            !~/.gradle/wrapper/dists/**/gradle*.zip
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
-          restore-keys: |
-            gradle-${{ runner.os }}-
-
-      - name: 'Checkout Repository'
-        uses: actions/checkout@v3
+          distribution: temurin
+          java-version: 19
+          cache: gradle
 
       - name: Run snapshot action
         uses: mikepenz/gradle-dependency-submission@main
         with:
           gradle-build-module: |-
             :Backend:bootstrap
+          gradle-build-configuration: |-
+            compileClasspath
           sub-module-mode: 'INDIVIDUAL_DEEP'
diff --git a/Backend/data-access/build.gradle.kts b/Backend/data-access/build.gradle.kts
@@ -26,12 +26,6 @@ tasks.withType<Test> {
     useJUnitPlatform()
 }
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of("19"))
-    }
-}
-
 jooq {
     version.set(libs.versions.jooq.get())
     edition.set(nu.studer.gradle.jooq.JooqEdition.OSS)

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 buildscript {
     repositories {
         mavenCentral()
@@ -24,15 +22,20 @@ allprojects {
         mavenCentral()
     }
 
-    tasks.withType<KotlinCompile> {
-        kotlinOptions {
-            jvmTarget = "19"
+    tasks.withType<JavaCompile>().configureEach {
+        val service = project.extensions.getByType<JavaToolchainService>()
+        val customProvider = service.compilerFor {
+            languageVersion.set(JavaLanguageVersion.of("19"))
         }
+        javaCompiler.set(customProvider)
+    }
 
-        val javaLauncher = project.extensions.getByType<JavaToolchainService>().launcherFor {
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.UsesKotlinJavaToolchain>().configureEach {
+        val service = project.extensions.getByType<JavaToolchainService>()
+        val customLauncher = service.launcherFor {
             languageVersion.set(JavaLanguageVersion.of("19"))
         }
-        kotlinJavaToolchain.toolchain.use(javaLauncher)
+        kotlinJavaToolchain.toolchain.use(customLauncher)
     }
 }