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
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,13 @@ def groovyCompilerLauncher = javaToolchains.launcherFor {
}
} as Provider<JavaLauncher>

def javadocTool_ = javaToolchains.javadocToolFor {
languageVersion = JavaLanguageVersion.of(compilerVersion)
if (compilerVendor != null) {
vendor = compilerVendor
}
} as Provider<JavadocTool>

tasks.withType(JavaCompile).configureEach {
javaCompiler.set compiler

Expand Down Expand Up @@ -126,6 +133,9 @@ tasks.withType(GroovyCompile).configureEach {
}
}

tasks.withType(Javadoc).configureEach {
javadocTool.set javadocTool_
}

def createCompilerDirectives = tasks.register('createCompilerDirectives') {
def compilerDirectivesFile = project.layout.buildDirectory.file('dh-compiler-directives.txt')
Expand Down
13 changes: 6 additions & 7 deletions buildSrc/src/main/groovy/io.deephaven.javadoc-conventions.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
plugins {
id 'java'
id 'io.deephaven.java-toolchain-conventions'
}

// Neither plain withType(Javadoc) {..} nor withType(Javadoc).all {..} will work here, somehow
// this breaks sourcesets in some projects.
tasks.withType(Javadoc).configureEach {
javadocTool = javaToolchains.javadocToolFor{javadocSpec ->
// Javadoc version >=11 is needed for search
// Javadoc version >12 is needed to avoid javadoc bugs in linking with modules
javadocSpec.languageVersion = JavaLanguageVersion.of(17)
}

options.encoding = 'UTF-8'

doFirst {
Expand All @@ -19,5 +18,5 @@ tasks.withType(Javadoc).configureEach {
}

// Don't fail on warnings, let specific projects enable this if desired
// options.addBooleanOption('Xwerror', true)
//options.addBooleanOption('Werror', true)
}
5 changes: 2 additions & 3 deletions combined-javadoc/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id 'io.deephaven.project.register'
id 'java'
id 'io.deephaven.javadoc-conventions'
}

configurations {
Expand Down Expand Up @@ -30,7 +31,7 @@ def allJavadoc = tasks.register 'allJavadoc', Javadoc, {
jdoc.options.overview = new File(javaDocOverviewLocation)

// Fail on warnings to ensure correctness for our published docs
jdoc.options.addBooleanOption('Xwerror', true)
jdoc.options.addBooleanOption('Werror', true)

def isForJavadocs = { Project p -> return io.deephaven.project.util.CombinedJavadoc.includeProject(p) }

Expand All @@ -53,8 +54,6 @@ def allJavadoc = tasks.register 'allJavadoc', Javadoc, {
jdoc.dependsOn(writeJavadocVersion)
}

apply plugin: 'io.deephaven.javadoc-conventions'

artifacts {
combinedJavadoc allJavadoc
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import org.jetbrains.annotations.NotNull;

/**
* Reinterpret result {@link ColumnSource} implementations that translates {@link byte} to {@code Boolean} values.
* Reinterpret result {@link ColumnSource} implementations that translates {@code byte} to {@code Boolean} values.
*/
public class ByteAsBooleanColumnSource extends AbstractColumnSource<Boolean>
implements MutableColumnSourceGetDefaults.ForBoolean, FillUnordered<Values> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import org.jetbrains.annotations.NotNull;

/**
* Reinterpret result {@link ColumnSource} implementations that translates {@link byte} to {@code Boolean} values.
* Reinterpret result {@link ColumnSource} implementations that translates {@code byte} to {@code Boolean} values.
*/
public class WritableByteAsBooleanColumnSource extends ByteAsBooleanColumnSource
implements MutableColumnSourceGetDefaults.ForBoolean, WritableColumnSource<Boolean> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@
/**
* A {@link Session} implementation that uses {@link io.deephaven.proto.backplane.grpc.BatchTableRequest batch requests}
* and memoizes based on {@link io.deephaven.qst.table.TableSpec} equality.
*
* <p>
* {@inheritDoc}
*/
public final class SessionImpl extends SessionBase {
private static final Logger log = LoggerFactory.getLogger(SessionImpl.class);
Expand Down
2 changes: 1 addition & 1 deletion qst/type/src/main/java/io/deephaven/qst/type/CharType.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import org.immutables.value.Value.Immutable;

/**
* The primitive {@link char} type.
* The primitive {@code char} type.
*/
@Immutable
@SingletonStyle
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import org.immutables.value.Value.Immutable;

/**
* The primitive {@link double} type.
* The primitive {@code double} type.
*/
@Immutable
@SingletonStyle
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import org.immutables.value.Value.Immutable;

/**
* The primitive {@link float} type.
* The primitive {@code float} type.
*/
@Immutable
@SingletonStyle
Expand Down
2 changes: 1 addition & 1 deletion qst/type/src/main/java/io/deephaven/qst/type/IntType.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import org.immutables.value.Value.Immutable;

/**
* The primitive {@link int} type.
* The primitive {@code int} type.
*/
@Immutable
@SingletonStyle
Expand Down
2 changes: 1 addition & 1 deletion qst/type/src/main/java/io/deephaven/qst/type/LongType.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import org.immutables.value.Value.Immutable;

/**
* The primitive {@link long} type.
* The primitive {@code long} type.
*/
@Immutable
@SingletonStyle
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import org.immutables.value.Value.Immutable;

/**
* The primitive {@link short} type.
* The primitive {@code short} type.
*/
@Immutable
@SingletonStyle
Expand Down
Loading