fix build

jaredsburrows · Jul 8, 2023 · ceb3b42 · ceb3b42
1 parent e0318a0
commit ceb3b42
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
@@ -2,7 +2,7 @@ name: Dependabot auto-merge
 
 on:
   pull_request:
-    types: 
+    types:
       - opened
       - synchronize
   check_suite:
@@ -20,12 +20,13 @@ jobs:
 
     steps:
       - name: Dependabot metadata
-        id: metadata
+        id: dependabot-metadata
         uses: dependabot/fetch-metadata@v1
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 
       - name: Enable auto-merge for Dependabot PRs
+        if: ${{ steps.dependabot-metadata.outputs.package-ecosystem == 'github-actions' || steps.dependabot-metadata.outputs.package-ecosystem == 'gradle' }}
         run: gh pr merge --auto --merge "$PR_URL"
         env:
           PR_URL: ${{ github.event.pull_request.html_url }}

diff --git a/build.gradle b/build.gradle
@@ -1,3 +1,6 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
+
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
 
@@ -52,15 +55,15 @@ subprojects {
     }
   }
 
-  tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
-    kotlinOptions {
-      jvmTarget = JavaVersion.VERSION_1_8
+  tasks.withType(KotlinJvmCompile).configureEach {
+    compilerOptions {
+      jvmTarget.set(JvmTarget.JVM_11)
     }
   }
 
   tasks.withType(JavaCompile).configureEach {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 
     configure(options) {
       compilerArgs << '-Xlint:all'
@@ -71,8 +74,8 @@ subprojects {
   }
 
   tasks.withType(GroovyCompile).configureEach {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 
     configure(options) {
       compilerArgs << '-Xlint:all'