This is an automated email from the ASF dual-hosted git repository. benw pushed a commit to branch gradle-improvements in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
commit d114fb505c893cca9cd0c47cfcdeeaaec9dff2d9 Author: Ben Weidig <[email protected]> AuthorDate: Sun Aug 3 11:56:32 2025 +0200 TAP5-2809: build.gradle/settings.gradle cleanup/formatting --- build.gradle | 8 ++---- settings.gradle | 78 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 40 insertions(+), 46 deletions(-) diff --git a/build.gradle b/build.gradle index 5c652dcab..213809578 100755 --- a/build.gradle +++ b/build.gradle @@ -7,10 +7,8 @@ plugins { id 'maven-publish' } - description = 'Apache Tapestry 5 Project' - ext { tapestryMajorVersion = '5.10.0' tapestryMinorVersion = '' // Use for release suffixes like '-alpha-1' @@ -68,7 +66,6 @@ ext { // Provided so that the CI server can override the normal version number for nightly builds. version = TapestryBuildLogic.tapestryVersion(project) - // Specific to top-level build, not set for subprojects: configurations { javadoc @@ -81,7 +78,6 @@ configurations { binaries // additional dependencies included in the binary archive } - dependencies { if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) { javadoc project(':tapestry-javadoc') @@ -357,7 +353,7 @@ tasks.register('combinedJacocoReport', JacocoReport) { ] def subprojectsToConsider = subprojects.findAll { - it.name !in excludedProjects + !excludedProjects.contains(it.name) } dependsOn = subprojectsToConsider.test @@ -521,7 +517,7 @@ if (canDeploy) { group 'Release artifact' description 'Copies build archives (source, bin, docs) to a configured deployment folder, along with MD5 and SHA-256 checksums and PGP signatures (if signing is enabled)' - destinationDir file(archiveDeployFolder.get()) + destinationDirectory = file(archiveDeployFolder.get()) from tasks.generateChecksums from configurations.uploads.allArtifacts.files diff --git a/settings.gradle b/settings.gradle index 23d4b3f41..5f4f20356 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,7 +3,7 @@ plugins { id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.2' } -rootProject.name = "tapestry-5" +rootProject.name = 'tapestry-5' dependencyResolutionManagement { repositories { @@ -21,55 +21,54 @@ dependencyResolutionManagement { } } -include("plastic", - "tapestry5-annotations", - "tapestry-test", - "tapestry-func", - "tapestry-ioc", - "tapestry-json", - "tapestry-http", - "tapestry-core", - "tapestry-hibernate-core", - "tapestry-hibernate", - "tapestry-jmx", - "tapestry-upload", - "tapestry-beanvalidator", - "tapestry-jpa", - "tapestry-kaptcha", - "quickstart", - "tapestry-clojure", - "tapestry-mongodb", - "tapestry-test-data", - "tapestry-internal-test", - "tapestry-ioc-junit", - "tapestry-webresources", - "tapestry-runner", - "tapestry-test-constants", - "tapestry-ioc-jcache", - "beanmodel", - "commons", - "genericsresolver-guava", - "tapestry-version-migrator", - "tapestry-spock", - "tapestry-openapi-viewer", - "tapestry-rest-jackson") +include('plastic', + 'tapestry5-annotations', + 'tapestry-test', + 'tapestry-func', + 'tapestry-ioc', + 'tapestry-json', + 'tapestry-http', + 'tapestry-core', + 'tapestry-hibernate-core', + 'tapestry-hibernate', + 'tapestry-jmx', + 'tapestry-upload', + 'tapestry-beanvalidator', + 'tapestry-jpa', + 'tapestry-kaptcha', + 'quickstart', + 'tapestry-clojure', + 'tapestry-mongodb', + 'tapestry-test-data', + 'tapestry-internal-test', + 'tapestry-ioc-junit', + 'tapestry-webresources', + 'tapestry-runner', + 'tapestry-test-constants', + 'tapestry-ioc-jcache', + 'beanmodel', + 'commons', + 'genericsresolver-guava', + 'tapestry-version-migrator', + 'tapestry-spock', + 'tapestry-openapi-viewer', + 'tapestry-rest-jackson') if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) { - include "tapestry-javadoc" + include('tapestry-javadoc') } if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) { - include "tapestry-latest-java-tests", "tapestry-spring" + include('tapestry-latest-java-tests', 'tapestry-spring') } - def isTravisCI = System.getenv('TRAVIS_JOB_ID') != null def isJenkins = System.getenv('JENKINS_URL') != null def isCI = isTravisCI || isJenkins develocity { - server = "https://develocity.apache.org"; - projectId = "tapestry" + server = 'https://develocity.apache.org' + projectId = 'tapestry' buildScan { uploadInBackground = !isCI publishing.onlyIf { it.authenticated } @@ -78,14 +77,13 @@ develocity { // Alternatively, the build scan will provide the hostname for troubleshooting host-specific issues. ipAddresses { addresses -> addresses.collect { address -> - "0.0.0.0" + '0.0.0.0' } } } } } - buildCache { local { enabled = !isCI
