Skip to content
This repository was archived by the owner on Jan 14, 2023. It is now read-only.

Gradle update: 3.5.1 #15

Merged
merged 2 commits into from
Apr 25, 2018
Merged
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
Binary file modified src/genjava/gradle/gradle.tar.gz
Binary file not shown.
46 changes: 25 additions & 21 deletions src/genjava/templates/genjava_project/build.gradle.in
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

task wrapper(type: Wrapper) {
gradleVersion = '2.14.1'
gradleVersion = '3.5.1'
}

buildscript {
Expand Down Expand Up @@ -67,26 +67,28 @@ jar {
}
}

task info << {
println "\nProject Info"
println "============\n"
println "Name : ${rootProject}"
println "Dir : ${projectDir}"
println "Group : ${group}"
println "Version : ${version}"
println "Configurations: " + configurations
task info {
doLast {
println "\nProject Info"
println "============\n"
println "Name : ${rootProject}"
println "Dir : ${projectDir}"
println "Group : ${group}"
println "Version : ${version}"
println "Configurations: " + configurations

println "\nPackage Info"
println "============\n"
println "Name : %(project_name)s"
println "Dir : %(pkg_directory)s"
println "\nPackage Info"
println "============\n"
println "Name : %(project_name)s"
println "Dir : %(pkg_directory)s"

println "\nGenerate Info"
println "============\n"
println "Output Dir : ${generated_sources_directory}"
println "Task Args : " + tasks["generateSources"].args
tasks["generateSources"].outputs.getFiles().getAsFileTree().each {
println "Files : ${it}"
println "\nGenerate Info"
println "============\n"
println "Output Dir : ${generated_sources_directory}"
println "Task Args : " + tasks["generateSources"].args
tasks["generateSources"].outputs.getFiles().getAsFileTree().each {
println "Files : ${it}"
}
}
}

Expand All @@ -98,8 +100,10 @@ task info << {
* Until we get this properly fixed (it fails in genjava), then we use the following bugfix to deal with the
* 'Could not copy MANIFEST.MF...' error that occurs when no sources are to be made for an artifact.
*/
task bugfixtask << {
mkdir sourceSets.main.output.classesDir
task bugfixtask {
doLast {
mkdir sourceSets.main.output.classesDir
}
}

jar.dependsOn(bugfixtask)
Expand Down