From db7e13aa9b45d8f48e00d0bafab4531a4eabce4a Mon Sep 17 00:00:00 2001 From: Jared Burrows Date: Fri, 7 Jul 2023 13:49:08 -0400 Subject: [PATCH 1/4] Create auto-merge.yml --- .github/workflows/auto-merge.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/auto-merge.yml diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml new file mode 100644 index 00000000..c0fe7b80 --- /dev/null +++ b/.github/workflows/auto-merge.yml @@ -0,0 +1,25 @@ +name: Dependabot auto-merge + +on: pull_request + +permissions: + contents: write + pull-requests: write + +jobs: + dependabot: + runs-on: ubuntu-latest + if: ${{ github.actor == 'dependabot[bot]' }} + + steps: + - name: Dependabot metadata + id: metadata + uses: dependabot/fetch-metadata@v1 + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" + + - name: Enable auto-merge for Dependabot PRs + run: gh pr merge --auto --merge "$PR_URL" + env: + PR_URL: ${{ github.event.pull_request.html_url }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 14c54e268c129223c28abd500c1f7ca2878717d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Jul 2023 19:08:46 +0000 Subject: [PATCH 2/4] Bump org.jetbrains.kotlinx:kotlinx-html-jvm from 0.8.1 to 0.9.0 Bumps [org.jetbrains.kotlinx:kotlinx-html-jvm](https://github.com/Kotlin/kotlinx.html) from 0.8.1 to 0.9.0. - [Release notes](https://github.com/Kotlin/kotlinx.html/releases) - [Commits](https://github.com/Kotlin/kotlinx.html/commits/0.9.0) --- updated-dependencies: - dependency-name: org.jetbrains.kotlinx:kotlinx-html-jvm dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 527ac829..390e1751 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,7 +16,7 @@ commons = { module = "org.apache.commons:commons-csv", version = "1.10.0" } moshi = { module = "com.squareup.moshi:moshi", version = "1.15.0" } kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" } kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" } -kotlinx-html = { module = "org.jetbrains.kotlinx:kotlinx-html-jvm", version = "0.8.1" } +kotlinx-html = { module = "org.jetbrains.kotlinx:kotlinx-html-jvm", version = "0.9.0" } maven-model = { module = "org.apache.maven:maven-model", version = "3.9.3" } spock = { module = "org.spockframework:spock-junit4", version = "2.1-M2-groovy-3.0" } xmlunit = { module = "org.xmlunit:xmlunit-matchers", version = "2.9.1" } From 15c63b447991c5df901de23931cef3c8ab46fda5 Mon Sep 17 00:00:00 2001 From: Jared Burrows Date: Fri, 7 Jul 2023 15:30:40 -0400 Subject: [PATCH 3/4] Update auto-merge.yml --- .github/workflows/auto-merge.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index c0fe7b80..51732f43 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -1,6 +1,13 @@ name: Dependabot auto-merge -on: pull_request +on: + pull_request: + types: + - opened + - synchronize + check_suite: + types: + - completed permissions: contents: write @@ -9,7 +16,7 @@ permissions: jobs: dependabot: runs-on: ubuntu-latest - if: ${{ github.actor == 'dependabot[bot]' }} + if: ${{ github.actor == 'dependabot[bot]' }} && ${{ github.event.check_suite.conclusion == 'success' }} steps: - name: Dependabot metadata From 14c391762c76b7af9b74a729bd5e1e8ddd55ef18 Mon Sep 17 00:00:00 2001 From: Jared Burrows Date: Fri, 7 Jul 2023 16:27:25 -0400 Subject: [PATCH 4/4] fix build --- .github/workflows/auto-merge.yml | 32 -------------------------------- build.gradle | 17 ++++++++++------- 2 files changed, 10 insertions(+), 39 deletions(-) delete mode 100644 .github/workflows/auto-merge.yml diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml deleted file mode 100644 index 51732f43..00000000 --- a/.github/workflows/auto-merge.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: Dependabot auto-merge - -on: - pull_request: - types: - - opened - - synchronize - check_suite: - types: - - completed - -permissions: - contents: write - pull-requests: write - -jobs: - dependabot: - runs-on: ubuntu-latest - if: ${{ github.actor == 'dependabot[bot]' }} && ${{ github.event.check_suite.conclusion == 'success' }} - - steps: - - name: Dependabot metadata - id: metadata - uses: dependabot/fetch-metadata@v1 - with: - github-token: "${{ secrets.GITHUB_TOKEN }}" - - - name: Enable auto-merge for Dependabot PRs - run: gh pr merge --auto --merge "$PR_URL" - env: - PR_URL: ${{ github.event.pull_request.html_url }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/build.gradle b/build.gradle index 44675d0d..7bee7d93 100644 --- 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'