From e036fa279e255774d486f2f9c9c509c13f855ab4 Mon Sep 17 00:00:00 2001 From: Rob Winch <362503+rwinch@users.noreply.github.com> Date: Tue, 28 May 2024 15:48:51 -0500 Subject: [PATCH] Use Develocity Plugin Closes gh-209 --- .github/workflows/ci.yml | 4 +--- build.gradle | 7 +++++++ gradle.properties | 4 ++-- settings.gradle | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cda9b25..1b82bfa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,9 +58,7 @@ jobs: OSSRH_TOKEN_PASSWORD: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }} ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} - GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }} - GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} run: | ./gradlew build publishArtifacts \ -PossrhUsername="$OSSRH_TOKEN_USERNAME" \ diff --git a/build.gradle b/build.gradle index bbc6629..c2ec9b9 100644 --- a/build.gradle +++ b/build.gradle @@ -30,3 +30,10 @@ allprojects { resolutionStrategy.cacheChangingModulesFor 1, 'hours' } } + +develocity { + buildScan { + termsOfUseUrl = 'https://gradle.com/help/legal-terms-of-use' + termsOfUseAgree = 'yes' + } +} diff --git a/gradle.properties b/gradle.properties index dd48e8c..f4c3f19 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,5 +9,5 @@ servletApiVersion=6.0.0 httpclient5Version=5.1.4 kerbyVersion=2.0.3 okhttp3Version=3.14.9 -gradleEnterpriseVersion=3.16.2 -springGeConventionsVersion=0.0.15 +develocityVersion=3.17.2 +springGeConventionsVersion=0.0.17 diff --git a/settings.gradle b/settings.gradle index 5fb572c..05bf621 100644 --- a/settings.gradle +++ b/settings.gradle @@ -13,13 +13,13 @@ pluginManagement { plugins { id 'org.springframework.boot' version "$springBootVersion" id 'io.spring.dependency-management' version '1.1.0' - id 'com.gradle.enterprise' version "$gradleEnterpriseVersion" + id 'com.gradle.develocity' version "$develocityVersion" id 'io.spring.ge.conventions' version "$springGeConventionsVersion" } } plugins { - id "com.gradle.enterprise" + id "com.gradle.develocity" id "io.spring.ge.conventions" }