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

v4.0.0 #175

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open
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/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest, macos-latest ]
java-version: [ 17, 21, 23 ]
java-version: [ 21, 23 ]
steps:
- uses: actions/checkout@v2

Expand Down
47 changes: 9 additions & 38 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import io.jenetics.gradle.dsl.moduleName
*/
plugins {
base
id("me.champeau.jmh") version "0.7.2" apply false
}

rootProject.version = JPX.VERSION
Expand Down Expand Up @@ -71,8 +70,8 @@ gradle.projectsEvaluated {

plugins.withType<JavaPlugin> {
configure<JavaPluginExtension> {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}

configure<JavaPluginExtension> {
Expand Down Expand Up @@ -169,13 +168,12 @@ fun setupJavadoc(project: Project) {
doclet.charSet = "UTF-8"
doclet.linkSource(true)
doclet.linksOffline(
"https://docs.oracle.com/en/java/javase/17/docs/api/",
"https://docs.oracle.com/en/java/javase/21/docs/api/",
"${project.rootDir}/buildSrc/resources/javadoc/java.se"
)
doclet.windowTitle = "JPX ${project.version}"
doclet.docTitle = "<h1>JPX ${project.version}</h1>"
doclet.bottom = "&copy; ${Env.COPYRIGHT_YEAR} Franz Wilhelmst&ouml;tter &nbsp;<i>(${Env.BUILD_DATE})</i>"
doclet.stylesheetFile = project.file("${project.rootDir}/buildSrc/resources/javadoc/stylesheet.css")

doclet.tags = listOf(
"apiNote:a:API Note:",
Expand All @@ -193,38 +191,6 @@ fun setupJavadoc(project: Project) {
}
}
}

val javadoc = project.tasks.findByName("javadoc") as Javadoc?
if (javadoc != null) {
project.tasks.register<io.jenetics.gradle.ColorizerTask>("colorizer") {
directory = javadoc.destinationDir!!
}

project.tasks.register("java2html") {
doLast {
providers.javaexec {
mainClass.set("de.java2html.Java2Html")
args = listOf(
"-srcdir", "src/main/java",
"-targetdir", "${javadoc.destinationDir}/src-html/${project.extra["moduleName"]}"
)
classpath = files("${project.rootDir}/buildSrc/lib/java2html.jar")
}
}
}

javadoc.doLast {
val colorizer = project.tasks.findByName("colorizer")
colorizer?.actions?.forEach {
it.execute(colorizer)
}

val java2html = project.tasks.findByName("java2html")
java2html?.actions?.forEach {
it.execute(java2html)
}
}
}
}

/**
Expand All @@ -242,13 +208,18 @@ fun xlint(): String {
"empty",
"exports",
"finally",
"lossy-conversions",
"module",
"opens",
"overrides",
"rawtypes",
"removal",
"serial",
// "serial",
"static",
"strictfp",
"synchronization",
"text-blocks",
"this-escape",
"try",
"unchecked",
"varargs"
Expand Down
Loading
Loading