Skip to content

Commit fa4ab1a

Browse files
Update the project to Gradle 8.13
1 parent 8d4cc49 commit fa4ab1a

File tree

10 files changed

+16
-32
lines changed

10 files changed

+16
-32
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ equalsVerifier = "3.19.4"
44
graalVmNativeImagePlugin = "0.10.1"
55
gradleBuildInfo = "0.3.1"
66
gradleJavaConventions = "0.2.0"
7-
gradleToolingApi = "8.6"
7+
gradleToolingApi = "8.13"
88
hamcrest = "2.2"
99
jacoco = "0.8.8"
1010
jsonJava = "20240303"

gradle/wrapper/gradle-wrapper.jar

302 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 7 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

model/settings.gradle.kts

Whitespace-only changes.

plugin/settings.gradle.kts

Whitespace-only changes.

plugin/src/main/java/com/opencastsoftware/gradle/bsp/BspModelBuilder.java

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
/*
2-
* SPDX-FileCopyrightText: © 2023 Opencast Software Europe Ltd <https://opencastsoftware.com>
2+
* SPDX-FileCopyrightText: © 2023-2025 Opencast Software Europe Ltd <https://opencastsoftware.com>
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55
package com.opencastsoftware.gradle.bsp;
66

77
import com.opencastsoftware.gradle.bsp.model.*;
88
import org.gradle.api.Project;
9-
import org.gradle.api.attributes.TestSuiteType;
109
import org.gradle.api.plugins.ApplicationPlugin;
1110
import org.gradle.api.plugins.JavaLibraryPlugin;
1211
import org.gradle.api.plugins.jvm.JvmTestSuite;
@@ -72,18 +71,12 @@ protected List<String> getBuildTargetTagsFor(Project project, SourceSet sourceSe
7271
}
7372

7473
var testSourceSets = getTestSourceSets(project);
75-
var integrationTestSourceSets = getTestSourceSetsWithType(project, TestSuiteType.INTEGRATION_TEST);
76-
7774
var isTest = testSourceSets.contains(sourceSet);
75+
7876
if (isTest) {
7977
tags.add(TEST_TAG);
8078
}
8179

82-
var isIntegrationTest = integrationTestSourceSets.contains(sourceSet);
83-
if (isIntegrationTest) {
84-
tags.add(INTEGRATION_TEST_TAG);
85-
}
86-
8780
return tags;
8881
}
8982

@@ -127,16 +120,4 @@ protected Set<SourceSet> getTestSourceSets(Project project) {
127120
.collect(Collectors.toSet()))
128121
.orElse(Set.of());
129122
}
130-
131-
protected Set<SourceSet> getTestSourceSetsWithType(Project project, String testSuiteType) {
132-
var testingExtension = project.getExtensions().findByType(TestingExtension.class);
133-
134-
return Optional.ofNullable(testingExtension)
135-
.map(ext -> ext.getSuites()
136-
.withType(JvmTestSuite.class).stream()
137-
.filter(suite -> suite.getTestType().get().equals(testSuiteType))
138-
.map(JvmTestSuite::getSources)
139-
.collect(Collectors.toSet()))
140-
.orElse(Set.of());
141-
}
142123
}

renovate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"gradle",
1010
"org.gradle:gradle-tooling-api"
1111
],
12-
"allowedVersions": "<8.7"
12+
"allowedVersions": "<8.14"
1313
}
1414
]
1515
}

server/settings.gradle.kts

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)