Skip to content

Commit d015559

Browse files
jprinetjprinet
authored
Merge branch 'gradle:main' into feature/expe_as_composite_actions
2 parents 5314bbd + dd29bda commit d015559

File tree

14 files changed

+70
-17
lines changed

14 files changed

+70
-17
lines changed

‎.github/dco.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Disable sign-off check for members of the Gradle GitHub organization
2+
require:
3+
members: false

‎.github/workflows/build-verification.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
name: Verification
88
runs-on: ubuntu-latest
99
env:
10-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
10+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}
1111
steps:
1212
- name: Checkout
1313
uses: actions/checkout@v2

‎.github/workflows/cross-platform-testing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
run:
3232
shell: ${{ matrix.shell }} {0}
3333
env:
34-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
34+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}
3535
WSLENV: GRADLE_ENTERPRISE_ACCESS_KEY
3636
steps:
3737
- name: Set up WSL

‎.github/workflows/development-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: Release
1212
runs-on: ubuntu-latest
1313
env:
14-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
14+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}
1515
steps:
1616
- name: Checkout
1717
uses: actions/checkout@v2

‎.github/workflows/production-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
name: Release
1414
runs-on: ubuntu-latest
1515
env:
16-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
16+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}
1717
steps:
1818
- name: Checkout
1919
uses: actions/checkout@v2

‎.github/workflows/wrapper-upgrade-execution.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Execute Wrapper Upgrade
2+
3+
on:
4+
schedule:
5+
- cron: '0 2 * * *'
6+
workflow_dispatch:
7+
8+
jobs:
9+
upgrade_wrapper:
10+
name: Execution
11+
runs-on: ubuntu-latest
12+
env:
13+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}
14+
steps:
15+
- name: Set up Git configuration
16+
env:
17+
TOKEN: ${{ secrets.GITHUB_TOKEN }}
18+
run: git config --global url."https://unused-username:${TOKEN}@github.com/".insteadOf "https://github.com/"
19+
- name: Import GPG key
20+
uses: crazy-max/ghaction-import-gpg@cb4264d3319acaa2bea23d51ef67f80b4f775013
21+
with:
22+
gpg_private_key: ${{ secrets.GH_BOT_PGP_PRIVATE_KEY }}
23+
passphrase: ${{ secrets.GH_BOT_PGP_PASSPHRASE }}
24+
git_user_signingkey: true
25+
git_commit_gpgsign: true
26+
git_config_global: true
27+
- name: Checkout
28+
uses: actions/checkout@v2
29+
- name: Set up JDK 11
30+
uses: actions/setup-java@v2
31+
with:
32+
java-version: '11'
33+
distribution: 'adopt'
34+
- name: Upgrade Wrappers
35+
uses: gradle/gradle-build-action@v2
36+
with:
37+
arguments: 'clean upgradeGradleWrapperAll --continue'
38+
env:
39+
WRAPPER_UPGRADE_GIT_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
> - _[Gradle Enterprise Build Configuration Samples][ge-build-config-samples]_
33
> - _[Gradle Enterprise Build Optimization Experiments][ge-build-optimization-experiments]_
44
> - _[Gradle Enterprise Build Validation Scripts][ge-build-validation-scripts] (this repository)_
5-
> - _[Common Custom User Data Gradle Plugin][ccud-gradle-plugin]_
65
> - _[Common Custom User Data Maven Extension][ccud-maven-extension]_
6+
> - _[Common Custom User Data Gradle Plugin][ccud-gradle-plugin]_
77
> - _[Android Cache Fix Gradle Plugin][android-cache-fix-plugin]_
8+
> - _[Wrapper Upgrade Gradle Plugin][wrapper-upgrade-gradle-plugin]_
89
910
# Gradle Enterprise Build Validation Scripts
1011

@@ -46,5 +47,6 @@ The Gradle Enterprise build validation scripts are open-source software released
4647
[ccud-gradle-plugin]: https://github.com/gradle/common-custom-user-data-gradle-plugin
4748
[ccud-maven-extension]: https://github.com/gradle/common-custom-user-data-maven-extension
4849
[android-cache-fix-plugin]: https://github.com/gradle/android-cache-fix-gradle-plugin
50+
[wrapper-upgrade-gradle-plugin]: https://github.com/gradle/wrapper-upgrade-gradle-plugin
4951
[gradle-enterprise]: https://gradle.com/enterprise
5052
[apache-license]: https://www.apache.org/licenses/LICENSE-2.0.html

