Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/vthreads #5

Merged
merged 5 commits into from
Aug 9, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
build:
strategy:
matrix:
java-version: [ '17', '21' ]
java-version: [ '21' ]
runs-on: ubuntu-latest

steps:
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ task stage {
// Build everything first
dependsOn subprojects.tasks.collect { tc -> tc.findByName("build") }.flatten()

if (!isCiBuild || JavaVersion.current() == JavaVersion.VERSION_17) {
if (!isCiBuild || JavaVersion.current() == JavaVersion.VERSION_21) {
// Publish JavaDoc
dependsOn gitPublishPush
}
Expand Down
3 changes: 0 additions & 3 deletions examples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,6 @@ eclipse {
project {
natures += 'bndtools.core.bndnature'
}
jdt {
javaRuntimeName = "JavaSE-17"
}
}

tasks.eclipse.dependsOn(cleanEclipse)
25 changes: 16 additions & 9 deletions gradle/docgen.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ configurations {
}

dependencies {
markdownDoclet "org.jdrupes.mdoclet:doclet:3.1.0"
javadocTaglets "org.jdrupes.taglets:plantuml-taglet:2.0.1"
markdownDoclet "org.jdrupes.mdoclet:doclet:4.2.0"
javadocTaglets "org.jdrupes.taglets:plantuml-taglet:3.1.0"
}

task javadocResources(type: Copy) {
Expand All @@ -23,7 +23,7 @@ task javadocResources(type: Copy) {

task apidocs(type: JavaExec) {
// Does not work on JitPack, no /usr/bin/dot
enabled = JavaVersion.current() == JavaVersion.VERSION_17 && !isJitPackBuild
enabled = JavaVersion.current() == JavaVersion.VERSION_21 && !isJitPackBuild

dependsOn javadocResources

Expand All @@ -34,7 +34,7 @@ task apidocs(type: JavaExec) {
.each{project -> dependsOn project.tasks.assemble}

inputs.file rootProject.file('overview.md')
inputs.file "${rootProject.rootDir}/misc/stylesheet.css"
inputs.file "${rootProject.rootDir}/misc/javadoc-overwrites.css"

classpath = files(rootProject.subprojects
.findAll({project -> project.name.startsWith("org.jgrapes")})
Expand All @@ -47,9 +47,16 @@ task apidocs(type: JavaExec) {

outputs.dir(docDestinationDir)

jvmArgs = ['--add-exports=jdk.javadoc/jdk.javadoc.internal.tool=ALL-UNNAMED',
'--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED']
main = 'jdk.javadoc.internal.tool.Main'
jvmArgs = ['--add-exports=jdk.compiler/com.sun.tools.doclint=ALL-UNNAMED',
'--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED',
'--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED',
'--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED',
'--add-exports=jdk.javadoc/jdk.javadoc.internal.tool=ALL-UNNAMED',
'--add-exports=jdk.javadoc/jdk.javadoc.internal.doclets.toolkit=ALL-UNNAMED',
'--add-opens=jdk.javadoc/jdk.javadoc.internal.doclets.toolkit.resources.releases=ALL-UNNAMED',
'-Duser.language=en', '-Duser.region=US']
mainClass = 'jdk.javadoc.internal.tool.Main'

args = ['-doctitle', """JGrapes
(core-${-> findProject(':org.jgrapes.core').version},
io-${-> findProject(':org.jgrapes.io').version},
Expand All @@ -59,7 +66,7 @@ task apidocs(type: JavaExec) {
mail-${-> findProject(':org.jgrapes.mail').version})""",
'-use',
'-linksource',
'-link', 'https://docs.oracle.com/en/java/javase/11/docs/api/',
'-link', 'https://docs.oracle.com/en/java/javase/21/docs/api/',
'-link', 'https://mnlipp.github.io/jdrupes-httpcodec/javadoc/',
'-link', 'https://jakarta.ee/specifications/mail/2.1/apidocs/',
'--add-exports', 'jdk.javadoc/jdk.javadoc.internal.tool=ALL-UNNAMED',
Expand All @@ -78,7 +85,7 @@ task apidocs(type: JavaExec) {
'-bottom', rootProject.file("misc/javadoc.bottom.txt").text,
'--allow-script-in-comments',
'-Xdoclint:-html',
'--main-stylesheet', "${rootProject.rootDir}/misc/stylesheet.css",
'--add-stylesheet', "${rootProject.rootDir}/misc/javadoc-overwrites.css",
'--add-exports=jdk.javadoc/jdk.javadoc.internal.doclets.formats.html=ALL-UNNAMED',
'-quiet'
]
Expand Down
1 change: 0 additions & 1 deletion gradle/eclipse.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ eclipse {
}

jdt {
javaRuntimeName = "JavaSE-17"
file {
withProperties { properties ->
def formatterPrefs = new Properties()
Expand Down
4 changes: 2 additions & 2 deletions gradle/subprojects.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ if (project.name.startsWith("org.jgrapes") || project.name == "examples") {
apply from: "${project.rootDir}/gradle/layout.gradle"

java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}

scmVersion {
Expand Down
Binary file removed misc/DejaVuSans-Bold.woff2
Binary file not shown.
Binary file removed misc/DejaVuSans.woff2
Binary file not shown.
Binary file removed misc/DejaVuSansMono-Bold.woff2
Binary file not shown.
Binary file removed misc/DejaVuSansMono.woff2
Binary file not shown.
Binary file removed misc/DejaVuSerif-Bold.woff2
Binary file not shown.
Binary file removed misc/DejaVuSerif.woff2
Binary file not shown.
2 changes: 2 additions & 0 deletions misc/javadoc-overwrites.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
:root { --body-font-size: 16px;}
:root { --code-font-size: 16px;}
Loading
Loading