Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,18 @@ afterEvaluate {
javadoc {
title = "Smithy API ${version}"
setDestinationDir(layout.buildDirectory.dir("docs/javadoc/latest").get().asFile)
source(subprojects.map { project(it.path).sourceSets.main.get().allJava })
classpath = files(subprojects.map { project(it.path).sourceSets.main.get().compileClasspath })

// Add an explicit dependencies on the compilation of each subproject because we need
// the compile classpath, which we can only get after the compile task has completed.
dependsOn(subprojects.map { it.tasks.named("compileJava") })
classpath = files(provider {
subprojects.flatMap { subproject ->
subproject.configurations.getByName("compileClasspath").resolve()
}
})

source(provider { subprojects.map { project -> project.sourceSets.main.get().allJava } })

(options as StandardJavadocDocletOptions).apply {
addStringOption("Xdoclint:-html", "-quiet")
}
Expand Down
9 changes: 9 additions & 0 deletions config/spotbugs/filter.xml
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,15 @@
<Bug pattern="DE_MIGHT_IGNORE"/>
</Match>

<!-- We could mark these as volatile, but in practice we don't share instances across
threads, so there isn't a need to. This class is private, so we don't have to worry
about outside
usage. -->
<Match>
<Class name="software.amazon.smithy.cli.commands.ModelBuilder"/>
<Bug pattern="AT_STALE_THREAD_WRITE_OF_PRIMITIVE"/>
</Match>

<!-- This checks for mutability, but it's full of false positives. Among other things, it doesn't
recognize SetUtils.copyOf and similar as providing immutable collections. -->
<Match>
Expand Down
5 changes: 3 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
[versions]
junit5 = "5.13.4"
hamcrest = "3.0"
jmh = "0.6.6"
spotbugs = "6.0.22"
jmh = "0.7.2"
spotbugs = "6.2.4"
spotless = "7.2.1"
smithy-gradle = "1.3.0"
assertj = "3.27.4"
prettier4j = "0.3.0"
maven-resolver-provider = "3.9.11"
# TODO: upgrade major version
maven-resolver = "1.9.24"
slf4j = "1.7.36"
mockserver = "5.15.0"
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 2 additions & 2 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading