Modernize project

.editorconfig

@@ -7,11 +7,11 @@ max_line_length = 120
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.kt]
-continuation_indent_size = 4
-
-[*.{java,gradle}]
-continuation_indent_size = 8
+[*.{kt,kts}]
+ij_continuation_indent_size = 4
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true
+ktlint_code_style = intellij_idea
 
 [*.{yml,json,conf}]
 indent_size = 2

.github/workflows/publish.yml → .github/workflows/cd.yml

@@ -5,17 +5,20 @@ on:
     types: [ created ]
 
 jobs:
-  build:
+  publish:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 8
-          cache: 'gradle'
+          java-version: 17
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
 
-      - name: Publish with Gradle
+      - name: Publish
         run: ./gradlew publishPlugins -Pgradle.publish.key=${{ secrets.PUBLISH_KEY }} -Pgradle.publish.secret=${{ secrets.PUBLISH_SECRET }}

.github/workflows/ci.yml

@@ -1,6 +1,9 @@
 name: CI
-
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
 
 jobs:
   build:
@@ -10,27 +13,26 @@ jobs:
         os:
           - ubuntu-latest
           - windows-latest
-        java: [8, 11, 17]
+        java: [17, 21]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: ${{ matrix.java }}
-          cache: 'gradle'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
 
       - name: Build with Gradle
-        if: matrix.os == 'ubuntu-latest'
         run: ./gradlew build --stacktrace
-      - name: Build with Gradle
-        if: matrix.os == 'windows-latest'
-        run: .\gradlew.bat build --stacktrace
 
       - name: Store reports
-        uses: actions/upload-artifact@v3
-        if: always()
+        uses: actions/upload-artifact@v4
+        if: failure()
         with:
-          name: reports-${{ runner.os }}-${{ matrix.java }}
-          path: build/reports
+          name: "Gradle Reports ${{ runner.os }} ${{ matrix.java }}"
+          path: "**/build/reports"

README.md

@@ -362,21 +362,21 @@ Additionally, these options are evaluated:
 
 ### Squit Dsl
 
-Here is a complete example of the `Squit` dsl:
+Here is a complete example of the `Squit` dsl (`.kts` syntax):
 
-```groovy
+```kotlin
 squit {
     // The jdbc drivers to use. Must be on the classpath.
-    jdbcDrivers = ['oracle.jdbc.driver.OracleDriver']
+    jdbcDrivers = listOf("oracle.jdbc.driver.OracleDriver")
 
     // The path of your test sources. src/squit is the default.
-    sourceDir "src/squit"
+    sourceDir = "src/squit"
 
     // The path to save reports in. build/squit/reports is the default.
-    reportDir "build/squit/reports"
+    reportDir = "build/squit/reports"
 
     // The timeout in seconds for requests before squit fails. The default is 10.
-    timeout = 60
+    requestTimeout = 60
 
     // If Squit should only print if a tests fails.
     silent = false

RELEASING.md

@@ -1,4 +1,4 @@
-**The following steps are required to do a release of Squit:**
+Squit will be automatically released by creating a release on GitHub. To manually release Squit:
 
 - Log into the Gradle Plugins Portal with the `login` Gradle task: