rife2/bld-dokka
rife2/bld-dokka
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: rife2:0703d31e9d36b47a35c479df6b2542f67196253b
Branches Tags
rife2:main
rife2:1.0.3
rife2:1.0.2
rife2:1.0.1
rife2:1.0.0
..
compare: rife2:61d41e2fbe8f9591c23423762d73f6b81b1a9fd0
Branches Tags
rife2:main
rife2:1.0.3
rife2:1.0.2
rife2:1.0.1
rife2:1.0.0

No commits in common. "0703d31e9d36b47a35c479df6b2542f67196253b" and "61d41e2fbe8f9591c23423762d73f6b81b1a9fd0" have entirely different histories.
0703d31e9d ... 61d41e2fbe

20 changed files with 74 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.idea/libraries/bld.xml generated
View file

@ -2,12 +2,12 @@
<library name="bld">
<CLASSES>
<root url="file://$PROJECT_DIR$/lib/bld" />
<root url="jar://$USER_HOME$/.bld/dist/bld-2.1.0.jar!/" />
<root url="jar://$USER_HOME$/.bld/dist/bld-2.0.1.jar!/" />
<root url="file://$PROJECT_DIR$/lib/bld" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.bld/dist/bld-2.1.0-sources.jar!/" />
<root url="jar://$USER_HOME$/.bld/dist/bld-2.0.1-sources.jar!/" />
<root url="file://$PROJECT_DIR$/lib/bld" />
</SOURCES>
<excluded>

4
.idea/libraries/compile.xml generated
View file

@ -7,7 +7,7 @@
<SOURCES>
<root url="file://$PROJECT_DIR$/lib/compile" />
</SOURCES>
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" />
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" type="SOURCES" />
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
</library>
</component>

4
.idea/libraries/runtime.xml generated
View file

@ -8,7 +8,7 @@
<SOURCES>
<root url="file://$PROJECT_DIR$/lib/runtime" />
</SOURCES>
<jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" />
<jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" type="SOURCES" />
<jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" />
<jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" type="SOURCES" />
</library>
</component>

4
.idea/libraries/test.xml generated
View file

@ -8,7 +8,7 @@
<SOURCES>
<root url="file://$PROJECT_DIR$/lib/test" />
</SOURCES>
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" />
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" type="SOURCES" />
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
</library>
</component>

2
.vscode/settings.json vendored
View file

@ -9,7 +9,7 @@
],
"java.configuration.updateBuildConfiguration": "automatic",
"java.project.referencedLibraries": [
"${HOME}/.bld/dist/bld-2.1.0.jar",
"${HOME}/.bld/dist/bld-2.0.1.jar",
"lib/**/*.jar"
]
}

2
README.md
View file

