Skip to content

Commit 16abee8

Browse files
committed
Update to latest plugin versions and add dependency graph GH action
1 parent 05f511b commit 16abee8

File tree

3 files changed

+32
-11
lines changed

3 files changed

+32
-11
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Dependency Graph Submission
2+
on:
3+
push:
4+
branches: [ 'main' ]
5+
6+
permissions:
7+
contents: write
8+
9+
jobs:
10+
dependency-submission:
11+
name: Submission
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Check out project
15+
uses: actions/checkout@v4
16+
- name: Set up JDK 11
17+
uses: actions/setup-java@v4
18+
with:
19+
distribution: 'liberica'
20+
java-version: 11
21+
- name: Generate and submit dependency graph
22+
uses: gradle/actions/dependency-submission@v4

build.gradle

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import static java.lang.Integer.parseInt
44

55
plugins {
66
id 'java-gradle-plugin'
7-
id 'com.gradle.plugin-publish' version '1.2.1'
7+
id 'com.gradle.plugin-publish' version '1.3.0'
88
id 'org.nosphere.gradle.github.actions' version '1.4.0'
99
id 'groovy'
1010
}
@@ -63,8 +63,9 @@ tasks.withType(Test).configureEach {
6363
systemProperty 'testContext.gradleVersion', testGradleVersion
6464
buildScan.value(identityPath.path + "#gradleVersion", testGradleVersion)
6565

66-
def incompatibleJavaVsGradleVersions = parseInt(testJavaRuntimeVersion) > 16 && GradleVersion.version(testGradleVersion) < GradleVersion.version('7.3') ||
67-
parseInt(testJavaRuntimeVersion) > 15 && GradleVersion.version(testGradleVersion) < GradleVersion.version('7.0')
66+
def incompatibleJavaVsGradleVersions = parseInt(testJavaRuntimeVersion) > 20 && GradleVersion.version(testGradleVersion) < GradleVersion.version('8.6') ||
67+
parseInt(testJavaRuntimeVersion) > 16 && GradleVersion.version(testGradleVersion) < GradleVersion.version('7.3') ||
68+
parseInt(testJavaRuntimeVersion) > 15 && GradleVersion.version(testGradleVersion) < GradleVersion.version('7.0')
6869
if (incompatibleJavaVsGradleVersions) {
6970
enabled = false
7071
}

settings.gradle

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
plugins {
2-
id 'com.gradle.enterprise' version '3.16.2'
3-
id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.12.1'
2+
id 'com.gradle.develocity' version '3.18.2'
3+
id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.2'
44
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
55
}
66

77
def isCI = System.getenv('CI') != null
88

9-
gradleEnterprise {
9+
develocity {
1010
server = 'https://etiennestuder.gradle-enterprise.cloud'
1111

1212
buildScan {
13-
publishAlways()
14-
publishIfAuthenticated()
13+
publishing.onlyIf { it.authenticated }
1514
uploadInBackground = !isCI
16-
capture { taskInputFiles = true }
15+
capture { fileFingerprints = true }
1716
obfuscation { ipAddresses { addresses -> addresses.collect { address -> '0.0.0.0' } } }
1817
}
1918
}
@@ -22,8 +21,7 @@ buildCache {
2221
local {
2322
enabled = true
2423
}
25-
26-
remote(gradleEnterprise.buildCache) {
24+
remote(develocity.buildCache) {
2725
enabled = true
2826
// Check access key presence to avoid build cache errors on PR builds when access key is not present
2927
def accessKey = System.getenv("GRADLE_ENTERPRISE_ACCESS_KEY")

0 commit comments

Comments
 (0)