Skip to content

Commit e694582

Browse files
trivikrtrivikr
authored
chore(deps): upgrade gradle to 6.8.3 (#2071)
1 parent e8636f6 commit e694582

15 files changed

+128
-150
lines changed

‎codegen/config/checkstyle/checkstyle.xml

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
-->
1616

1717
<!DOCTYPE module PUBLIC
18-
"-//Puppy Crawl//DTD Check Configuration 1.2//EN"
19-
"http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
18+
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
19+
"https://checkstyle.org/dtds/configuration_1_3.dtd">
2020

2121
<module name="Checker">
22-
<module name="SuppressWarningsFilter" />
22+
<module name="SuppressWarningsFilter"/>
2323

2424
<module name="SuppressionFilter">
2525
<property name="file" value="${config_loc}/suppressions.xml"/>
@@ -36,7 +36,15 @@
3636
<property name="fileExtensions" value="java"/>
3737
</module>
3838

39-
<module name="NewlineAtEndOfFile"/>
39+
<module name="NewlineAtEndOfFile">
40+
<property name="lineSeparator" value="lf_cr_crlf"/>
41+
</module>
42+
43+
<!-- See http://checkstyle.sf.net/config_sizes.html -->
44+
<module name="LineLength">
45+
<property name="max" value="${checkstyle.linelength}" default="120"/>
46+
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
47+
</module>
4048

4149
<!-- Checks for whitespace -->
4250
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
@@ -51,13 +59,6 @@
5159
<module name="SuppressWarningsHolder"/>
5260
<module name="SuppressionCommentFilter"/>
5361

54-
<!-- Checks for Size Violations. -->
55-
<!-- See http://checkstyle.sf.net/config_sizes.html -->
56-
<module name="LineLength">
57-
<property name="max" value="${checkstyle.linelength}" default="120"/>
58-
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
59-
</module>
60-
6162
<!-- Checks for imports -->
6263
<!-- See http://checkstyle.sf.net/config_import.html -->
6364
<module name="NoLineWrap"/>
@@ -79,12 +80,8 @@
7980
<module name="JavadocMethod">
8081
<property name="scope" value="public"/>
8182
<property name="allowMissingParamTags" value="true"/>
82-
<property name="allowMissingThrowsTags" value="true"/>
8383
<property name="allowMissingReturnTag" value="true"/>
84-
<property name="minLineCount" value="2"/>
8584
<property name="allowedAnnotations" value="Override, Test"/>
86-
<property name="allowThrowsTagsForSubclasses" value="true"/>
87-
<property name="allowMissingJavadoc" value="true"/>
8885
</module>
8986
<module name="JavadocStyle"/>
9087
<module name="NonEmptyAtclauseDescription"/>
@@ -155,7 +152,9 @@
155152
<property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
156153
</module>
157154
<module name="LeftCurly"/>
158-
<module name="NeedBraces"/>
155+
<module name="NeedBraces">
156+
<property name="allowEmptyLoopBody" value="true"/>
157+
</module>
159158
<module name="RightCurly">
160159
<property name="id" value="RightCurlySame"/>
161160
<property name="tokens"
@@ -165,12 +164,11 @@
165164
<property name="id" value="RightCurlyAlone"/>
166165
<property name="option" value="alone"/>
167166
<property name="tokens"
168-
value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT"/>
167+
value="CLASS_DEF, METHOD_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT"/>
169168
</module>
170169

171170
<!-- Checks for common coding problems -->
172171
<!-- See http://checkstyle.sf.net/config_coding.html -->
173-
<module name="EmptyStatement"/>
174172
<module name="EqualsHashCode"/>
175173
<module name="IllegalInstantiation"/>
176174
<module name="InnerAssignment"/>
@@ -206,4 +204,4 @@
206204
<property name="allowNonPrintableEscapes" value="true"/>
207205
</module>
208206
</module>
209-
</module>
207+
</module>

‎codegen/gradle/wrapper/gradle-wrapper.jar

3.5 KB
Binary file not shown.

‎codegen/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎codegen/gradlew

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ esac
8282

8383
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
8484

85+
8586
# Determine the Java command to use to start the JVM.
8687
if [ -n "$JAVA_HOME" ] ; then
8788
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
129130
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
130131
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
131132
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133+
132134
JAVACMD=`cygpath --unix "$JAVACMD"`
133135

134136
# We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
154156
else
155157
eval `echo args$i`="\"$arg\""
156158
fi
157-
i=$((i+1))
159+
i=`expr $i + 1`
158160
done
159161
case $i in
160-
(0) set -- ;;
161-
(1) set -- "$args0" ;;
162-
(2) set -- "$args0" "$args1" ;;
163-
(3) set -- "$args0" "$args1" "$args2" ;;
164-
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
165-
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
166-
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
167-
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
168-
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
169-
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
162+
0) set -- ;;
163+
1) set -- "$args0" ;;
164+
2) set -- "$args0" "$args1" ;;
165+
3) set -- "$args0" "$args1" "$args2" ;;
166+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
167+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
168+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
169+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
170+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
171+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
170172
esac
171173
fi
172174

