From 82f81eb94ed3bfa331e9c712e94026200273f36d Mon Sep 17 00:00:00 2001 From: MorellThomas Date: Wed, 22 May 2024 15:53:35 +0200 Subject: [PATCH] revert build.gradle changes --- build.gradle | 149 +++++++++++++++++++++++++--------------------------------- 1 file changed, 65 insertions(+), 84 deletions(-) diff --git a/build.gradle b/build.gradle index f89a53a..6df3ec9 100644 --- a/build.gradle +++ b/build.gradle @@ -51,8 +51,8 @@ plugins { id 'java' id 'application' id 'eclipse' - id "com.diffplug.spotless" version "6.18.0" - id 'com.github.johnrengelman.shadow' version '8.1.1' + id "com.diffplug.gradle.spotless" version "3.28.0" + id 'com.github.johnrengelman.shadow' version '6.0.0' id 'com.install4j.gradle' version '10.0.3' id 'com.dorongold.task-tree' version '2.1.1' // only needed to display task dependency tree with gradle task1 [task2 ...] taskTree id 'com.palantir.git-version' version '0.13.0' apply false @@ -193,7 +193,6 @@ ext { testDir = string("${jalviewDir}/${bareTestSourceDir}") classesDir = string("${jalviewDir}/${classes_dir}") - destinationDirectory = file(classesDir) // clover useClover = clover.equals("true") @@ -591,14 +590,14 @@ sourceSets { main { java { srcDirs sourceDir - destinationDirectory = file(classesDir) + outputDir = file(classesDir) } resources { srcDirs = [ resourcesBuildDir, docBuildDir, helpBuildDir ] } - compileClasspath = files(sourceSets.main.java.destinationDirectory) + compileClasspath = files(sourceSets.main.java.outputDir) compileClasspath += fileTree(dir: "${jalviewDir}/${libDir}", include: ["*.jar"]) runtimeClasspath = compileClasspath @@ -608,14 +607,14 @@ sourceSets { clover { java { srcDirs cloverInstrDir - destinationDirectory = cloverClassesDir + outputDir = cloverClassesDir } resources { srcDirs = sourceSets.main.resources.srcDirs } - compileClasspath = files( sourceSets.clover.java.destinationDirectory ) + compileClasspath = files( sourceSets.clover.java.outputDir ) //compileClasspath += files( testClassesDir ) compileClasspath += fileTree(dir: "${jalviewDir}/${libDir}", include: ["*.jar"]) compileClasspath += fileTree(dir: "${jalviewDir}/${clover_lib_dir}", include: ["*.jar"]) @@ -627,14 +626,14 @@ sourceSets { test { java { srcDirs testSourceDir - destinationDirectory = file(testClassesDir) + outputDir = file(testClassesDir) } resources { srcDirs = useClover ? sourceSets.clover.resources.srcDirs : sourceSets.main.resources.srcDirs } - compileClasspath = files( sourceSets.test.java.destinationDirectory ) + compileClasspath = files( sourceSets.test.java.outputDir ) compileClasspath += useClover ? sourceSets.clover.compileClasspath : sourceSets.main.compileClasspath compileClasspath += fileTree(dir: "${jalviewDir}/${utils_dir}/testnglibs", include: ["**/*.jar"]) @@ -659,7 +658,7 @@ eclipse { } classpath { - //defaultOutputDir = sourceSets.main.java.destinationDirectory + //defaultOutputDir = sourceSets.main.java.outputDir configurations.each{ c-> if (c.isCanBeResolved()) { minusConfigurations += [c] @@ -698,7 +697,7 @@ eclipse { HashMap alreadyAddedLibPath = new HashMap<>(); sourceSets.main.compileClasspath.findAll { it.name.endsWith(".jar") }.any { - //don't want to add destinationDirectory as eclipse is using its own output dir in bin/main + //don't want to add outputDir as eclipse is using its own output dir in bin/main if (it.isDirectory() || ! it.exists()) { // don't add dirs to classpath, especially if they don't exist return false // groovy "continue" in .any closure @@ -718,7 +717,7 @@ eclipse { } sourceSets.test.compileClasspath.findAll { it.name.endsWith(".jar") }.any { - //no longer want to add destinationDirectory as eclipse is using its own output dir in bin/main + //no longer want to add outputDir as eclipse is using its own output dir in bin/main if (it.isDirectory() || ! it.exists()) { // don't add dirs to classpath return false // groovy "continue" in .any closure @@ -1095,7 +1094,7 @@ compileTestJava { clean { doFirst { - delete sourceSets.main.java.destinationDirectory + delete sourceSets.main.java.outputDir } } @@ -1103,7 +1102,7 @@ clean { cleanTest { dependsOn cleanClover doFirst { - delete sourceSets.test.java.destinationDirectory + delete sourceSets.test.java.outputDir } } @@ -1195,7 +1194,7 @@ def convertMdToHtml (FileTree mdFiles, File cssFile) { task copyDocs(type: Copy) { def inputDir = "${jalviewDir}/${doc_dir}" - def destinationDirectory = "${docBuildDir}/${doc_dir}" + def outputDir = "${docBuildDir}/${doc_dir}" from(inputDir) { include('**/*.txt') include('**/*.md') @@ -1216,10 +1215,10 @@ task copyDocs(type: Copy) { exclude('**/*.html') exclude('**/*.xml') } - into destinationDirectory + into outputDir inputs.dir(inputDir) - outputs.dir(destinationDirectory) + outputs.dir(outputDir) } @@ -1284,15 +1283,15 @@ def mdFileComponents(File mdFile, def dateOnly=false) { } if (inFrontMatter) { def m = null - if (m == line =~ /^date:\s*(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/) { + if (m = line =~ /^date:\s*(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/) { map["date"] = new Date().parse("yyyy-MM-dd HH:mm:ss", m[0][1]) - } else if (m == line =~ /^date:\s*(\d{4}-\d{2}-\d{2})/) { + } else if (m = line =~ /^date:\s*(\d{4}-\d{2}-\d{2})/) { map["date"] = new Date().parse("yyyy-MM-dd", m[0][1]) - } else if (m == line =~ /^channel:\s*(\S+)/) { + } else if (m = line =~ /^channel:\s*(\S+)/) { map["channel"] = m[0][1] - } else if (m == line =~ /^version:\s*(\S+)/) { + } else if (m = line =~ /^version:\s*(\S+)/) { map["version"] = m[0][1] - } else if (m == line =~ /^\s*([^:]+)\s*:\s*(\S.*)/) { + } else if (m = line =~ /^\s*([^:]+)\s*:\s*(\S.*)/) { map[ m[0][1] ] = m[0][2] } if (dateOnly && map["date"] != null) { @@ -1351,7 +1350,7 @@ task hugoTemplates { def inSection = false changes.eachLine { line -> def m = null - if (m == line =~ /^##([^#].*)$/) { + if (m = line =~ /^##([^#].*)$/) { if (inSection) { changesHugo += "\n\n" } @@ -1361,7 +1360,7 @@ task hugoTemplates { section = section.replaceAll(/[^a-z0-9_\-]/, "") changesHugo += "
\n\n" inSection = true - } else if (m == line =~ /^(\s*-\s*)(.*?)()?\s*$/) { + } else if (m = line =~ /^(\s*-\s*)(.*?)()?\s*$/) { def comment = m[0][2].trim() if (comment != "") { comment = comment.replaceAll('"', """) @@ -1431,7 +1430,7 @@ def getMdSections(String content) { def sectionName = null content.eachLine { line -> def m = null - if (m == line =~ /^##([^#].*)$/) { + if (m = line =~ /^##([^#].*)$/) { if (sectionName != null) { sections[sectionName] = sectionContent sectionName = null @@ -1454,7 +1453,7 @@ def getMdSections(String content) { task copyHelp(type: Copy) { def inputDir = helpSourceDir - def destinationDirectory = "${helpBuildDir}/${help_dir}" + def outputDir = "${helpBuildDir}/${help_dir}" from(inputDir) { include('**/*.txt') include('**/*.md') @@ -1479,15 +1478,14 @@ task copyHelp(type: Copy) { exclude('**/*.xml') exclude('**/*.jhm') } - into destinationDirectory + into outputDir inputs.dir(inputDir) outputs.files(helpFile) - outputs.dir(destinationDirectory) + outputs.dir(outputDir) } -/* task releasesTemplates { group "help" description "Recreate whatsNew.html and releases.html from markdown files and templates in help" @@ -1564,9 +1562,9 @@ task releasesTemplates { def lm = null def rContentProcessed = "" rContent.eachLine { line -> - if (lm == line =~ /^(\s*-)(\s*)(.*)$/) { + if (lm = line =~ /^(\s*-)(\s*)(.*)$/) { line = "${lm[0][1]}${lm[0][3]}${lm[0][2]}" - } else if (lm == line =~ /^###([^#]+.*)$/) { + } else if (lm = line =~ /^###([^#]+.*)$/) { line = "_${lm[0][1].trim()}_" } rContentProcessed += line + "\n" @@ -1624,14 +1622,13 @@ task releasesTemplates { outputs.file(whatsnewHtmlFile) } -*/ task copyResources(type: Copy) { group = "build" description = "Copy (and make text substitutions in) the resources dir to the build area" def inputDir = resourceDir - def destinationDirectory = resourcesBuildDir + def outputDir = resourcesBuildDir from(inputDir) { include('**/*.txt') include('**/*.md') @@ -1652,10 +1649,10 @@ task copyResources(type: Copy) { exclude('**/*.html') exclude('**/*.xml') } - into destinationDirectory + into outputDir inputs.dir(inputDir) - outputs.dir(destinationDirectory) + outputs.dir(outputDir) } task copyChannelResources(type: Copy) { @@ -1686,7 +1683,6 @@ task copyChannelResources(type: Copy) { task createBuildProperties(type: WriteProperties) { dependsOn copyResources - dependsOn copyChannelResources group = "build" description = "Create the ${buildProperties} file" @@ -1710,7 +1706,6 @@ task createBuildProperties(type: WriteProperties) { task buildIndices(type: JavaExec) { dependsOn copyHelp - //dependsOn releasesTemplates classpath = sourceSets.main.compileClasspath main = "com.sun.java.help.search.Indexer" workingDir = "${helpBuildDir}/${help_dir}" @@ -1738,7 +1733,7 @@ task prepare { dependsOn buildResources dependsOn copyDocs dependsOn copyHelp - //dependsOn releasesTemplates + dependsOn releasesTemplates dependsOn convertMdFiles dependsOn buildIndices } @@ -1747,14 +1742,6 @@ task prepare { compileJava.dependsOn prepare run.dependsOn compileJava compileTestJava.dependsOn compileJava -compileTestJava.dependsOn buildIndices -processResources.dependsOn copyChannelResources -processResources.dependsOn copyResources -processResources.dependsOn createBuildProperties -processResources.dependsOn copyDocs -processResources.dependsOn convertMdFiles -processResources.dependsOn copyHelp -processResources.dependsOn buildIndices @@ -2050,7 +2037,6 @@ private static void printResults(allResults) { /* END of test tasks results summary */ -/* task compileLinkCheck(type: JavaCompile) { options.fork = true classpath = files("${jalviewDir}/${utils_dir}") @@ -2085,7 +2071,6 @@ task linkCheck(type: JavaExec) { inputs.dir(helpBuildDir) outputs.file(helpLinksCheckerOutFile) } -*/ // import the pubhtmlhelp target @@ -2100,14 +2085,10 @@ task cleanPackageDir(type: Delete) { } } -// block of dependencies -//compileTestJava.dependsOn compileLinkCheck // -//copyChannelResources.dependsOn compileLinkCheck // -//convertMdFiles.dependsOn compileLinkCheck // jar { dependsOn prepare - dependsOn //linkCheck + dependsOn linkCheck manifest { attributes "Main-Class": main_class, @@ -2117,8 +2098,8 @@ jar { "Implementation-Version": JALVIEW_VERSION } - def destinationDirectory = "${jalviewDir}/${package_dir}" - destinationDirectory = file(destinationDirectory) + def outputDir = "${jalviewDir}/${package_dir}" + destinationDirectory = file(outputDir) archiveFileName = rootProject.name+".jar" duplicatesStrategy "EXCLUDE" @@ -2129,11 +2110,11 @@ jar { exclude "**/*.jar" exclude "**/*.jar.*" - inputs.dir(sourceSets.main.java.destinationDirectory) + inputs.dir(sourceSets.main.java.outputDir) sourceSets.main.resources.srcDirs.each{ dir -> inputs.dir(dir) } - outputs.file("${destinationDirectory}/${archiveFileName}") + outputs.file("${outputDir}/${archiveFileName}") } @@ -2226,7 +2207,7 @@ shadowJar { // this mainClassName is mandatory but gets ignored due to manifest created in doFirst{}. Set the Main-Class as an attribute in launcherJar instead mainClassName = shadow_jar_main_class mergeServiceFiles() - archiveClassifier = "all-"+JALVIEW_VERSION+"-j"+JAVA_VERSION + classifier = "all-"+JALVIEW_VERSION+"-j"+JAVA_VERSION minimize() } @@ -3407,10 +3388,10 @@ task jalviewjsEclipseCopyDropins(type: Copy) { def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_eclipse_dropins_dir}", include: "*.jar") inputFiles += file("${jalviewDir}/${jalviewjsJ2sPlugin}") - def destinationDirectory = "${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_eclipse_tmp_dropins_dir}" + def outputDir = "${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_eclipse_tmp_dropins_dir}" from inputFiles - into destinationDirectory + into outputDir } @@ -3518,13 +3499,13 @@ task jalviewjsSyncAllLibs (type: Sync) { dependsOn jalviewjsTransferUnzipAllLibs def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteLibDir}") inputFiles += fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteSwingJsDir}") - def destinationDirectory = "${jalviewDir}/${jalviewjsSiteDir}" + def outputDir = "${jalviewDir}/${jalviewjsSiteDir}" from inputFiles - into destinationDirectory + into outputDir def outputFiles = [] rename { filename -> - outputFiles += "${destinationDirectory}/${filename}" + outputFiles += "${outputDir}/${filename}" null } preserve { @@ -3543,13 +3524,13 @@ task jalviewjsSyncResources (type: Sync) { dependsOn buildResources def inputFiles = fileTree(dir: resourcesBuildDir) - def destinationDirectory = "${jalviewDir}/${jalviewjsSiteDir}/${jalviewjs_j2s_subdir}" + def outputDir = "${jalviewDir}/${jalviewjsSiteDir}/${jalviewjs_j2s_subdir}" from inputFiles - into destinationDirectory + into outputDir def outputFiles = [] rename { filename -> - outputFiles += "${destinationDirectory}/${filename}" + outputFiles += "${outputDir}/${filename}" null } preserve { @@ -3562,13 +3543,13 @@ task jalviewjsSyncResources (type: Sync) { task jalviewjsSyncSiteResources (type: Sync) { def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_site_resource_dir}") - def destinationDirectory = "${jalviewDir}/${jalviewjsSiteDir}" + def outputDir = "${jalviewDir}/${jalviewjsSiteDir}" from inputFiles - into destinationDirectory + into outputDir def outputFiles = [] rename { filename -> - outputFiles += "${destinationDirectory}/${filename}" + outputFiles += "${outputDir}/${filename}" null } preserve { @@ -3582,13 +3563,13 @@ task jalviewjsSyncSiteResources (type: Sync) { task jalviewjsSyncBuildProperties (type: Sync) { dependsOn createBuildProperties def inputFiles = [file(buildProperties)] - def destinationDirectory = "${jalviewDir}/${jalviewjsSiteDir}/${jalviewjs_j2s_subdir}" + def outputDir = "${jalviewDir}/${jalviewjsSiteDir}/${jalviewjs_j2s_subdir}" from inputFiles - into destinationDirectory + into outputDir def outputFiles = [] rename { filename -> - outputFiles += "${destinationDirectory}/${filename}" + outputFiles += "${outputDir}/${filename}" null } preserve { @@ -3807,7 +3788,7 @@ task jalviewjsBuildAllCores { def swingJ2sDir = "${jalviewDir}/${jalviewjsTransferSiteSwingJsDir}/${jalviewjs_j2s_subdir}" def libJ2sDir = "${jalviewDir}/${jalviewjsTransferSiteLibDir}/${jalviewjs_j2s_subdir}" def jsDir = "${jalviewDir}/${jalviewjsTransferSiteSwingJsDir}/${jalviewjs_js_subdir}" - def destinationDirectory = "${jalviewDir}/${jalviewjsTransferSiteCoreDir}/${jalviewjs_j2s_subdir}/core" + def outputDir = "${jalviewDir}/${jalviewjsTransferSiteCoreDir}/${jalviewjs_j2s_subdir}/core" def prefixFile = "${jsDir}/core/coretop2.js" def suffixFile = "${jsDir}/core/corebottom2.js" @@ -3851,8 +3832,8 @@ task jalviewjsBuildAllCores { } def list = fileTree(dir: j2sDir, includes: filelist) - def jsfile = "${destinationDirectory}/core${name}.js" - def zjsfile = "${destinationDirectory}/core${name}.z.js" + def jsfile = "${outputDir}/core${name}.js" + def zjsfile = "${outputDir}/core${name}.z.js" jalviewjsCoreClasslists += [ 'jsfile': jsfile, @@ -3870,8 +3851,8 @@ task jalviewjsBuildAllCores { // _stevesoft core. add any cores without a classlist here (and the inputs and outputs) def stevesoftClasslistName = "_stevesoft" def stevesoftClasslist = [ - 'jsfile': "${destinationDirectory}/core${stevesoftClasslistName}.js", - 'zjsfile': "${destinationDirectory}/core${stevesoftClasslistName}.z.js", + 'jsfile': "${outputDir}/core${stevesoftClasslistName}.js", + 'zjsfile': "${outputDir}/core${stevesoftClasslistName}.z.js", 'list': fileTree(dir: j2sDir, include: "com/stevesoft/pat/**/*.js"), 'name': stevesoftClasslistName ] @@ -3904,8 +3885,8 @@ task jalviewjsBuildAllCores { ] ) def allClasslist = [ - 'jsfile': "${destinationDirectory}/core${allClasslistName}.js", - 'zjsfile': "${destinationDirectory}/core${allClasslistName}.z.js", + 'jsfile': "${outputDir}/core${allClasslistName}.js", + 'zjsfile': "${outputDir}/core${allClasslistName}.z.js", 'list': allJsFiles, 'name': allClasslistName ] @@ -3958,11 +3939,11 @@ task jalviewjsPublishCoreTemplates { dependsOn jalviewjsBuildAllCores def inputFileName = "${jalviewDir}/${j2s_coretemplate_html}" def inputFile = file(inputFileName) - def destinationDirectory = "${jalviewDir}/${jalviewjsTransferSiteCoreDir}" + def outputDir = "${jalviewDir}/${jalviewjsTransferSiteCoreDir}" def outputFiles = [] jalviewjsCoreClasslists.each { cl -> - def outputFile = "${destinationDirectory}/${jalviewjsJalviewTemplateName}_${cl.name}.html" + def outputFile = "${outputDir}/${jalviewjsJalviewTemplateName}_${cl.name}.html" cl['outputfile'] = outputFile outputFiles += outputFile } @@ -3981,13 +3962,13 @@ task jalviewjsSyncCore (type: Sync) { dependsOn jalviewjsBuildAllCores dependsOn jalviewjsPublishCoreTemplates def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteCoreDir}") - def destinationDirectory = "${jalviewDir}/${jalviewjsSiteDir}" + def outputDir = "${jalviewDir}/${jalviewjsSiteDir}" from inputFiles - into destinationDirectory + into outputDir def outputFiles = [] rename { filename -> - outputFiles += "${destinationDirectory}/${filename}" + outputFiles += "${outputDir}/${filename}" null } preserve { -- 1.7.10.2