Skip to content

Commit f5f042d

Browse files
Update gradle
1 parent 805b29d commit f5f042d

File tree

6 files changed

+23
-16
lines changed

6 files changed

+23
-16
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,9 @@ subprojects {
181181
}
182182
jacocoTestReport {
183183
reports {
184-
xml.enabled false
185-
csv.enabled false
186-
html.destination file("$buildDir/reports/jacoco")
184+
xml.required = false
185+
csv.required = false
186+
html.outputLocation = layout.buildDirectory.dir('$buildDir/reports/jacoco')
187187
}
188188
}
189189

config/checkstyle/checkstyle.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
-->
66

77
<!DOCTYPE module PUBLIC
8-
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
9-
"https://checkstyle.org/dtds/configuration_1_3.dtd">
8+
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
9+
"https://checkstyle.org/dtds/configuration_1_3.dtd">
1010

1111
<module name="Checker">
1212
<module name="SuppressWarningsFilter"/>
@@ -19,7 +19,7 @@
1919
<property name="fileNamePattern" value="(module\-info\.java$|Test.java$|src/test/java)"/>
2020
</module>
2121

22-
<!-- Files must contain a copyright header, with or without a year. -->
22+
<!-- Files must contain a copyright header. -->
2323
<module name="RegexpHeader">
2424
<property name="header"
2525
value="/\*\n \* Copyright Amazon\.com, Inc\. or its affiliates\. All Rights Reserved\.\n"/>
@@ -68,7 +68,7 @@
6868
<!-- Checks for Javadoc comments. -->
6969
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
7070
<module name="JavadocMethod">
71-
<property name="scope" value="public"/>
71+
<property name="accessModifiers" value="public"/>
7272
<property name="allowMissingParamTags" value="true"/>
7373
<property name="allowMissingReturnTag" value="true"/>
7474
<property name="allowedAnnotations" value="Override, Test"/>

gradle/wrapper/gradle-wrapper.jar

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

gradlew

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ done
8383
# This is normally unused
8484
# shellcheck disable=SC2034
8585
APP_BASE_NAME=${0##*/}
86-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
86+
# 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
8788

8889
# Use the maximum available, or set MAX_FD != -1 to use that value.
8990
MAX_FD=maximum
@@ -144,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144145
case $MAX_FD in #(
145146
max*)
146147
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147-
# shellcheck disable=SC3045
148+
# shellcheck disable=SC2039,SC3045
148149
MAX_FD=$( ulimit -H -n ) ||
149150
warn "Could not query maximum file descriptor limit"
150151
esac
151152
case $MAX_FD in #(
152153
'' | soft) :;; #(
153154
*)
154155
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155-
# shellcheck disable=SC3045
156+
# shellcheck disable=SC2039,SC3045
156157
ulimit -n "$MAX_FD" ||
157158
warn "Could not set maximum file descriptor limit to $MAX_FD"
158159
esac
@@ -201,11 +202,11 @@ fi
201202
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
202203
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
203204

204-
# Collect all arguments for the java command;
205-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
206-
# shell script including quotes and variable substitutions, so put them in
207-
# double quotes to make sure that they get re-expanded; and
208-
# * put everything else in single quotes, so that it's not re-expanded.
205+
# Collect all arguments for the java command:
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207+
# and any embedded shellness will be escaped.
208+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209+
# treated as '${Hostname}' itself on the command line.
209210

210211
set -- \
211212
"-Dorg.gradle.appname=$APP_BASE_NAME" \

smithy-docgen-core/src/main/java/software/amazon/smithy/docgen/core/DocSettings.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919
@SmithyUnstableApi
2020
public record DocSettings(ShapeId service) {
2121

22+
/**
23+
* Settings for documentation generation. These can be set in the
24+
* {@code smithy-build.json} configuration for this plugin.
25+
*
26+
* @param service The shape id of the service to generate documentation for.
27+
*/
2228
public DocSettings {
2329
Objects.requireNonNull(service);
2430
}

0 commit comments

Comments
 (0)