@@ -175,14 +177,9 @@ save () {
175177
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
176178
echo " "
177179
}
178-
APP_ARGS=$(save "$@")
180+
APP_ARGS=`save "$@"`
179181

180182
# Collect all arguments for the java command, following the shell quoting and substitution rules
181183
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
182184

183-
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
184-
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
185-
cd "$(dirname "$0")"
186-
fi
187-
188185
exec "$JAVACMD" "$@"

‎codegen/gradlew.bat

Lines changed: 89 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,89 @@
1-
@rem
2-
@rem Copyright 2015 the original author or authors.
3-
@rem
4-
@rem Licensed under the Apache License, Version 2.0 (the "License");
5-
@rem you may not use this file except in compliance with the License.
6-
@rem You may obtain a copy of the License at
7-
@rem
8-
@rem https://www.apache.org/licenses/LICENSE-2.0
9-
@rem
10-
@rem Unless required by applicable law or agreed to in writing, software
11-
@rem distributed under the License is distributed on an "AS IS" BASIS,
12-
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
@rem See the License for the specific language governing permissions and
14-
@rem limitations under the License.
15-
@rem
16-
17-
@if "%DEBUG%" == "" @echo off
18-
@rem ##########################################################################
19-
@rem
20-
@rem Gradle startup script for Windows
21-
@rem
22-
@rem ##########################################################################
23-
24-
@rem Set local scope for the variables with windows NT shell
25-
if "%OS%"=="Windows_NT" setlocal
26-
27-
set DIRNAME=%~dp0
28-
if "%DIRNAME%" == "" set DIRNAME=.
29-
set APP_BASE_NAME=%~n0
30-
set APP_HOME=%DIRNAME%
31-
32-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
33-
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
34-
35-
@rem Find java.exe
36-
if defined JAVA_HOME goto findJavaFromJavaHome
37-
38-
set JAVA_EXE=java.exe
39-
%JAVA_EXE% -version >NUL 2>&1
40-
if "%ERRORLEVEL%" == "0" goto init
41-
42-
echo.
43-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
44-
echo.
45-
echo Please set the JAVA_HOME variable in your environment to match the
46-
echo location of your Java installation.
47-
48-
goto fail
49-
50-
:findJavaFromJavaHome
51-
set JAVA_HOME=%JAVA_HOME:"=%
52-
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
53-
54-
if exist "%JAVA_EXE%" goto init
55-
56-
echo.
57-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
58-
echo.
59-
echo Please set the JAVA_HOME variable in your environment to match the
60-
echo location of your Java installation.
61-
62-
goto fail
63-
64-
:init
65-
@rem Get command-line arguments, handling Windows variants
66-
67-
if not "%OS%" == "Windows_NT" goto win9xME_args
68-
69-
:win9xME_args
70-
@rem Slurp the command line arguments.
71-
set CMD_LINE_ARGS=
72-
set _SKIP=2
73-
74-
:win9xME_args_slurp
75-
if "x%~1" == "x" goto execute
76-
77-
set CMD_LINE_ARGS=%*
78-
79-
:execute
80-
@rem Setup the command line
81-
82-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
83-
84-
@rem Execute Gradle
85-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
86-
87-
:end
88-
@rem End local scope for the variables with windows NT shell
89-
if "%ERRORLEVEL%"=="0" goto mainEnd
90-
91-
:fail
92-
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
93-
rem the _cmd.exe /c_ return code!
94-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
95-
exit /b 1
96-
97-
:mainEnd
98-
if "%OS%"=="Windows_NT" endlocal
99-
100-
:omega
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem https://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
17+
@if "%DEBUG%" == "" @echo off
18+
@rem ##########################################################################
19+
@rem
20+
@rem Gradle startup script for Windows
21+
@rem
22+
@rem ##########################################################################
23+
24+
@rem Set local scope for the variables with windows NT shell
25+
if "%OS%"=="Windows_NT" setlocal
26+
27+
set DIRNAME=%~dp0
28+
if "%DIRNAME%" == "" set DIRNAME=.
29+
set APP_BASE_NAME=%~n0
30+
set APP_HOME=%DIRNAME%
31+
32+
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
33+
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
34+
35+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
36+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
37+
38+
@rem Find java.exe
39+
if defined JAVA_HOME goto findJavaFromJavaHome
40+
41+
set JAVA_EXE=java.exe
42+
%JAVA_EXE% -version >NUL 2>&1
43+
if "%ERRORLEVEL%" == "0" goto execute
44+
45+
echo.
46+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
47+
echo.
48+
echo Please set the JAVA_HOME variable in your environment to match the
49+
echo location of your Java installation.
50+
51+
goto fail
52+
53+
:findJavaFromJavaHome
54+
set JAVA_HOME=%JAVA_HOME:"=%
55+
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
56+
57+
if exist "%JAVA_EXE%" goto execute
58+
59+
echo.
60+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
61+
echo.
62+
echo Please set the JAVA_HOME variable in your environment to match the
63+
echo location of your Java installation.
64+
65+
goto fail
66+
67+
:execute
68+
@rem Setup the command line
69+
70+
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
71+
72+
73+
@rem Execute Gradle
74+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
75+
76+
:end
77+
@rem End local scope for the variables with windows NT shell
78+
if "%ERRORLEVEL%"=="0" goto mainEnd
79+
80+
:fail
81+
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
82+
rem the _cmd.exe /c_ return code!
83+
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
84+
exit /b 1
85+
86+
:mainEnd
87+
if "%OS%"=="Windows_NT" endlocal
88+
89+
:omega

