Skip to content

Commit

Permalink
TAP5-2767: ugprade build from Gradle 7 to 8
Browse files Browse the repository at this point in the history
  • Loading branch information
thiagohp committed Nov 18, 2023
1 parent 2c61207 commit a629dae
Show file tree
Hide file tree
Showing 6 changed files with 182 additions and 139 deletions.
30 changes: 17 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ subprojects {

task sourcesJar(type: Jar) {
dependsOn classes
classifier "sources"
archiveClassifier = "sources"
from sourceSets.main.allSource
from(projectDir) {
include "*.txt"
Expand Down Expand Up @@ -489,14 +489,14 @@ task combinedJacocoReport(type:JacocoReport){
jacocoClasspath = files(subprojectsToConsider.jacocoTestReport.jacocoClasspath)
reports {
html {
enabled = true
required = true
destination = file("$buildDir/reports/jacoco")
}
xml {
enabled = false
required = false
}
csv {
enabled = false
required = false
}
}
onlyIf = {
Expand All @@ -517,11 +517,15 @@ task continuousIntegration {
task zippedSources(type: Zip) {
description "Creates a combined Zip file of all sub-project's sources"
group "Release artifact"

dependsOn("tapestry-beanvalidator:compileCoffeeScript")
dependsOn("tapestry-core:compileCoffeeScript")
dependsOn("tapestry-core:compileProcessedCoffeescript")

destinationDir buildDir
baseName "apache-tapestry"
destinationDirectory = buildDir
archiveBaseName = "apache-tapestry"
version project.version
classifier "sources"
archiveClassifier = "sources"

from project.projectDir
exclude "out/**"
Expand All @@ -540,10 +544,10 @@ task zippedApidoc(type: Zip) {
description "Zip archive of the project's aggregate JavaDoc and CoffeeScript documentation"
group "Release artifact"

destinationDir buildDir
baseName "apache-tapestry"
destinationDirectory = buildDir
archiveBaseName = "apache-tapestry"
version project.version
classifier "apidocs"
archiveClassifier = "apidocs"

from file("src/docroot-template"), {
filter ReplaceTokens, tokens: [version: project.version]
Expand All @@ -569,10 +573,10 @@ task zippedBinaries(type: Zip) {
// seem to ensure that the subprojects are created
inputs.files subprojects*.configurations*.archives.artifacts.files

destinationDir buildDir
baseName "apache-tapestry"
destinationDirectory = buildDir
archiveBaseName = "apache-tapestry"
version project.version
classifier "bin"
archiveClassifier = "bin"

// This is via some experimentation
from subprojects*.configurations*.archives.artifacts*.file*.findAll {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit a629dae

Please sign in to comment.