From 39b8859217a1d315656d8c7b729c1dafe74020a6 Mon Sep 17 00:00:00 2001 From: hfhbd <22521688+hfhbd@users.noreply.github.com> Date: Mon, 19 Jan 2026 20:09:55 +0100 Subject: [PATCH] Remove develocity plugin --- .github/dependabot.yml | 4 ---- .github/workflows/CD.yml | 7 +++++++ .github/workflows/CI.yml | 7 +++++++ .github/workflows/codeQL.yml | 4 ++++ .github/workflows/dependencies.yml | 5 ++++- core/src/main/java/module-info.java | 1 - gradle/build-logic/settings.gradle.kts | 1 - settings.gradle.kts | 13 ------------- 8 files changed, 22 insertions(+), 20 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f9e04ae..9b54f91 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,11 +4,7 @@ updates: directory: "/" schedule: interval: "daily" - assignees: - - "hfhbd" - package-ecosystem: "gradle" directory: "/" schedule: interval: "daily" - assignees: - - "hfhbd" diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 425a2f6..2bc5192 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -15,12 +15,19 @@ jobs: environment: name: CD + permissions: + contents: read + steps: - name: Set environment for version run: long="${{ github.ref }}"; version=${long#"refs/tags/v"}; echo "version=${version}" >> $GITHUB_OUTPUT id: version - uses: actions/checkout@v6 - uses: gradle/actions/setup-gradle@v5 + with: + build-scan-publish: true + build-scan-terms-of-use-url: 'https://gradle.com/terms-of-service' + build-scan-terms-of-use-agree: 'yes' - name: Publish run: ./gradlew -Pversion=${{ steps.version.outputs.version }} publish diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ad3dfae..5e02063 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -10,9 +10,16 @@ jobs: build: runs-on: ubuntu-latest + permissions: + contents: read + steps: - uses: actions/checkout@v6 - uses: gradle/actions/setup-gradle@v5 + with: + build-scan-publish: true + build-scan-terms-of-use-url: 'https://gradle.com/terms-of-service' + build-scan-terms-of-use-agree: 'yes' - name: Build with Gradle run: ./gradlew build diff --git a/.github/workflows/codeQL.yml b/.github/workflows/codeQL.yml index 7958e8d..f377032 100644 --- a/.github/workflows/codeQL.yml +++ b/.github/workflows/codeQL.yml @@ -17,6 +17,10 @@ jobs: steps: - uses: actions/checkout@v6 - uses: gradle/actions/setup-gradle@v5 + with: + build-scan-publish: true + build-scan-terms-of-use-url: 'https://gradle.com/terms-of-service' + build-scan-terms-of-use-agree: 'yes' - name: Initialize CodeQL uses: github/codeql-action/init@v3 diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml index ef92314..7762b0d 100644 --- a/.github/workflows/dependencies.yml +++ b/.github/workflows/dependencies.yml @@ -19,9 +19,12 @@ jobs: uses: gradle/actions/dependency-submission@v5 dependency-review: - runs-on: ubuntu-latest + runs-on: ubuntu-slim needs: dependency-submission if: github.event_name == 'pull_request' + + permissions: {} + steps: - name: Perform dependency review uses: actions/dependency-review-action@v4 diff --git a/core/src/main/java/module-info.java b/core/src/main/java/module-info.java index 4e1d581..3ffa7ea 100644 --- a/core/src/main/java/module-info.java +++ b/core/src/main/java/module-info.java @@ -5,6 +5,5 @@ exports app.softwork.cloudkitclient.values; requires kotlin.stdlib; - requires transitive io.ktor.client.java; requires transitive kotlinx.serialization.json; } diff --git a/gradle/build-logic/settings.gradle.kts b/gradle/build-logic/settings.gradle.kts index fe24033..99a9a62 100644 --- a/gradle/build-logic/settings.gradle.kts +++ b/gradle/build-logic/settings.gradle.kts @@ -2,7 +2,6 @@ dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { mavenCentral() - gradlePluginPortal() } versionCatalogs.register("libs") { from(files("../libs.versions.toml")) diff --git a/settings.gradle.kts b/settings.gradle.kts index 8c41c7e..13e3298 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,19 +9,6 @@ pluginManagement { plugins { id("MyRepos") id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" - id("com.gradle.develocity") version "4.2" -} - -develocity { - buildScan { - termsOfUseUrl.set("https://gradle.com/terms-of-service") - termsOfUseAgree.set("yes") - val isCI = providers.environmentVariable("CI").isPresent - publishing { - onlyIf { isCI } - } - tag("CI") - } } enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")