File tree Expand file tree Collapse file tree 8 files changed +21
-11
lines changed
src/test/java/com/diffplug/gradle/spotless Expand file tree Collapse file tree 8 files changed +21
-11
lines changed Original file line number Diff line number Diff line change @@ -10,6 +10,9 @@ This document is intended for Spotless developers.
1010We adhere to the [ keepachangelog] ( https://keepachangelog.com/en/1.0.0/ ) format (starting after version ` 1.27.0 ` ).
1111
1212## [ Unreleased]
13+ ### Changes
14+ * Bump the dev version of Gradle from ` 7.5.1 ` to ` 7.6 ` ([ #1409 ] ( https://github.com/diffplug/spotless/pull/1409 ) )
15+ * We also removed the no-longer-required dependency ` org.codehaus.groovy:groovy-xml `
1316
1417## [ 2.31.1] - 2023-01-02
1518### Fixed
Original file line number Diff line number Diff line change 11distributionBase =GRADLE_USER_HOME
22distributionPath =wrapper/dists
3- distributionUrl =https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
3+ distributionUrl =https\://services.gradle.org/distributions/gradle-7.6-bin.zip
4+ networkTimeout =10000
45zipStoreBase =GRADLE_USER_HOME
56zipStorePath =wrapper/dists
Original file line number Diff line number Diff line change 5555# Darwin, MinGW, and NonStop.
5656#
5757# (3) This script is generated from the Groovy template
58- # https://github.com/gradle/gradle/blob/master /subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+ # https://github.com/gradle/gradle/blob/HEAD /subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5959# within the Gradle project.
6060#
6161# You can find Gradle at https://github.com/gradle/gradle/.
8080 esac
8181done
8282
83- APP_HOME=$( cd " ${APP_HOME:- ./ } " && pwd -P ) || exit
84-
85- APP_NAME=" Gradle"
83+ # This is normally unused
84+ # shellcheck disable=SC2034
8685APP_BASE_NAME=${0##*/ }
86+ APP_HOME=$( cd " ${APP_HOME:- ./ } " && pwd -P ) || exit
8787
8888# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
8989DEFAULT_JVM_OPTS=' "-Xmx64m" "-Xms64m"'
143143if ! " $cygwin " && ! " $darwin " && ! " $nonstop " ; then
144144 case $MAX_FD in # (
145145 max* )
146+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147+ # shellcheck disable=SC3045
146148 MAX_FD=$( ulimit -H -n ) ||
147149 warn " Could not query maximum file descriptor limit"
148150 esac
149151 case $MAX_FD in # (
150152 ' ' | soft) : ;; # (
151153 * )
154+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155+ # shellcheck disable=SC3045
152156 ulimit -n " $MAX_FD " ||
153157 warn " Could not set maximum file descriptor limit to $MAX_FD "
154158 esac
Original file line number Diff line number Diff line change @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
2626
2727set DIRNAME = %~dp0
2828if " %DIRNAME% " == " " set DIRNAME = .
29+ @ rem This is normally unused
2930set APP_BASE_NAME = %~n0
3031set APP_HOME = %DIRNAME%
3132
Original file line number Diff line number Diff line change @@ -14,8 +14,6 @@ dependencies {
1414 // needed by GitAttributesLineEndings
1515 implementation " org.eclipse.jgit:org.eclipse.jgit:${ VER_JGIT} "
1616 implementation " com.googlecode.concurrent-trees:concurrent-trees:2.6.1"
17- // used for xml parsing in EclipseFormatter
18- implementation " org.codehaus.groovy:groovy-xml:3.0.10"
1917
2018 // testing
2119 testImplementation project(' :testlib' )
Original file line number Diff line number Diff line change @@ -2,11 +2,11 @@ apply from: rootProject.file('gradle/changelog.gradle')
22ext. artifactId = project. artifactIdGradle
33version = spotlessChangelog. versionNext
44apply plugin : ' java-library'
5+ apply plugin : ' com.gradle.plugin-publish'
6+ apply plugin : ' java-gradle-plugin'
57apply from : rootProject. file(' gradle/java-setup.gradle' )
68apply from : rootProject. file(' gradle/spotless-freshmark.gradle' )
79
8- apply plugin : ' com.gradle.plugin-publish'
9- apply plugin : ' java-gradle-plugin'
1010
1111dependencies {
1212 if (version. endsWith(' -SNAPSHOT' ) || (rootProject. spotlessChangelog. versionNext == rootProject. spotlessChangelog. versionLast)) {
Original file line number Diff line number Diff line change 11/*
2- * Copyright 2016-2022 DiffPlug
2+ * Copyright 2016-2023 DiffPlug
33 *
44 * Licensed under the Apache License, Version 2.0 (the "License");
55 * you may not use this file except in compliance with the License.
@@ -53,9 +53,12 @@ public enum GradleVersionSupport {
5353 GradleVersionSupport (String version ) {
5454 String minVersionForRunningJRE ;
5555 switch (Jvm .version ()) {
56+ case 21 :
5657 case 20 :
57- case 19 :
5858 // TODO: https://docs.gradle.org/current/userguide/compatibility.html
59+ case 19 :
60+ minVersionForRunningJRE = "7.6" ;
61+ break ;
5962 case 18 :
6063 minVersionForRunningJRE = "7.5" ;
6164 break ;
You can’t perform that action at this time.
0 commit comments