diff --git a/gradle-plugin-jflex/src/main/groovy/org/xbib/gradle/plugin/jflex/JFlexTask.groovy b/gradle-plugin-jflex/src/main/groovy/org/xbib/gradle/plugin/jflex/JFlexTask.groovy index 3a8148f..45f9b59 100755 --- a/gradle-plugin-jflex/src/main/groovy/org/xbib/gradle/plugin/jflex/JFlexTask.groovy +++ b/gradle-plugin-jflex/src/main/groovy/org/xbib/gradle/plugin/jflex/JFlexTask.groovy @@ -46,7 +46,6 @@ class JFlexTask extends DefaultTask { Options.encoding = ext.encoding ? Charset.forName(ext.encoding) : Charset.defaultCharset() Options.verbose = ext.verbose Options.progress = ext.progress - Options.unused_warning = ext.unused_warning Options.jlex = ext.jlex Options.no_minimize = ext.no_minimize Options.no_backup = ext.no_backup diff --git a/gradle-plugin-shadow/src/test/groovy/org/xbib/gradle/plugin/shadow/PublishingSpec.groovy b/gradle-plugin-shadow/src/test/groovy/org/xbib/gradle/plugin/shadow/PublishingSpec.groovy index 89ef9d1..dd90f6b 100644 --- a/gradle-plugin-shadow/src/test/groovy/org/xbib/gradle/plugin/shadow/PublishingSpec.groovy +++ b/gradle-plugin-shadow/src/test/groovy/org/xbib/gradle/plugin/shadow/PublishingSpec.groovy @@ -33,8 +33,8 @@ class PublishingSpec extends PluginSpecification { } shadowJar { - classifier = '' - baseName = 'maven-all' + archiveBaseName = 'maven-all' + archiveClassifier = '' } publishing { diff --git a/gradle-plugin-shadow/src/test/groovy/org/xbib/gradle/plugin/shadow/ShadowPluginSpec.groovy b/gradle-plugin-shadow/src/test/groovy/org/xbib/gradle/plugin/shadow/ShadowPluginSpec.groovy index b1236b5..52b114a 100644 --- a/gradle-plugin-shadow/src/test/groovy/org/xbib/gradle/plugin/shadow/ShadowPluginSpec.groovy +++ b/gradle-plugin-shadow/src/test/groovy/org/xbib/gradle/plugin/shadow/ShadowPluginSpec.groovy @@ -38,11 +38,11 @@ class ShadowPluginSpec extends PluginSpecification { then: ShadowJar shadow = project.tasks.findByName('shadowJar') as ShadowJar assert shadow - assert shadow.getProperty('baseName') == projectName - assert shadow.getProperty('destinationDir') == new File(project.buildDir, 'libs') - assert shadow.getProperty('version') == version - assert shadow.getProperty('classifier') == 'all' - assert shadow.getProperty('extension') == 'jar' + assert shadow.archiveBaseName.get() == projectName + assert shadow.destinationDirectory.get().asFile == new File(project.buildDir, 'libs') + assert shadow.archiveVersion.get() == version + assert shadow.archiveClassifier.get() == 'all' + assert shadow.archiveExtension.get() == 'jar' and: Configuration shadowConfig = project.configurations.findByName('shadow') @@ -82,9 +82,9 @@ class ShadowPluginSpec extends PluginSpecification { // tag::rename[] shadowJar { - baseName = 'shadow' - classifier = null - version = null + archiveBaseName = 'shadow' + archiveClassifier = null + version = null } // end::rename[] """.stripIndent() diff --git a/gradle/compile/groovy.gradle b/gradle/compile/groovy.gradle index 7e52480..00a1b9c 100644 --- a/gradle/compile/groovy.gradle +++ b/gradle/compile/groovy.gradle @@ -5,13 +5,13 @@ dependencies { } compileGroovy { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } compileTestGroovy { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } tasks.withType(GroovyCompile) { diff --git a/gradle/compile/java.gradle b/gradle/compile/java.gradle index 24c6303..dec49b1 100644 --- a/gradle/compile/java.gradle +++ b/gradle/compile/java.gradle @@ -3,6 +3,8 @@ apply plugin: 'java-library' java { modularity.inferModulePath.set(true) + withSourcesJar() + withJavaDocJar() } compileJava { diff --git a/settings.gradle b/settings.gradle index 7ac9789..25800c4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,8 +5,8 @@ dependencyResolutionManagement { version('gradle', '8.1.1') version('groovy', '3.0.17') version('spock', '2.0-groovy-3.0') - version('junit', '5.9.2') - version('asm', '9.4') + version('junit', '5.9.3') + version('asm', '9.5') library('groovy-core', 'org.codehaus.groovy', 'groovy').versionRef('groovy') library('spock-core', 'org.spockframework', 'spock-core').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-commons', 'org.ow2.asm', 'asm-commons').versionRef('asm') library('asm-util', 'org.ow2.asm', 'asm-util').versionRef('asm') - library('asciidoctorj', 'org.asciidoctor', 'asciidoctorj').version('2.5.7') - library('jruby', 'org.jruby', 'jruby').version('9.3.9.0') - library('jsoup', 'org.jsoup', 'jsoup').version('1.15.3') - library('jflex', 'de.jflex', 'jflex').version('1.8.2') + library('asciidoctorj', 'org.asciidoctor', 'asciidoctorj').version('2.5.8') + library('jruby', 'org.jruby', 'jruby').version('9.4.2.0') + library('jsoup', 'org.jsoup', 'jsoup').version('1.16.1') + library('jflex', 'de.jflex', 'jflex').version('1.9.1') library('jacc', 'org.xbib', 'jacc').version('2.2.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') } }