‎codegen/smithy-aws-typescript-codegen/build.gradle.kts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ plugins {
1717
`java-library`
1818
checkstyle
1919
jacoco
20-
id("com.github.spotbugs") version "1.6.10"
20+
id("com.github.spotbugs") version "4.6.0"
2121
}
2222

2323
group = "software.amazon.smithy"
@@ -71,7 +71,10 @@ if (project.hasProperty("log-tests")) {
7171
}
7272

7373
// Configure the bug filter for spotbugs.
74-
tasks.withType<com.github.spotbugs.SpotBugsTask> {
75-
effort = "max"
76-
excludeFilterConfig = project.resources.text.fromFile("${project.rootDir}/config/spotbugs/filter.xml")
74+
spotbugs {
75+
setEffort("max")
76+
val excludeFile = File("${project.rootDir}/config/spotbugs/filter.xml")
77+
if (excludeFile.exists()) {
78+
excludeFilter.set(excludeFile)
79+
}
7780
}

‎codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddBodyChecksumGeneratorDependency.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import software.amazon.smithy.typescript.codegen.LanguageTarget;
2828
import software.amazon.smithy.typescript.codegen.TypeScriptSettings;
2929
import software.amazon.smithy.typescript.codegen.TypeScriptWriter;
30-
3130
import software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration;
3231
import software.amazon.smithy.utils.MapUtils;
3332
import software.amazon.smithy.utils.SetUtils;

‎codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddBuiltinPlugins.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
import java.util.List;
2222
import java.util.Set;
23-
2423
import software.amazon.smithy.aws.traits.ServiceTrait;
2524
import software.amazon.smithy.model.Model;
2625
import software.amazon.smithy.model.knowledge.OperationIndex;

‎codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddCrossRegionCopyingPlugin.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import java.util.List;
2121
import java.util.Set;
22-
2322
import software.amazon.smithy.aws.traits.ServiceTrait;
2423
import software.amazon.smithy.model.shapes.Shape;
2524
import software.amazon.smithy.typescript.codegen.integration.RuntimeClientPlugin;

0 commit comments

Comments
 (0)