diff --git a/.editorconfig b/.editorconfig
index 53dfe170..2bf95ff8 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,3 +11,5 @@ indent_size=2
 [*.{kt,kts}]
 disabled_rules=import-ordering,no-wildcard-imports
 max_line_length=177
+ij_kotlin_allow_trailing_comma_on_call_site=true
+ij_kotlin_allow_trailing_comma=true
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9b96508e..a112e213 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -32,7 +32,7 @@ jobs:
             ./gradlew jacocoTestReport --stacktrace
         - uses: codecov/codecov-action@v1
 
-  link:
+  lint:
       name: Lint check
       runs-on: ubuntu-latest
       timeout-minutes: 10
diff --git a/.gitignore b/.gitignore
index dfd88eae..d962a9c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,3 +74,4 @@ classes
 .idea/libraries-with-intellij-classes.xml
 .idea/kotlinc.xml
 .idea/jpa-buddy.xml
+.idea/kotlinScripting.xml
diff --git a/build.gradle b/build.gradle
index 365e6273..07f8dd28 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,9 +1,9 @@
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.8.0' apply false
-    id "org.jlleitschuh.gradle.ktlint" version "11.1.0"
-    id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
-    id "org.jetbrains.kotlin.plugin.serialization" version "1.8.0"
-    id "com.google.devtools.ksp" version "1.8.0-1.0.8" apply false
+    id 'org.jetbrains.kotlin.jvm' version '1.8.10' apply false
+    id "org.jlleitschuh.gradle.ktlint" version "11.2.0"
+    id "io.github.gradle-nexus.publish-plugin" version "1.2.0"
+    id "org.jetbrains.kotlin.plugin.serialization" version "1.8.10"
+    id "com.google.devtools.ksp" version "1.8.10-1.0.9" apply false
 }
 
 ext {
@@ -116,20 +116,18 @@ subprojects {
         disabledRules = [
             "no-wildcard-imports",
             "import-ordering",
-            "max-line-length"
+            "max-line-length",
+            "multiline-if-else"
         ]
-    }
-
-    sourceCompatibility = 11
-
-    compileKotlin {
-        kotlinOptions {
-            jvmTarget = "11"
-            javaParameters = true
+        filter {
+            exclude { element -> element.file.path.contains("generated/") }
         }
     }
-    compileTestKotlin {
-        kotlinOptions.jvmTarget = "11"
+
+    kotlin {
+        jvmToolchain {
+            languageVersion.set(JavaLanguageVersion.of("11"))
+        }
     }
 
     dependencies {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 92f06b50..f42e62f3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists