File tree 8 files changed +21
-11
lines changed
src/test/java/com/diffplug/gradle/spotless
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.
10
10
We adhere to the [ keepachangelog] ( https://keepachangelog.com/en/1.0.0/ ) format (starting after version ` 1.27.0 ` ).
11
11
12
12
## [ 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 `
13
16
14
17
## [ 2.31.1] - 2023-01-02
15
18
### Fixed
Original file line number Diff line number Diff line change 1
1
distributionBase =GRADLE_USER_HOME
2
2
distributionPath =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
4
5
zipStoreBase =GRADLE_USER_HOME
5
6
zipStorePath =wrapper/dists
Original file line number Diff line number Diff line change 55
55
# Darwin, MinGW, and NonStop.
56
56
#
57
57
# (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
59
59
# within the Gradle project.
60
60
#
61
61
# You can find Gradle at https://github.com/gradle/gradle/.
80
80
esac
81
81
done
82
82
83
- APP_HOME=$( cd " ${APP_HOME:- ./ } " && pwd -P ) || exit
84
-
85
- APP_NAME=" Gradle"
83
+ # This is normally unused
84
+ # shellcheck disable=SC2034
86
85
APP_BASE_NAME=${0##*/ }
86
+ APP_HOME=$( cd " ${APP_HOME:- ./ } " && pwd -P ) || exit
87
87
88
88
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89
89
DEFAULT_JVM_OPTS=' "-Xmx64m" "-Xms64m"'
143
143
if ! " $cygwin " && ! " $darwin " && ! " $nonstop " ; then
144
144
case $MAX_FD in # (
145
145
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
146
148
MAX_FD=$( ulimit -H -n ) ||
147
149
warn " Could not query maximum file descriptor limit"
148
150
esac
149
151
case $MAX_FD in # (
150
152
' ' | soft) : ;; # (
151
153
* )
154
+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155
+ # shellcheck disable=SC3045
152
156
ulimit -n " $MAX_FD " ||
153
157
warn " Could not set maximum file descriptor limit to $MAX_FD "
154
158
esac
Original file line number Diff line number Diff line change @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
26
26
27
27
set DIRNAME = %~dp0
28
28
if " %DIRNAME% " == " " set DIRNAME = .
29
+ @ rem This is normally unused
29
30
set APP_BASE_NAME = %~n0
30
31
set APP_HOME = %DIRNAME%
31
32
Original file line number Diff line number Diff line change @@ -14,8 +14,6 @@ dependencies {
14
14
// needed by GitAttributesLineEndings
15
15
implementation " org.eclipse.jgit:org.eclipse.jgit:${ VER_JGIT} "
16
16
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"
19
17
20
18
// testing
21
19
testImplementation project(' :testlib' )
Original file line number Diff line number Diff line change @@ -2,11 +2,11 @@ apply from: rootProject.file('gradle/changelog.gradle')
2
2
ext. artifactId = project. artifactIdGradle
3
3
version = spotlessChangelog. versionNext
4
4
apply plugin : ' java-library'
5
+ apply plugin : ' com.gradle.plugin-publish'
6
+ apply plugin : ' java-gradle-plugin'
5
7
apply from : rootProject. file(' gradle/java-setup.gradle' )
6
8
apply from : rootProject. file(' gradle/spotless-freshmark.gradle' )
7
9
8
- apply plugin : ' com.gradle.plugin-publish'
9
- apply plugin : ' java-gradle-plugin'
10
10
11
11
dependencies {
12
12
if (version. endsWith(' -SNAPSHOT' ) || (rootProject. spotlessChangelog. versionNext == rootProject. spotlessChangelog. versionLast)) {
Original file line number Diff line number Diff line change 1
1
/*
2
- * Copyright 2016-2022 DiffPlug
2
+ * Copyright 2016-2023 DiffPlug
3
3
*
4
4
* Licensed under the Apache License, Version 2.0 (the "License");
5
5
* you may not use this file except in compliance with the License.
@@ -53,9 +53,12 @@ public enum GradleVersionSupport {
53
53
GradleVersionSupport (String version ) {
54
54
String minVersionForRunningJRE ;
55
55
switch (Jvm .version ()) {
56
+ case 21 :
56
57
case 20 :
57
- case 19 :
58
58
// TODO: https://docs.gradle.org/current/userguide/compatibility.html
59
+ case 19 :
60
+ minVersionForRunningJRE = "7.6" ;
61
+ break ;
59
62
case 18 :
60
63
minVersionForRunningJRE = "7.5" ;
61
64
break ;
You can’t perform that action at this time.
0 commit comments