Skip to content

Commit fc4d36f

Browse files
committed
update gradle
1 parent 5731202 commit fc4d36f

File tree

6 files changed

+24
-14
lines changed

6 files changed

+24
-14
lines changed

.github/workflows/gradle.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
1-
name: Java CI
1+
name: Java CI with Gradle
22

3-
on: [push]
3+
on:
4+
push:
5+
branches: [ main ]
6+
pull_request:
7+
branches: [ main ]
48

59
jobs:
610
build:
711

812
runs-on: ubuntu-latest
913

1014
steps:
11-
- uses: actions/checkout@v3
12-
- uses: actions/setup-java@v2
15+
- uses: actions/checkout@v4
16+
- name: Set up JDK
17+
uses: actions/setup-java@v4
1318
with:
1419
distribution: 'temurin'
15-
java-version: 21
20+
java-version: 22
21+
cache: 'gradle'
22+
- name: Build with Gradle
1623
- run: ./gradlew simple-component:javadoc compiler:javadoc compiler:test

compiler/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id('java')
33
id('maven-publish')
4-
id('com.github.johnrengelman.shadow') version('8.1.1')
4+
id('com.gradleup.shadow') version('8.3.3')
55
id('signing')
66
}
77

@@ -51,7 +51,7 @@ dependencies {
5151
shadow(simple_component)
5252
annotationProcessor('io.github.jbock-java:simple-component-compiler:1.024')
5353
testImplementation('io.github.jbock-java:compile-testing:0.19.12')
54-
testImplementation('org.junit.jupiter:junit-jupiter:5.10.1')
54+
testImplementation('org.junit.jupiter:junit-jupiter:5.11.1')
5555
testImplementation(simple_component)
5656
testImplementation('jakarta.inject:jakarta.inject-api:2.0.1')
5757
testImplementation('javax.inject:javax.inject:1')

compiler/src/main/java/io/jbock/simple/processor/graph/CyclePrinter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ final class CyclePrinter {
2323
}
2424

2525
ValidationFailure fail() {
26-
Report report = cycleMessage();
26+
Report report = createReport();
2727
return new ValidationFailure(report.message, report.binding.element());
2828
}
2929

@@ -37,17 +37,17 @@ private static final class Report {
3737
}
3838
}
3939

40-
Report cycleMessage() {
40+
private Report createReport() {
4141
for (Binding binding : graph.nodes()) {
4242
Optional<List<Edge>> cycle = findProperCycle(binding);
4343
if (cycle.isPresent()) {
44-
return new Report(cycleMessage(cycle.orElseThrow()), binding);
44+
return new Report(createReport(cycle.orElseThrow()), binding);
4545
}
4646
}
4747
throw new AssertionError("input didn't contain a cycle");
4848
}
4949

50-
private String cycleMessage(List<Edge> cycle) {
50+
private String createReport(List<Edge> cycle) {
5151
List<String> message = new ArrayList<>();
5252
message.add("Found a dependency cycle:");
5353
for (Edge edge : cycle) {

gradle/wrapper/gradle-wrapper.jar

-19.7 KB
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.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8891

8992
# Use the maximum available, or set MAX_FD != -1 to use that value.
9093
MAX_FD=maximum

0 commit comments

Comments
 (0)