@ -2,7 +2,7 @@
[![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
[![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
[![bld](https://img.shields.io/badge/2.1.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
[![bld](https://img.shields.io/badge/2.0.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
[![Release](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/releases/com/uwyn/rife2/bld-dokka/maven-metadata.xml?color=blue)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-dokka)
[![Snapshot](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/snapshots/com/uwyn/rife2/bld-dokka/maven-metadata.xml?label=snapshot)](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-dokka)
[![GitHub CI](https://github.com/rife2/bld-dokka/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-dokka/actions/workflows/bld.yml)

4
examples/.idea/libraries/bld.xml generated
View file

@ -2,12 +2,12 @@
<library name="bld">
<CLASSES>
<root url="file://$PROJECT_DIR$/lib/bld" />
<root url="jar://$USER_HOME$/.bld/dist/bld-2.1.0.jar!/" />
<root url="jar://$USER_HOME$/.bld/dist/bld-2.0.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://$PROJECT_DIR$/lib/bld" />
<root url="jar://$USER_HOME$/.bld/dist/bld-2.1.0-sources.jar!/" />
<root url="jar://$USER_HOME$/.bld/dist/bld-2.0.1-sources.jar!/" />
</SOURCES>
<excluded>
<root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />

4
examples/.idea/libraries/compile.xml generated
View file

@ -7,7 +7,7 @@
<SOURCES>
<root url="file://$PROJECT_DIR$/lib/compile" />
</SOURCES>
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" />
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" type="SOURCES" />
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
</library>
</component>

4
examples/.idea/libraries/runtime.xml generated
View file

@ -8,7 +8,7 @@
<SOURCES>
<root url="file://$PROJECT_DIR$/lib/runtime" />
</SOURCES>
<jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" />
<jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" type="SOURCES" />
<jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" />
<jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" type="SOURCES" />
</library>
</component>

4
examples/.idea/libraries/test.xml generated
View file

@ -8,7 +8,7 @@
<SOURCES>
<root url="file://$PROJECT_DIR$/lib/test" />
</SOURCES>
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" />
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" type="SOURCES" />
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
</library>
</component>

2
examples/.vscode/settings.json vendored
View file

@ -9,7 +9,7 @@
],
"java.configuration.updateBuildConfiguration": "automatic",
"java.project.referencedLibraries": [
"${HOME}/.bld/dist/bld-2.1.0.jar",
"${HOME}/.bld/dist/bld-2.0.1.jar",
"lib/**/*.jar"
]
}

BIN
examples/lib/bld/bld-wrapper.jar
View file

Binary file not shown.

6
examples/lib/bld/bld-wrapper.properties
View file

@ -1,8 +1,8 @@
bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true
bld.downloadLocation=
bld.extension-dokka=com.uwyn.rife2:bld-dokka:1.0.1
bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.1
bld.extension-dokka=com.uwyn.rife2:bld-dokka:1.0.1-SNAPSHOT
bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.1-SNAPSHOT
bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
bld.sourceDirectories=
bld.version=2.1.0
bld.version=2.0.1

BIN
lib/bld/bld-wrapper.jar
View file

Binary file not shown.

6
lib/bld/bld-wrapper.properties
View file

@ -1,8 +1,8 @@
bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true
bld.downloadLocation=
bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.3
bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.5
bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.2
bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.4
bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
bld.sourceDirectories=
bld.version=2.1.0
bld.version=2.0.1

4
src/bld/java/rife/bld/extension/DokkaOperationBuild.java
View file

@ -33,7 +33,7 @@ public class DokkaOperationBuild extends Project {
public DokkaOperationBuild() {
pkg = "rife.bld.extension";
name = "bld-dokka";
version = version(1, 0, 1);
version = version(1, 0, 1, "SNAPSHOT");
javaRelease = 17;
@ -49,7 +49,7 @@ public class DokkaOperationBuild extends Project {
.include(dependency("org.jetbrains.dokka", "javadoc-plugin", dokka))
.include(dependency("org.jetbrains.dokka", "gfm-plugin", dokka))
.include(dependency("org.jetbrains.dokka", "jekyll-plugin", dokka))
.include(dependency("com.uwyn.rife2", "bld", version(2, 1, 0)));
.include(dependency("com.uwyn.rife2", "bld", version(2, 0, 1)));
scope(test)
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 0)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 0)))

30
src/main/java/rife/bld/extension/DokkaOperation.java
View file

@ -373,7 +373,8 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
* @return this operation instance
*/
public DokkaOperation globalPackageOptions(String... options) {
return globalPackageOptions(List.of(options));
globalPackageOptions_.addAll(List.of(options));
return this;
}
/**
@ -414,7 +415,8 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
* @return this operation instance
*/
public DokkaOperation globalSrcLink(String... links) {
return globalSrcLink(List.of(links));
globalSrcLinks_.addAll(List.of(links));
return this;
}
/**
@ -446,7 +448,6 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
*
* @param files one or more files
* @return this operation instance
* @see #includes(Collection)
*/
public DokkaOperation includes(File... files) {
return includes(List.of(files));
@ -461,7 +462,6 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
*
* @param files one or more files
* @return this operation instance
* @see #includesStrings(Collection)
*/
public DokkaOperation includes(String... files) {
return includesStrings(List.of(files));
@ -476,7 +476,6 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
*
* @param files one or more files
* @return this operation instance
* @see #includesPaths(Collection)
*/
public DokkaOperation includes(Path... files) {
return includesPaths(List.of(files));
@ -501,7 +500,6 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
*
* @param files the markdown files
* @return this operation instance
* @see #includes(File...)
*/
public DokkaOperation includes(Collection<File> files) {
includes_.addAll(files);
@ -517,10 +515,10 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
*
* @param files the markdown files
* @return this operation instance
* @see #includes(Path...)
*/
public DokkaOperation includesPaths(Collection<Path> files) {
return includes(files.stream().map(Path::toFile).toList());
includes_.addAll(files.stream().map(Path::toFile).toList());
return this;
}
/**
@ -532,10 +530,10 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
*
* @param files the markdown files
* @return this operation instance
* @see #includes(String...)
*/
public DokkaOperation includesStrings(Collection<String> files) {
return includes(files.stream().map(File::new).toList());
includes_.addAll(files.stream().map(File::new).toList());
return this;
}
/**
@ -760,7 +758,6 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
*
* @param jars one or more jars
* @return this operation instance
* @see #includes(Collection)
*/
public DokkaOperation pluginsClasspath(File... jars) {
return pluginsClasspath(List.of(jars));
@ -771,7 +768,6 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
*
* @param jars one or more jars
* @return this operation instance
* @see #pluginsClasspathStrings(Collection)
*/
public DokkaOperation pluginsClasspath(String... jars) {
return pluginsClasspathStrings(List.of(jars));
@ -782,7 +778,6 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
*
* @param jars one or more jars
* @return this operation instance
* @see #pluginsClasspathPaths(Collection)
*/
public DokkaOperation pluginsClasspath(Path... jars) {
return pluginsClasspathPaths(List.of(jars));
@ -802,7 +797,6 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
*
* @param jars the jars
* @return this operation instance
* @see #pluginsClasspath(Collection)
*/
public DokkaOperation pluginsClasspath(Collection<File> jars) {
pluginsClasspath_.addAll(jars);
@ -814,10 +808,10 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
*
* @param jars the jars
* @return this operation instance
* @see #pluginsClasspath(Path...)
*/
public DokkaOperation pluginsClasspathPaths(Collection<Path> jars) {
return pluginsClasspath(jars.stream().map(Path::toFile).toList());
pluginsClasspath_.addAll(jars.stream().map(Path::toFile).toList());
return this;
}
/**
@ -825,10 +819,10 @@ public class DokkaOperation extends AbstractProcessOperation<DokkaOperation> {
*
* @param jars the jars
* @return this operation instance
* @see #pluginsClasspath(String...)
*/
public DokkaOperation pluginsClasspathStrings(Collection<String> jars) {
return pluginsClasspath(jars.stream().map(File::new).toList());
pluginsClasspath_.addAll(jars.stream().map(File::new).toList());
return this;
}
/**

90
src/main/java/rife/bld/extension/dokka/SourceSet.java
View file

@ -87,7 +87,8 @@ public class SourceSet {
* @return this operation instance
*/
public SourceSet apiVersion(int apiVersion) {
return apiVersion(String.valueOf(apiVersion));
apiVersion_ = String.valueOf(apiVersion);
return this;
}
/**
@ -239,7 +240,6 @@ public class SourceSet {
*
* @param files one or more file
* @return this operation instance
* @see #classpath(Collection)
*/
public SourceSet classpath(File... files) {
return classpath(List.of(files));
@ -254,7 +254,6 @@ public class SourceSet {
*
* @param files one or more file
* @return this operation instance
* @see #classpathStrings(Collection)
*/
public SourceSet classpath(String... files) {
return classpathStrings(List.of(files));
@ -269,7 +268,6 @@ public class SourceSet {
*
* @param files one or more file
* @return this operation instance
* @see #classpathPaths(Collection)
*/
public SourceSet classpath(Path... files) {
return classpathPaths(List.of(files));
@ -284,7 +282,6 @@ public class SourceSet {
*
* @param files the collection of files
* @return this operation instance
* @see #classpath(File...)
*/
public SourceSet classpath(Collection<File> files) {
classpath_.addAll(files);
@ -309,10 +306,10 @@ public class SourceSet {
*
* @param files the collection of files
* @return this operation instance
* @see #classpath(Path...)
*/
public SourceSet classpathPaths(Collection<Path> files) {
return classpath(files.stream().map(Path::toFile).toList());
classpath_.addAll(files.stream().map(Path::toFile).toList());
return this;
}
/**
@ -324,10 +321,10 @@ public class SourceSet {
*
* @param files the collection of files
* @return this operation instance
* @see #classpath(String...)
*/
public SourceSet classpathStrings(Collection<String> files) {
return classpath(files.stream().map(File::new).toList());
classpath_.addAll(files.stream().map(File::new).toList());
return this;
}
/**
@ -451,10 +448,10 @@ public class SourceSet {
*
* @param files one or more files
* @return this operation instance
* @see #includes(Collection)
*/
public SourceSet includes(File... files) {
return includes(List.of(files));
includes_.addAll(List.of(files));
return this;
}
/**
@ -467,7 +464,6 @@ public class SourceSet {
*
* @param files one or more files
* @return this operation instance
* @see #classpathStrings(Collection)
*/
public SourceSet includes(String... files) {
return includesStrings(List.of(files));
@ -483,7 +479,6 @@ public class SourceSet {
*
* @param files one or more files
* @return this operation instance
* @see #classpathPaths(Collection)
*/
public SourceSet includes(Path... files) {
return includesPaths(List.of(files));
@ -509,7 +504,6 @@ public class SourceSet {
*
* @param files the collection of files
* @return this operation instance
* @see #includes(File...)
*/
public SourceSet includes(Collection<File> files) {
includes_.addAll(files);
@ -526,10 +520,10 @@ public class SourceSet {
*
* @param files the collection of files
* @return this operation instance
* @see #includes(Path...)
*/
public SourceSet includesPaths(Collection<Path> files) {
return includes(files.stream().map(Path::toFile).toList());
includes_.addAll(files.stream().map(Path::toFile).toList());
return this;
}
/**
@ -542,10 +536,10 @@ public class SourceSet {
*
* @param files the collection of files
* @return this operation instance
* @see #classpath(String...)
*/
public SourceSet includesStrings(Collection<String> files) {
return includes(files.stream().map(File::new).toList());
includes_.addAll(files.stream().map(File::new).toList());
return this;
}
/**
@ -585,7 +579,8 @@ public class SourceSet {
* @return this operation instance
*/
public SourceSet jdkVersion(int jdkVersion) {
return jdkVersion(String.valueOf(jdkVersion));
jdkVersion_ = String.valueOf(jdkVersion);
return this;
}
/**
@ -606,7 +601,8 @@ public class SourceSet {
* @return this operation instance
*/
public SourceSet languageVersion(int languageVersion) {
return languageVersion(String.valueOf(languageVersion));
languageVersion_ = String.valueOf(languageVersion);
return this;
}
/**
@ -708,7 +704,8 @@ public class SourceSet {
* @return this operation instance
*/
public SourceSet perPackageOptions(String... perPackageOptions) {
return perPackageOptions(List.of(perPackageOptions));
perPackageOptions_.addAll(List.of(perPackageOptions));
return this;
}
/**
@ -737,7 +734,6 @@ public class SourceSet {
*
* @param samples the samples
* @return this operation instance
* @see #samples(File...)
*/
public SourceSet samples(Collection<File> samples) {
samples_.addAll(samples);
@ -761,7 +757,6 @@ public class SourceSet {
*
* @param samples nne or more samples
* @return this operation instance
* @see #samples(Collection)
*/
public SourceSet samples(File... samples) {
return samples(List.of(samples));
@ -775,7 +770,6 @@ public class SourceSet {
*
* @param samples nne or more samples
* @return this operation instance
* @see #samplesStrings(Collection)
*/
public SourceSet samples(String... samples) {
return samplesStrings(List.of(samples));
@ -789,7 +783,6 @@ public class SourceSet {
*
* @param samples nne or more samples
* @return this operation instance
* @see #samplesPaths(Collection)
*/
public SourceSet samples(Path... samples) {
return samplesPaths(List.of(samples));
@ -803,10 +796,10 @@ public class SourceSet {
*
* @param samples the samples
* @return this operation instance
* @see #samples(Path...)
*/
public SourceSet samplesPaths(Collection<Path> samples) {
return samples(samples.stream().map(Path::toFile).toList());
samples_.addAll(samples.stream().map(Path::toFile).toList());
return this;
}
/**
@ -817,10 +810,10 @@ public class SourceSet {
*
* @param samples the samples
* @return this operation instance
* @see #samples(String...)
*/
public SourceSet samplesStrings(Collection<String> samples) {
return samples(samples.stream().map(File::new).toList());
samples_.addAll(samples.stream().map(File::new).toList());
return this;
}
/**
@ -857,7 +850,6 @@ public class SourceSet {
*
* @param src the source code roots
* @return this operation instance
* @see #src(File...)
*/
public SourceSet src(Collection<File> src) {
src_.addAll(src);
@ -872,7 +864,6 @@ public class SourceSet {
*
* @param src pne ore moe source code roots
* @return this operation instance
* @see #src(Collection)
*/
public SourceSet src(File... src) {
return src(List.of(src));
@ -886,7 +877,6 @@ public class SourceSet {
*
* @param src pne ore moe source code roots
* @return this operation instance
* @see #srcStrings(Collection)
*/
public SourceSet src(String... src) {
return srcStrings(List.of(src));
@ -900,7 +890,6 @@ public class SourceSet {
*
* @param src pne ore moe source code roots
* @return this operation instance
* @see #srcPaths(Collection)
*/
public SourceSet src(Path... src) {
return srcPaths(List.of(src));
@ -937,19 +926,8 @@ public class SourceSet {
* @return this operation instance
*/
public SourceSet srcLink(File srcPath, String remotePath, String lineSuffix) {
return srcLink(srcPath.getAbsolutePath(), remotePath, lineSuffix);
}
/**
* Sets the mapping between a source directory and a Web service for browsing the code.
*
* @param srcPath the source path
* @param remotePath the remote path
* @param lineSuffix the line suffix
* @return this operation instance
*/
public SourceSet srcLink(Path srcPath, String remotePath, String lineSuffix) {
return srcLink(srcPath.toFile().getAbsolutePath(), remotePath, lineSuffix);
srcLinks_.put(srcPath.getAbsolutePath(), remotePath + lineSuffix);
return this;
}
/**
@ -969,10 +947,10 @@ public class SourceSet {
*
* @param src the source code roots
* @return this operation instance
* @see #src(Path...)
*/
public SourceSet srcPaths(Collection<Path> src) {
return src(src.stream().map(Path::toFile).toList());
src_.addAll(src.stream().map(Path::toFile).toList());
return this;
}
/**
@ -983,10 +961,10 @@ public class SourceSet {
*
* @param src the source code roots
* @return this operation instance
* @see #src(String...)
*/
public SourceSet srcStrings(Collection<String> src) {
return src(src.stream().map(File::new).toList());
src_.addAll(src.stream().map(File::new).toList());
return this;
}
/**
@ -996,7 +974,6 @@ public class SourceSet {
*
* @param suppressedFiles the suppressed files
* @return this operation instance
* @see #suppressedFiles(File...)
*/
public SourceSet suppressedFiles(Collection<File> suppressedFiles) {
suppressedFiles_.addAll(suppressedFiles);
@ -1019,7 +996,6 @@ public class SourceSet {
*
* @param suppressedFiles one or moe suppressed files
* @return this operation instance
* @see #suppressedFilesStrings(Collection)
*/
public SourceSet suppressedFiles(String... suppressedFiles) {
return suppressedFilesStrings(List.of(suppressedFiles));
@ -1032,7 +1008,6 @@ public class SourceSet {
*
* @param suppressedFiles one or moe suppressed files
* @return this operation instance
* @see #suppressedFiles(Collection)
*/
public SourceSet suppressedFiles(File... suppressedFiles) {
return suppressedFiles(List.of(suppressedFiles));
@ -1045,7 +1020,6 @@ public class SourceSet {
*
* @param suppressedFiles one or moe suppressed files
* @return this operation instance
* @see #suppressedFilesPaths(Collection)
*/
public SourceSet suppressedFiles(Path... suppressedFiles) {
return suppressedFilesPaths(List.of(suppressedFiles));
@ -1058,10 +1032,10 @@ public class SourceSet {
*
* @param suppressedFiles the suppressed files
* @return this operation instance
* @see #suppressedFiles(Path...)
*/
public SourceSet suppressedFilesPaths(Collection<Path> suppressedFiles) {
return suppressedFiles(suppressedFiles.stream().map(Path::toFile).toList());
suppressedFiles_.addAll(suppressedFiles.stream().map(Path::toFile).toList());
return this;
}
/**
@ -1071,9 +1045,9 @@ public class SourceSet {
*
* @param suppressedFiles the suppressed files
* @return this operation instance
* @see #suppressedFiles(String...)
*/
public SourceSet suppressedFilesStrings(Collection<String> suppressedFiles) {
return suppressedFiles(suppressedFiles.stream().map(File::new).toList());
suppressedFiles_.addAll(suppressedFiles.stream().map(File::new).toList());
return this;
}
}

2
src/test/java/rife/bld/extension/DokkaOperationTest.java
View file

@ -245,7 +245,7 @@ class DokkaOperationTest {
@Test
void pluginClasspathTest() {
var op = new DokkaOperation();
op.pluginsClasspath(List.of(new File(FILE_1), new File(FILE_2)));
assertThat(op.pluginsClasspath()).as("List(File...)").containsExactly(new File(FILE_1), new File(FILE_2));
op.pluginsClasspath().clear();

7
src/test/java/rife/bld/extension/dokka/SourceSetTest.java
View file

@ -42,7 +42,6 @@ class SourceSetTest {
private static final String OPTION_2 = "option2";
private static final String PATH_1 = "path1";
private static final String PATH_2 = "path2";
private static final String PATH_3 = "path3";
private static final String SAMPLES_1 = "samples1";
private static final String SAMPLES_2 = "samples2";
private static final String SAMPLES_3 = "samples3";
@ -222,7 +221,6 @@ class SourceSetTest {
.src(List.of(new File(SRC_4)))
.srcLink(PATH_1, "remote1", "#suffix1")
.srcLink(new File(PATH_2), "remote2", "#suffix2")
.srcLink(Path.of(PATH_3), "remote3", "#suffix3")
.suppressedFiles(SUP_1, SUP_2);
assertThat(sourceSet.classpath()).as("classpath").hasSize(2);
@ -233,7 +231,7 @@ class SourceSetTest {
assertThat(sourceSet.perPackageOptions()).as("perPackageOptions").hasSize(2);
assertThat(sourceSet.samples()).as("samples").hasSize(2);
assertThat(sourceSet.src()).as("src").hasSize(4);
assertThat(sourceSet.srcLinks()).as("srcLinks").hasSize(3);
assertThat(sourceSet.srcLinks()).as("srcLinks").hasSize(2);
assertThat(sourceSet.suppressedFiles()).as("suppressedFiles").hasSize(2);
var params = sourceSet.args();
@ -268,8 +266,7 @@ class SourceSetTest {
"-samples", localPath(SAMPLES_1, SAMPLES_2),
"-skipDeprecated",
"-src", localPath(SRC_1, SRC_2, SRC_3, SRC_4),
"-srcLink", localPath(PATH_2) + "=remote2#suffix2;" + localPath(PATH_3) + "=remote3#suffix3;" +
"path1=remote1#suffix1",
"-srcLink", localPath(PATH_2) + "=remote2#suffix2;path1=remote1#suffix1",
"-sourceSetName", "setName",
"-suppressedFiles", localPath(SUP_1, SUP_2));