From 76ab6425f84af478839a0723ca8a5e73ef0cd62c Mon Sep 17 00:00:00 2001 From: Andreas Deininger Date: Thu, 5 Nov 2020 17:56:28 +0100 Subject: [PATCH] Various minor improvements to Gradle + Maven build scripts --- build.gradle | 4 ++++ gradle/wrapper/gradle-wrapper.properties | 3 ++- picocli-codegen/build.gradle | 2 +- .../build.gradle | 14 ++++++------ .../example-gradle-project/build.gradle | 4 ++-- .../example-gradle-project/build.gradle | 18 ++++++++------- .../example-maven-project/pom.xml | 22 ++++++------------- 7 files changed, 33 insertions(+), 34 deletions(-) diff --git a/build.gradle b/build.gradle index ba8c748c..7f593b8c 100644 --- a/build.gradle +++ b/build.gradle @@ -288,6 +288,10 @@ task bumpReadmeVersion { include(name: '**/pom.xml') include(name: '**/build.gradle') } + fileset(dir: './picocli-examples/generate-man-pages/') { + include(name: '**/pom.xml') + include(name: '**/build.gradle') + } //fileset(dir: './picocli-examples/src/main/groovy/', includes: '**/*.groovy') } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7a674db1..1072c9b9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -6,4 +6,5 @@ zipStorePath=wrapper/dists #distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip #distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip #distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip +#distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip diff --git a/picocli-codegen/build.gradle b/picocli-codegen/build.gradle index 384cb514..8c8cafda 100644 --- a/picocli-codegen/build.gradle +++ b/picocli-codegen/build.gradle @@ -110,7 +110,7 @@ task generateManpageAsciiDoc(type: JavaExec) { dependsOn(classes) group = "Documentation" description = "Generate AsciiDoc manpage" - classpath(configurations.compile, configurations.annotationProcessor, sourceSets.main.runtimeClasspath) + classpath(configurations.compileClasspath, configurations.annotationProcessor, sourceSets.main.runtimeClasspath) main 'picocli.codegen.docgen.manpage.ManPageGenerator' args 'picocli.codegen.docgen.manpage.ManPageGenerator$App', 'picocli.codegen.aot.graalvm.DynamicProxyConfigGenerator$App', diff --git a/picocli-examples/annotation-processing/example-gradle-project-kotlin-graal-nativeimage/build.gradle b/picocli-examples/annotation-processing/example-gradle-project-kotlin-graal-nativeimage/build.gradle index c3508093..2fc3bac2 100644 --- a/picocli-examples/annotation-processing/example-gradle-project-kotlin-graal-nativeimage/build.gradle +++ b/picocli-examples/annotation-processing/example-gradle-project-kotlin-graal-nativeimage/build.gradle @@ -1,8 +1,8 @@ plugins { id 'java' - id 'org.jetbrains.kotlin.jvm' version '1.3.72' + id 'org.jetbrains.kotlin.jvm' version '1.4.10' id 'application' - id "com.palantir.graal" version "0.7.1-12-g028cd78" + id "com.palantir.graal" version "0.7.1-20-g113a84d" } def mainCommandClass = "picocli.examples.kotlin.Checksum" @@ -13,7 +13,7 @@ version '1.0-SNAPSHOT' sourceCompatibility = 8 application{ - mainClassName = mainCommandClass + mainClass.set(mainCommandClass) } @@ -49,10 +49,10 @@ task uberJar(type: Jar) { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" - testCompile 'org.jetbrains.kotlin:kotlin-test-junit5:1.3.72' + testImplementation 'org.jetbrains.kotlin:kotlin-test-junit5:1.4.10' - testImplementation "org.junit.jupiter:junit-jupiter:5.4.2" - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.4.2") + testImplementation "org.junit.jupiter:junit-jupiter:5.7.0" + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.0") } @@ -76,7 +76,7 @@ configurations { generateConfig } dependencies { - compile 'info.picocli:picocli:4.5.2' + implementation 'info.picocli:picocli:4.5.2' generateConfig 'info.picocli:picocli-codegen:4.5.2' } diff --git a/picocli-examples/annotation-processing/example-gradle-project/build.gradle b/picocli-examples/annotation-processing/example-gradle-project/build.gradle index 69bae24c..0ef27e76 100644 --- a/picocli-examples/annotation-processing/example-gradle-project/build.gradle +++ b/picocli-examples/annotation-processing/example-gradle-project/build.gradle @@ -14,10 +14,10 @@ repositories { } dependencies { - testCompile group: 'junit', name: 'junit', version: '4.12' + testImplementation group: 'junit', name: 'junit', version: '4.13.1' } dependencies { - compile 'info.picocli:picocli:4.5.2' + implementation 'info.picocli:picocli:4.5.2' annotationProcessor 'info.picocli:picocli-codegen:4.5.2' //compileOnly 'info.picocli:picocli-codegen:4.5.2' // in pre-Gradle 4.6 } diff --git a/picocli-examples/generate-man-pages/example-gradle-project/build.gradle b/picocli-examples/generate-man-pages/example-gradle-project/build.gradle index 93dff826..3cb74e9e 100644 --- a/picocli-examples/generate-man-pages/example-gradle-project/build.gradle +++ b/picocli-examples/generate-man-pages/example-gradle-project/build.gradle @@ -8,14 +8,14 @@ buildscript { } dependencies { - classpath "org.asciidoctor:asciidoctor-gradle-plugin:1.6.1" + classpath "org.asciidoctor:asciidoctor-gradle-jvm:3.2.0" } } plugins { id 'java' } -apply plugin: 'org.asciidoctor.convert' +apply plugin: 'org.asciidoctor.jvm.convert' group 'org.mycompany.myproject' @@ -30,11 +30,11 @@ repositories { } dependencies { - testCompile group: 'junit', name: 'junit', version: '4.12' + testImplementation group: 'junit', name: 'junit', version: '4.13.1' } dependencies { - compile "info.picocli:picocli:4.2.0" - annotationProcessor "info.picocli:picocli-codegen:4.2.0" + implementation "info.picocli:picocli:4.5.2" + annotationProcessor "info.picocli:picocli-codegen:4.5.2" } project.ext { @@ -45,18 +45,20 @@ task generateManpageAsciiDoc(type: JavaExec) { dependsOn(classes) group = "Documentation" description = "Generate AsciiDoc manpage" - classpath(configurations.compile, configurations.annotationProcessor, sourceSets.main.runtimeClasspath) + classpath(configurations.compileClasspath, configurations.annotationProcessor, sourceSets.main.runtimeClasspath) main 'picocli.codegen.docgen.manpage.ManPageGenerator' args project.ext.mainClassName, "--outdir=${project.buildDir}/generated-picocli-docs", "-v", "--template-dir=src/docs/mantemplates" } -apply plugin: 'org.asciidoctor.convert' +apply plugin: 'org.asciidoctor.jvm.convert' asciidoctor { dependsOn(generateManpageAsciiDoc) sourceDir = file("${project.buildDir}/generated-picocli-docs") outputDir = file("${project.buildDir}/docs") logDocuments = true - backends 'manpage', 'html5' + outputOptions { + backends = ['manpage', 'html5'] + } } assemble.dependsOn(asciidoctor) diff --git a/picocli-examples/generate-man-pages/example-maven-project/pom.xml b/picocli-examples/generate-man-pages/example-maven-project/pom.xml index 6759e7c6..d4401234 100644 --- a/picocli-examples/generate-man-pages/example-maven-project/pom.xml +++ b/picocli-examples/generate-man-pages/example-maven-project/pom.xml @@ -14,7 +14,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.7.0 + 3.8.1 1.6 1.6 @@ -27,20 +27,12 @@ org.apache.maven.plugins maven-jar-plugin - 2.2 - - - - jar - - jar - - + 3.2.0 org.codehaus.mojo exec-maven-plugin - 1.6.0 + 3.0.0 generateManPages @@ -67,7 +59,7 @@ info.picocli picocli-codegen - 4.2.0 + 4.5.2 jar @@ -75,7 +67,7 @@ org.asciidoctor asciidoctor-maven-plugin - 1.6.0 + 2.1.0 output-html @@ -125,12 +117,12 @@ info.picocli picocli - 4.2.0 + 4.5.2 info.picocli picocli-codegen - 4.2.0 + 4.5.2 provided