From e2ae1508c27a3adcf73185d7b37d0b44b96835f2 Mon Sep 17 00:00:00 2001 From: akuleshov7 Date: Wed, 4 Sep 2024 23:09:59 +0300 Subject: [PATCH 1/3] Updating problematic versions of ajoberstar repos --- buildSrc/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 558b758..8cbdfd7 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -13,6 +13,6 @@ dependencies { implementation("org.cqfn.diktat:diktat-gradle-plugin:1.2.5") implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.22.0") implementation("io.github.gradle-nexus:publish-plugin:2.0.0") - implementation("org.ajoberstar.reckon:reckon-gradle:0.13.0") - implementation("org.ajoberstar.grgit:grgit-core:4.1.0") + implementation("org.ajoberstar.reckon:reckon-gradle:0.18.3") + implementation("org.ajoberstar.grgit:grgit-core:5.2.2") } From e27a8fb543939043890aaaa79d6f01703c6f3eb8 Mon Sep 17 00:00:00 2001 From: akuleshov7 Date: Wed, 4 Sep 2024 23:41:26 +0300 Subject: [PATCH 2/3] Updating problematic versions of ajoberstar repos --- .github/workflows/build_and_test.yml | 6 +++--- .github/workflows/detekt.yml | 6 +++--- .github/workflows/diktat.yml | 6 +++--- .github/workflows/release.yml | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 00e1376..4a27b96 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -26,11 +26,11 @@ jobs: - uses: actions/checkout@v4 # ensure that gradle wrapper files in repository are valid by checking checksums - uses: gradle/wrapper-validation-action@v2 - - name: Set up JDK 8 + - name: Set up JDK 22 uses: actions/setup-java@v4 with: - java-version: 8 - distribution: zulu + distribution: 'temurin' + java-version: 22 - name: Cache konan uses: actions/cache@v4 with: diff --git a/.github/workflows/detekt.yml b/.github/workflows/detekt.yml index 2ffee6d..df6d214 100644 --- a/.github/workflows/detekt.yml +++ b/.github/workflows/detekt.yml @@ -13,11 +13,11 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 11 + - name: Set up JDK 22 uses: actions/setup-java@v4 with: - java-version: 11 - distribution: zulu + distribution: 'temurin' + java-version: 22 - name: Gradle build with remote cache uses: burrunan/gradle-cache-action@v1 with: diff --git a/.github/workflows/diktat.yml b/.github/workflows/diktat.yml index 69083d9..c52a721 100644 --- a/.github/workflows/diktat.yml +++ b/.github/workflows/diktat.yml @@ -13,11 +13,11 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 11 + - name: Set up JDK 22 uses: actions/setup-java@v4 with: - java-version: 11 - distribution: zulu + distribution: 'temurin' + java-version: 22 - uses: gradle/gradle-build-action@v3 with: gradle-version: wrapper diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7d103b3..ae2cff6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,11 +24,11 @@ jobs: with: # release workflow should have access to all tags fetch-depth: 0 - - name: Set up JDK 8 + - name: Set up JDK 22 uses: actions/setup-java@v4 with: - java-version: 8 - distribution: zulu + distribution: 'temurin' + java-version: 22 - name: Status git before run: git status - uses: burrunan/gradle-cache-action@v1 From e6a8421967888d0c875a047280e0c1a19d2c4925 Mon Sep 17 00:00:00 2001 From: akuleshov7 Date: Thu, 5 Sep 2024 00:05:53 +0300 Subject: [PATCH 3/3] Updating problematic versions of ajoberstar repos --- .github/workflows/build_and_test.yml | 6 +++--- .github/workflows/detekt.yml | 4 ++-- .github/workflows/diktat.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- settings.gradle.kts | 4 ++++ 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 4a27b96..fcdc523 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -25,12 +25,12 @@ jobs: # actions/checkout v1.* is needed for correct codecov upload, see https://github.com/actions/checkout/issues/237 for details - uses: actions/checkout@v4 # ensure that gradle wrapper files in repository are valid by checking checksums - - uses: gradle/wrapper-validation-action@v2 - - name: Set up JDK 22 + - uses: gradle/actions/wrapper-validation@v4 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 22 + java-version: 21 - name: Cache konan uses: actions/cache@v4 with: diff --git a/.github/workflows/detekt.yml b/.github/workflows/detekt.yml index df6d214..a6a84c0 100644 --- a/.github/workflows/detekt.yml +++ b/.github/workflows/detekt.yml @@ -13,11 +13,11 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 22 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 22 + java-version: 21 - name: Gradle build with remote cache uses: burrunan/gradle-cache-action@v1 with: diff --git a/.github/workflows/diktat.yml b/.github/workflows/diktat.yml index c52a721..56b88d6 100644 --- a/.github/workflows/diktat.yml +++ b/.github/workflows/diktat.yml @@ -13,11 +13,11 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 22 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 22 + java-version: 21 - uses: gradle/gradle-build-action@v3 with: gradle-version: wrapper diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ae2cff6..4adf00c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,11 +24,11 @@ jobs: with: # release workflow should have access to all tags fetch-depth: 0 - - name: Set up JDK 22 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 22 + java-version: 21 - name: Status git before run: git status - uses: burrunan/gradle-cache-action@v1 diff --git a/settings.gradle.kts b/settings.gradle.kts index 303ba68..23ea261 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,7 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0") +} + rootProject.name = "ktoml" includeBuild("gradle/plugins")