‎build.gradle.kts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ plugins {
66
id("com.felipefzdz.gradle.shellcheck") version "1.4.6"
77
id("com.github.breadmoirai.github-release") version "2.2.12"
88
id("org.gradle.crypto.checksum") version "1.4.0"
9+
id("org.gradle.wrapper-upgrade") version "0.10.1"
910
}
1011

1112
repositories {
@@ -41,7 +42,7 @@ dependencies {
4142
argbash("argbash:argbash:2.10.0@zip")
4243
commonComponents(project(path = ":fetch-build-scan-data-cmdline-tool", configuration = "shadow"))
4344
mavenComponents(project(":capture-build-scan-url-maven-extension"))
44-
mavenComponents("com.gradle:gradle-enterprise-maven-extension:1.12.4")
45+
mavenComponents("com.gradle:gradle-enterprise-maven-extension:1.13.1")
4546
mavenComponents("com.gradle:common-custom-user-data-maven-extension:1.10.1")
4647
}
4748

@@ -50,6 +51,14 @@ shellcheck {
5051
shellcheckVersion = "v0.7.2"
5152
}
5253

54+
wrapperUpgrade {
55+
gradle {
56+
create("gradle-enterprise-build-validation-scripts") {
57+
repo.set("gradle/gradle-enterprise-build-validation-scripts")
58+
}
59+
}
60+
}
61+
5362
val unpackArgbash = tasks.register<Copy>("unpackArgbash") {
5463
group = "argbash"
5564
description = "Unpacks Argbash."

‎components/capture-build-scan-url-maven-extension/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ repositories {
77
}
88

99
dependencies {
10-
compileOnly("org.apache.maven:maven-core:3.8.4")
10+
compileOnly("org.apache.maven:maven-core:3.8.5")
1111
compileOnly("org.codehaus.plexus:plexus-component-annotations:2.1.1")
12-
compileOnly("com.gradle:gradle-enterprise-maven-extension:1.12.4")
12+
compileOnly("com.gradle:gradle-enterprise-maven-extension:1.13.1")
1313
}
1414

1515
description = "Maven extension to capture the build scan URL"

‎components/fetch-build-scan-data-cmdline-tool/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ dependencies {
1313
implementation("com.squareup.okhttp3:okhttp")
1414
implementation("com.squareup.okhttp3:okhttp-sse")
1515

16-
implementation(platform("com.fasterxml.jackson:jackson-bom:2.13.2"))
17-
implementation("com.fasterxml.jackson.core:jackson-databind:2.13.2")
16+
implementation(platform("com.fasterxml.jackson:jackson-bom:2.13.2.20220328"))
17+
implementation("com.fasterxml.jackson.core:jackson-databind:2.13.2.2")
1818

1919
implementation("com.google.guava:guava:31.1-jre")
2020
implementation("info.picocli:picocli:4.6.3")

‎components/scripts/gradle/gradle-init-scripts/configure-gradle-enterprise.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import org.gradle.util.GradleVersion
22
import java.nio.charset.StandardCharsets;
33

44
initscript {
5-
def gradleEnterprisePluginVersion = "3.8.1"
5+
def gradleEnterprisePluginVersion = "3.9"
66

77
repositories {
88
gradlePluginPortal()

‎components/scripts/gradle/gradle-init-scripts/enable-gradle-enterprise.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import com.gradle.CommonCustomUserDataGradlePlugin
44
import org.gradle.util.GradleVersion
55

66
initscript {
7-
def gradleEnterprisePluginVersion = "3.8.1"
8-
def commonCustomUserDataPluginVersion = "1.6.3"
7+
def gradleEnterprisePluginVersion = "3.9"
8+
def commonCustomUserDataPluginVersion = "1.6.5"
99

1010
repositories {
1111
gradlePluginPortal()

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=8cc27038d5dbd815759851ba53e70cf62e481b87494cc97cfd97982ada5ba634
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
3+
distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

‎settings.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionWithHiddenFeatures
22

33
plugins {
4-
id("com.gradle.enterprise") version "3.8.1"
5-
id("com.gradle.common-custom-user-data-gradle-plugin") version "1.6.3"
4+
id("com.gradle.enterprise") version "3.9"
5+
id("com.gradle.common-custom-user-data-gradle-plugin") version "1.6.5"
66
}
77

88
rootProject.name = "build-validation"

0 commit comments

Comments
 (0)