Skip to content

fix: Resolves incompatibility with Gradle 9.x (Resolves #423) #424

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.

Sign up for GitHub

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

Merged
SJrX merged 1 commit into from
Mar 29, 2026
+6 −7
Merged

fix: Resolves incompatibility with Gradle 9.x (Resolves #423) #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ dependencies {
create(type, version)

pluginVerifier()
instrumentationTools()
testFramework(TestFrameworkType.Platform)
}
}
Expand Down
10 changes: 5 additions & 5 deletions buildSrc/src/main/groovy/GenerateDataFromManPages.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ class GenerateDataFromManPages extends DefaultTask {
*
* @param File file
*/
private void generateKeywordAndValueJsonMapForFile(String fileType, File file) {
protected void generateKeywordAndValueJsonMapForFile(String fileType, File file) {

String filename = file.getName()

Expand Down Expand Up @@ -432,7 +432,7 @@ class GenerateDataFromManPages extends DefaultTask {
* @param File sourceFile - the source file to extract
* @return
*/
private generateDocumentationHtmlFromManPages(String fileType, File sourceFile) {
protected generateDocumentationHtmlFromManPages(String fileType, File sourceFile) {


Document document = buildDocumentProcessingIncludes(sourceFile)
Expand All @@ -443,7 +443,7 @@ class GenerateDataFromManPages extends DefaultTask {
segmentParametersIntoFiles(fileType, sourceFile.getName(), xsltOutput)
}

private Document buildDocumentProcessingIncludes(File sourceFile) {
protected Document buildDocumentProcessingIncludes(File sourceFile) {
DocumentBuilder builder = dbf.newDocumentBuilder()
String xmlContent = sourceFile.text

Expand All @@ -467,7 +467,7 @@ class GenerateDataFromManPages extends DefaultTask {
document
}

private String processXIncludesWithRegex(String xmlContent, File baseDir) {
protected String processXIncludesWithRegex(String xmlContent, File baseDir) {
// 🔥 Regex to match <xi:include href="some.xml" xpointer="some-id"/> (xpointer is optional)
def includePattern = /<xi:include\s+href="([^"]+)"(?:\s+xpointer="([^"]+)")?\s*\/>/

Expand Down Expand Up @@ -630,7 +630,7 @@ class GenerateDataFromManPages extends DefaultTask {
* @param sourceFileName - the name of the source file we pulled the data from
* @param parameterInfoXMLAsString - A transformed XML document representing the documentation for systemd
*/
private void segmentParametersIntoFiles(String fileType, String sourceFileName, String parameterInfoXMLAsString) {
protected void segmentParametersIntoFiles(String fileType, String sourceFileName, String parameterInfoXMLAsString) {
def builder = dbf.newDocumentBuilder()

ByteArrayInputStream bis = new ByteArrayInputStream(parameterInfoXMLAsString.getBytes("UTF-8"))
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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-9.3.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading