Compare commits

..

No commits in common. "f106089dd9553102a72aa474f9ad9a4edacde6a7" and "6a96db5a3f33ee3428706da0bfc3de5c5a8f698c" have entirely different histories.

24 changed files with 32 additions and 36 deletions

View File

@ -1,5 +1,5 @@
plugins { plugins {
id "com.gradle.develocity" version "4.2.2" id "com.gradle.develocity" version "4.2.1"
id "com.gradle.common-custom-user-data-gradle-plugin" version "2.4.0" id "com.gradle.common-custom-user-data-gradle-plugin" version "2.4.0"
} }

View File

@ -1,5 +1,5 @@
plugins { plugins {
id("com.gradle.develocity") version "4.2.2" id("com.gradle.develocity") version "4.2.1"
id("com.gradle.common-custom-user-data-gradle-plugin") version "2.4.0" id("com.gradle.common-custom-user-data-gradle-plugin") version "2.4.0"
} }

View File

@ -1,5 +1,5 @@
plugins { plugins {
id "com.gradle.develocity" version "4.2.2" id "com.gradle.develocity" version "4.2.1"
} }
develocity { develocity {

View File

@ -1,5 +1,5 @@
plugins { plugins {
id "com.gradle.develocity" version "4.2.2" id "com.gradle.develocity" version "4.2.1"
} }
develocity { develocity {

View File

@ -1,5 +1,5 @@
plugins { plugins {
id "com.gradle.develocity" version "4.2.2" id "com.gradle.develocity" version "4.2.1"
} }
develocity { develocity {

View File

@ -35,7 +35,7 @@ jobs:
# Initializes the CodeQL tools for scanning. # Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL - name: Initialize CodeQL
uses: github/codeql-action/init@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v3.29.5 uses: github/codeql-action/init@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.29.5
with: with:
languages: ${{ matrix.language }} languages: ${{ matrix.language }}
config: | config: |
@ -43,4 +43,4 @@ jobs:
- sources/src - sources/src
- name: Perform CodeQL Analysis - name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v3.29.5 uses: github/codeql-action/analyze@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.29.5

View File

@ -52,6 +52,6 @@ jobs:
# Upload the results to GitHub's code scanning dashboard. # Upload the results to GitHub's code scanning dashboard.
- name: 'Upload to code-scanning' - name: 'Upload to code-scanning'
uses: github/codeql-action/upload-sarif@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v3.29.5 uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.29.5
with: with:
sarif_file: results.sarif sarif_file: results.sarif

View File

@ -66,7 +66,7 @@ jobs:
# Important: The push event will not trigger any other workflows, see # Important: The push event will not trigger any other workflows, see
# https://github.com/stefanzweifel/git-auto-commit-action?tab=readme-ov-file#commits-made-by-this-action-do-not-trigger-new-workflow-runs # https://github.com/stefanzweifel/git-auto-commit-action?tab=readme-ov-file#commits-made-by-this-action-do-not-trigger-new-workflow-runs
- name: Commit & push changes - name: Commit & push changes
uses: stefanzweifel/git-auto-commit-action@28e16e81777b558cc906c8750092100bbb34c5e3 # v7.0.0 uses: stefanzweifel/git-auto-commit-action@778341af668090896ca464160c2def5d1d1a3eb0 # v6.0.1
with: with:
commit_author: bot-githubaction <bot-githubaction@gradle.com> commit_author: bot-githubaction <bot-githubaction@gradle.com>
commit_user_name: bot-githubaction commit_user_name: bot-githubaction

View File

@ -30,7 +30,7 @@ jobs:
matrix: matrix:
gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4'] gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4']
os: ${{fromJSON(inputs.runner-os)}} os: ${{fromJSON(inputs.runner-os)}}
plugin-version: ['3.16.2', '4.2.2'] plugin-version: ['3.16.2', '4.2.1']
include: include:
- java-version: 17 - java-version: 17
- gradle: '8.14.3' - gradle: '8.14.3'
@ -43,7 +43,7 @@ jobs:
java-version: 11 java-version: 11
- plugin-version: '3.16.2' - plugin-version: '3.16.2'
accessKeyEnv: GRADLE_ENTERPRISE_ACCESS_KEY accessKeyEnv: GRADLE_ENTERPRISE_ACCESS_KEY
- plugin-version: '4.2.2' - plugin-version: '4.2.1'
accessKeyEnv: DEVELOCITY_ACCESS_KEY accessKeyEnv: DEVELOCITY_ACCESS_KEY
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
env: env:
@ -92,7 +92,7 @@ jobs:
matrix: matrix:
gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4'] gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4']
os: ${{fromJSON(inputs.runner-os)}} os: ${{fromJSON(inputs.runner-os)}}
plugin-version: ['3.16.2', '4.2.2'] plugin-version: ['3.16.2', '4.2.1']
include: include:
- java-version: 17 - java-version: 17
- gradle: '8.14.3' - gradle: '8.14.3'
@ -148,7 +148,7 @@ jobs:
matrix: matrix:
gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4'] gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4']
os: ${{fromJSON(inputs.runner-os)}} os: ${{fromJSON(inputs.runner-os)}}
plugin-version: [ '3.16.2', '4.2.2' ] plugin-version: [ '3.16.2', '4.2.1' ]
include: include:
- java-version: 17 - java-version: 17
- gradle: '8.14.3' - gradle: '8.14.3'
@ -191,7 +191,7 @@ jobs:
matrix: matrix:
gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4'] gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4']
os: ${{fromJSON(inputs.runner-os)}} os: ${{fromJSON(inputs.runner-os)}}
plugin-version: [ '3.16.2', '4.2.2' ] plugin-version: [ '3.16.2', '4.2.1' ]
include: include:
- java-version: 17 - java-version: 17
- gradle: '8.14.3' - gradle: '8.14.3'

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -847,7 +847,7 @@ Here's a minimal example:
run: ./gradlew build run: ./gradlew build
``` ```
This configuration will automatically apply `v4.2.2` of the [Develocity Gradle plugin](https://docs.gradle.com/develocity/gradle-plugin/), and publish build scans to https://develocity.your-server.com. This configuration will automatically apply `v4.2.1` of the [Develocity Gradle plugin](https://docs.gradle.com/develocity/gradle-plugin/), and publish build scans to https://develocity.your-server.com.
This example assumes that the `develocity.your-server.com` server allows anonymous publishing of build scans. This example assumes that the `develocity.your-server.com` server allows anonymous publishing of build scans.
In the likely scenario that your Develocity server requires authentication, you will also need to pass a valid [Develocity access key](https://docs.gradle.com/develocity/gradle-plugin/#via_environment_variable) taken from a secret: In the likely scenario that your Develocity server requires authentication, you will also need to pass a valid [Develocity access key](https://docs.gradle.com/develocity/gradle-plugin/#via_environment_variable) taken from a secret:

View File

@ -34,7 +34,7 @@ export async function setup(config: BuildScanConfig): Promise<void> {
// except if they are defined in the configuration // except if they are defined in the configuration
if (config.getBuildScanPublishEnabled()) { if (config.getBuildScanPublishEnabled()) {
maybeExportVariable('DEVELOCITY_INJECTION_ENABLED', 'true') maybeExportVariable('DEVELOCITY_INJECTION_ENABLED', 'true')
maybeExportVariable('DEVELOCITY_INJECTION_DEVELOCITY_PLUGIN_VERSION', '4.2.2') maybeExportVariable('DEVELOCITY_INJECTION_DEVELOCITY_PLUGIN_VERSION', '4.2.1')
maybeExportVariable('DEVELOCITY_INJECTION_CCUD_PLUGIN_VERSION', '2.1') maybeExportVariable('DEVELOCITY_INJECTION_CCUD_PLUGIN_VERSION', '2.1')
maybeExportVariable('DEVELOCITY_INJECTION_TERMS_OF_USE_URL', config.getBuildScanTermsOfUseUrl()) maybeExportVariable('DEVELOCITY_INJECTION_TERMS_OF_USE_URL', config.getBuildScanTermsOfUseUrl())
maybeExportVariable('DEVELOCITY_INJECTION_TERMS_OF_USE_AGREE', config.getBuildScanTermsOfUseAgree()) maybeExportVariable('DEVELOCITY_INJECTION_TERMS_OF_USE_AGREE', config.getBuildScanTermsOfUseAgree())

View File

@ -1,8 +1,4 @@
[ [
{
"version": "9.2.0-rc-2",
"checksum": "423cb469ccc0ecc31f0e4e1c309976198ccb734cdcbb7029d4bda0f18f57e8d9"
},
{ {
"version": "9.2.0-rc-1", "version": "9.2.0-rc-1",
"checksum": "423cb469ccc0ecc31f0e4e1c309976198ccb734cdcbb7029d4bda0f18f57e8d9" "checksum": "423cb469ccc0ecc31f0e4e1c309976198ccb734cdcbb7029d4bda0f18f57e8d9"

View File

@ -1,5 +1,5 @@
plugins { plugins {
id "com.gradle.develocity" version "4.2.2" id "com.gradle.develocity" version "4.2.1"
id "com.gradle.common-custom-user-data-gradle-plugin" version "2.4.0" id "com.gradle.common-custom-user-data-gradle-plugin" version "2.4.0"
} }

View File

@ -16,7 +16,7 @@ import java.nio.file.Files
import java.util.zip.GZIPOutputStream import java.util.zip.GZIPOutputStream
class BaseInitScriptTest extends Specification { class BaseInitScriptTest extends Specification {
static final String DEVELOCITY_PLUGIN_VERSION = '4.2.2' static final String DEVELOCITY_PLUGIN_VERSION = '4.2.1'
static final String CCUD_PLUGIN_VERSION = '2.1' static final String CCUD_PLUGIN_VERSION = '2.1'
static final TestGradleVersion GRADLE_3_X = new TestGradleVersion(GradleVersion.version('3.5.1'), 7, 9) static final TestGradleVersion GRADLE_3_X = new TestGradleVersion(GradleVersion.version('3.5.1'), 7, 9)

View File

@ -248,7 +248,7 @@ task expectFailure {
when: when:
settingsFile.text = """ settingsFile.text = """
plugins { plugins {
id 'com.gradle.develocity' version '4.2.2' apply(false) id 'com.gradle.develocity' version '4.2.1' apply(false)
} }
gradle.settingsEvaluated { gradle.settingsEvaluated {
apply plugin: 'com.gradle.develocity' apply plugin: 'com.gradle.develocity'