joerg/gradle-plugins
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update to Java 17, update dependencies

Browse source
This commit is contained in:
Jörg Prante 2023-05-21 13:16:00 +02:00
parent 36a1503875
commit 43f9e94263
6 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gradle-plugin-jflex/src/main/groovy/org/xbib/gradle/plugin/jflex/JFlexTask.groovy
View file

@ -46,7 +46,6 @@ class JFlexTask extends DefaultTask {
Options.encoding = ext.encoding ? Charset.forName(ext.encoding) : Charset.defaultCharset() Options.encoding = ext.encoding ? Charset.forName(ext.encoding) : Charset.defaultCharset()
Options.verbose = ext.verbose Options.verbose = ext.verbose
Options.progress = ext.progress Options.progress = ext.progress
Options.unused_warning = ext.unused_warning
Options.jlex = ext.jlex Options.jlex = ext.jlex
Options.no_minimize = ext.no_minimize Options.no_minimize = ext.no_minimize
Options.no_backup = ext.no_backup Options.no_backup = ext.no_backup

4
gradle-plugin-shadow/src/test/groovy/org/xbib/gradle/plugin/shadow/PublishingSpec.groovy
View file

@ -33,8 +33,8 @@ class PublishingSpec extends PluginSpecification {
} }
shadowJar { shadowJar {
classifier = '' archiveBaseName = 'maven-all'
baseName = 'maven-all' archiveClassifier = ''
} }
publishing { publishing {

16
gradle-plugin-shadow/src/test/groovy/org/xbib/gradle/plugin/shadow/ShadowPluginSpec.groovy
View file

@ -38,11 +38,11 @@ class ShadowPluginSpec extends PluginSpecification {
then: then:
ShadowJar shadow = project.tasks.findByName('shadowJar') as ShadowJar ShadowJar shadow = project.tasks.findByName('shadowJar') as ShadowJar
assert shadow assert shadow
assert shadow.getProperty('baseName') == projectName assert shadow.archiveBaseName.get() == projectName
assert shadow.getProperty('destinationDir') == new File(project.buildDir, 'libs') assert shadow.destinationDirectory.get().asFile == new File(project.buildDir, 'libs')
assert shadow.getProperty('version') == version assert shadow.archiveVersion.get() == version
assert shadow.getProperty('classifier') == 'all' assert shadow.archiveClassifier.get() == 'all'
assert shadow.getProperty('extension') == 'jar' assert shadow.archiveExtension.get() == 'jar'
and: and:
Configuration shadowConfig = project.configurations.findByName('shadow') Configuration shadowConfig = project.configurations.findByName('shadow')
@ -82,9 +82,9 @@ class ShadowPluginSpec extends PluginSpecification {
// tag::rename[] // tag::rename[]
shadowJar { shadowJar {
baseName = 'shadow' archiveBaseName = 'shadow'
classifier = null archiveClassifier = null
version = null version = null
} }
// end::rename[] // end::rename[]
""".stripIndent() """.stripIndent()

8
gradle/compile/groovy.gradle
View file

@ -5,13 +5,13 @@ dependencies {
} }
compileGroovy { compileGroovy {
sourceCompatibility = JavaVersion.VERSION_11 sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_17
} }
compileTestGroovy { compileTestGroovy {
sourceCompatibility = JavaVersion.VERSION_11 sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_17
} }
tasks.withType(GroovyCompile) { tasks.withType(GroovyCompile) {

2
gradle/compile/java.gradle
View file

@ -3,6 +3,8 @@ apply plugin: 'java-library'
java { java {
modularity.inferModulePath.set(true) modularity.inferModulePath.set(true)
withSourcesJar()
withJavaDocJar()
} }
compileJava { compileJava {

14
settings.gradle
View file

@ -5,8 +5,8 @@ dependencyResolutionManagement {
version('gradle', '8.1.1') version('gradle', '8.1.1')
version('groovy', '3.0.17') version('groovy', '3.0.17')
version('spock', '2.0-groovy-3.0') version('spock', '2.0-groovy-3.0')
version('junit', '5.9.2') version('junit', '5.9.3')
version('asm', '9.4') version('asm', '9.5')
library('groovy-core', 'org.codehaus.groovy', 'groovy').versionRef('groovy') library('groovy-core', 'org.codehaus.groovy', 'groovy').versionRef('groovy')
library('spock-core', 'org.spockframework', 'spock-core').versionRef('spock') library('spock-core', 'org.spockframework', 'spock-core').versionRef('spock')
library('spock-junit4', 'org.spockframework', 'spock-junit4').versionRef('spock') library('spock-junit4', 'org.spockframework', 'spock-junit4').versionRef('spock')
@ -18,13 +18,13 @@ dependencyResolutionManagement {
library('asm', 'org.ow2.asm', 'asm').versionRef('asm') library('asm', 'org.ow2.asm', 'asm').versionRef('asm')
library('asm-commons', 'org.ow2.asm', 'asm-commons').versionRef('asm') library('asm-commons', 'org.ow2.asm', 'asm-commons').versionRef('asm')
library('asm-util', 'org.ow2.asm', 'asm-util').versionRef('asm') library('asm-util', 'org.ow2.asm', 'asm-util').versionRef('asm')
library('asciidoctorj', 'org.asciidoctor', 'asciidoctorj').version('2.5.7') library('asciidoctorj', 'org.asciidoctor', 'asciidoctorj').version('2.5.8')
library('jruby', 'org.jruby', 'jruby').version('9.3.9.0') library('jruby', 'org.jruby', 'jruby').version('9.4.2.0')
library('jsoup', 'org.jsoup', 'jsoup').version('1.15.3') library('jsoup', 'org.jsoup', 'jsoup').version('1.16.1')
library('jflex', 'de.jflex', 'jflex').version('1.8.2') library('jflex', 'de.jflex', 'jflex').version('1.9.1')
library('jacc', 'org.xbib', 'jacc').version('2.2.0') library('jacc', 'org.xbib', 'jacc').version('2.2.0')
library('groovy-git', 'org.xbib.groovy', 'groovy-git').version('2.1.0') library('groovy-git', 'org.xbib.groovy', 'groovy-git').version('2.1.0')
library('rpm', 'org.xbib', 'rpm-core').version('2.2.0') library('rpm', 'org.xbib', 'rpm-core').version('3.0.0')
plugin('publish', 'com.gradle.plugin-publish').version('1.0.0') plugin('publish', 'com.gradle.plugin-publish').version('1.0.0')
} }
} }