From 8b0b39161092217595c6408ec960c5fb20c1851f Mon Sep 17 00:00:00 2001 From: Simon Vergauwen Date: Thu, 16 Jun 2022 20:17:01 +0200 Subject: [PATCH 1/3] Bump all versions except Kotlin 1.7.0, and KotlinX Coroutines 1.6.2 --- .github/workflows/generate-alpha-tag.yaml | 8 ++++---- .github/workflows/generate-tag.yaml | 8 ++++---- .github/workflows/publish.yml | 10 +++++----- .github/workflows/pull_request.yml | 10 +++++----- gradle/libs.versions.toml | 12 ++++++------ settings.gradle.kts | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/generate-alpha-tag.yaml b/.github/workflows/generate-alpha-tag.yaml index ed0fa9db264..c1248deee11 100644 --- a/.github/workflows/generate-alpha-tag.yaml +++ b/.github/workflows/generate-alpha-tag.yaml @@ -19,13 +19,13 @@ jobs: fetch-depth: 0 - name: Set up Java - uses: actions/setup-java@v3.1.1 + uses: actions/setup-java@v3.3.0 with: distribution: 'zulu' java-version: 11 - name: Gradle build - uses: gradle/gradle-build-action@v2.1.6 + uses: gradle/gradle-build-action@v2.2.0 with: arguments: --full-stacktrace build "-Psemver.stage=alpha" @@ -46,13 +46,13 @@ jobs: token: ${{ secrets.TOKEN_GITHUB_ACTION }} - name: Set up Java - uses: actions/setup-java@v3.1.1 + uses: actions/setup-java@v3.3.0 with: distribution: 'zulu' java-version: 11 - name: Generate Tag - uses: gradle/gradle-build-action@v2.1.6 + uses: gradle/gradle-build-action@v2.2.0 with: arguments: --full-stacktrace createSemverTag "-Psemver.stage=alpha" diff --git a/.github/workflows/generate-tag.yaml b/.github/workflows/generate-tag.yaml index 170929ee0d0..b2a4724569c 100644 --- a/.github/workflows/generate-tag.yaml +++ b/.github/workflows/generate-tag.yaml @@ -39,13 +39,13 @@ jobs: fetch-depth: 0 - name: Set up Java - uses: actions/setup-java@v3.1.1 + uses: actions/setup-java@v3.3.0 with: distribution: 'zulu' java-version: 11 - name: Gradle build - uses: gradle/gradle-build-action@v2.1.6 + uses: gradle/gradle-build-action@v2.2.0 with: arguments: --full-stacktrace build "-Psemver.scope=${{ github.event.inputs.scope }}" "-Psemver.stage=${{ github.event.inputs.stage }}" @@ -66,13 +66,13 @@ jobs: token: ${{ secrets.TOKEN_GITHUB_ACTION }} - name: Set up Java - uses: actions/setup-java@v3.1.1 + uses: actions/setup-java@v3.3.0 with: distribution: 'zulu' java-version: 11 - name: Generate Tag - uses: gradle/gradle-build-action@v2.1.6 + uses: gradle/gradle-build-action@v2.2.0 with: arguments: --full-stacktrace createSemverTag "-Psemver.scope=${{ github.event.inputs.scope }}" "-Psemver.stage=${{ github.event.inputs.stage }}" diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 72eaa032cc7..6a2a091fa26 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -38,13 +38,13 @@ jobs: fetch-depth: 0 - name: Set up Java - uses: actions/setup-java@v3.1.1 + uses: actions/setup-java@v3.3.0 with: distribution: 'zulu' java-version: 11 - name: Build - uses: gradle/gradle-build-action@v2.1.6 + uses: gradle/gradle-build-action@v2.2.0 with: arguments: build --full-stacktrace @@ -59,7 +59,7 @@ jobs: path: '**/build/reports/**' - name: Publish alpha/beta/rc version - uses: gradle/gradle-build-action@v2.1.6 + uses: gradle/gradle-build-action@v2.2.0 if: | contains(steps.version.outputs.arrow, 'alpha') || contains(steps.version.outputs.arrow, 'beta') || @@ -68,7 +68,7 @@ jobs: arguments: --full-stacktrace publishToSonatype closeAndReleaseSonatypeStagingRepository - name: Publish final version - uses: gradle/gradle-build-action@v2.1.6 + uses: gradle/gradle-build-action@v2.2.0 if: | !contains(steps.version.outputs.arrow, 'alpha') && !contains(steps.version.outputs.arrow, 'beta') && @@ -85,7 +85,7 @@ jobs: bundle install --gemfile Gemfile - name: Create API doc - uses: gradle/gradle-build-action@v2.1.6 + uses: gradle/gradle-build-action@v2.2.0 with: arguments: --full-stacktrace dokkaGfm diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 04940191385..7e4a57d67da 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -20,19 +20,19 @@ jobs: fetch-depth: 0 - name: Set up Java - uses: actions/setup-java@v3.1.1 + uses: actions/setup-java@v3.3.0 with: distribution: 'zulu' java-version: 11 - name: build - uses: gradle/gradle-build-action@v2.1.6 + uses: gradle/gradle-build-action@v2.2.0 if: matrix.os != 'windows-latest' with: arguments: --full-stacktrace build - name: mingwX64Test - uses: gradle/gradle-build-action@v2.1.6 + uses: gradle/gradle-build-action@v2.2.0 if: matrix.os == 'windows-latest' with: arguments: --full-stacktrace mingwX64Test @@ -56,13 +56,13 @@ jobs: fetch-depth: 0 - name: Set up Java - uses: actions/setup-java@v3.1.1 + uses: actions/setup-java@v3.3.0 with: distribution: 'zulu' java-version: 11 - name: Build - uses: gradle/gradle-build-action@v2.1.6 + uses: gradle/gradle-build-action@v2.2.0 with: arguments: apiDump diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fb1314b12a5..5f757cadaa0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,22 +1,22 @@ [versions] animalSniffer = "1.5.4" -arrowGradleConfig = "0.10.1" -assertj = "3.22.0" +arrowGradleConfig = "0.10.2" +assertj = "3.23.1" coroutines = "1.6.1" classgraph = "4.8.147" dokka = "1.6.21" jUnit = "4.13.2" jUnitJupiter = "5.8.2" jUnitVintage = "5.8.2" -kotest = "5.3.0" -kotestGradle = "5.3.0" +kotest = "5.3.1" +kotestGradle = "5.3.1" kotlin = "1.6.21" -kotlinBinaryCompatibilityValidator = "0.10.0" +kotlinBinaryCompatibilityValidator = "0.10.1" kotlinCompileTesting = "1.4.8" knit = "0.4.0" kspVersion = "1.6.21-1.0.5" kotlinxSerialization = "1.3.3" -mockWebServer = "4.9.3" +mockWebServer = "4.10.0" retrofit = "2.9.0" retrofitKotlinxSerialization = "0.8.0" diff --git a/settings.gradle.kts b/settings.gradle.kts index 292cbd4f7b9..3db24dc1d78 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -12,7 +12,7 @@ pluginManagement { } plugins { - id("com.gradle.enterprise") version "3.10.1" + id("com.gradle.enterprise") version "3.10.2" } dependencyResolutionManagement { From 8d998710cb0573365a929a960e8424525a507ce3 Mon Sep 17 00:00:00 2001 From: Simon Vergauwen Date: Thu, 16 Jun 2022 21:59:19 +0200 Subject: [PATCH 2/3] Reverse kotlinBinaryCompatibilityValidator --- 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 5f757cadaa0..e9c5ae6ad1a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,7 @@ jUnitVintage = "5.8.2" kotest = "5.3.1" kotestGradle = "5.3.1" kotlin = "1.6.21" -kotlinBinaryCompatibilityValidator = "0.10.1" +kotlinBinaryCompatibilityValidator = "0.10.0" kotlinCompileTesting = "1.4.8" knit = "0.4.0" kspVersion = "1.6.21-1.0.5" From ee47a8c36d061ec22650ac4c9676e5a24f362ec4 Mon Sep 17 00:00:00 2001 From: Simon Vergauwen Date: Fri, 17 Jun 2022 11:37:36 +0200 Subject: [PATCH 3/3] Update gradle/libs.versions.toml Co-authored-by: Imran Malic Settuba <46971368+i-walker@users.noreply.github.com> --- 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 e9c5ae6ad1a..09fc12ff918 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] animalSniffer = "1.5.4" -arrowGradleConfig = "0.10.2" +arrowGradleConfig = "0.10.1" assertj = "3.23.1" coroutines = "1.6.1" classgraph = "4.8.147"