diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2bca484..e092596 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,13 +11,14 @@ jobs: strategy: matrix: os: [ windows-latest, ubuntu-latest ] - java: [ 8, 11, 17 ] + java: [ 8, 17 ] steps: - uses: actions/checkout@v3 - name: Setup JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: + distribution: 'temurin' java-version: ${{ matrix.java }} - name: Build lib diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9c230ab..50b8062 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,8 +11,9 @@ jobs: steps: - uses: actions/checkout@v3 - name: Setup JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: + distribution: 'temurin' java-version: 8 - name: Build lib @@ -31,8 +32,9 @@ jobs: steps: - uses: actions/checkout@v3 - name: Setup JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: + distribution: 'temurin' java-version: 8 server-id: ossrh server-username: OSSRH_USERNAME diff --git a/README.md b/README.md index 075bc07..65e3855 100644 --- a/README.md +++ b/README.md @@ -25,10 +25,10 @@ Library is hosted on Maven Central. dev.forst exposed-upsert - 1.2.0 + 1.3.0 ``` Gradle: ```kotlin -implementation("dev.forst", "exposed-upsert", "1.2.0") +implementation("dev.forst", "exposed-upsert", "1.3.0") ``` diff --git a/build.gradle.kts b/build.gradle.kts index 6403045..96870cf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,10 +7,10 @@ plugins { `maven-publish` signing id("io.github.gradle-nexus.publish-plugin") version "1.1.0" - + // we can not switch to 3.x.x because we want to keep it compatible with JVM 8 id("net.nemerosa.versioning") version "2.15.1" id("org.jetbrains.dokka") version "1.7.20" - id("io.gitlab.arturbosch.detekt") version "1.19.0" + id("io.gitlab.arturbosch.detekt") version "1.21.0" } @@ -24,10 +24,12 @@ repositories { } dependencies { + detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.21.0") + compileOnly(kotlin("reflect")) compileOnly(kotlin("stdlib-jdk8")) - compileOnly("org.jetbrains.exposed", "exposed-core", "0.37.3") + compileOnly("org.jetbrains.exposed:exposed-core:0.40.1") } detekt {