From 77fa55196fc7f092b1d9d4754e209a6dd5133a64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Kwieci=C5=84ski?= <36954793+mateuszkwiecinski@users.noreply.github.com> Date: Sat, 24 Jun 2023 17:44:17 +0200 Subject: [PATCH] Bump starter (#512) --- .github/workflows/publish_release.yml | 2 ++ build.gradle | 10 +--------- gradle/libs.versions.toml | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index 5d3a6699..f18998b0 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -34,6 +34,8 @@ jobs: distribution: 'temurin' java-version: 20 + - uses: gradle/gradle-build-action@v2 + - name: Unwrap GPG key env: GPG_KEY_CONTENTS: ${{ secrets.GPG_KEY_CONTENTS }} diff --git a/build.gradle b/build.gradle index b50f38fc..8a87e86d 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ commonConfig { allprojects { pluginManager.withPlugin("kotlin") { plugin -> def kotlinVersion = KotlinPluginWrapperKt.getKotlinPluginVersion(project) - configurations.configureEach { + configurations.matching { it.name != "detekt" }.configureEach { resolutionStrategy.eachDependency { if (requested.group == 'org.jetbrains.kotlin' && requested.name.startsWith("kotlin")) { useVersion kotlinVersion @@ -40,12 +40,4 @@ allprojects { } } } - // TODO remove after project uses latest jacoco version - pluginManager.withPlugin("jacoco") { - afterEvaluate { - jacoco { - toolVersion = "0.8.10" - } - } - } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5890bf03..70243e5a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] google-agp = "8.0.2" -gradle-starter = "0.60.1" +gradle-starter = "0.61.1" gradle-gradlepublish = "1.2.0" gradle-jacocotestkit = "1.0.12" gradle-detekt = "1.23.0"