update to Gradle 8.1.1, Java 17

This commit is contained in:
Jörg Prante 2023-05-16 14:01:42 +02:00
parent afec34426d
commit 36a1503875
18 changed files with 30 additions and 45 deletions

View file

@ -28,9 +28,9 @@ if (project.hasProperty('gradle.publish.key')) {
} }
} }
} }
pluginBundle { /*pluginBundle {
website = 'https://github.com/jprante/gradle-plugins' website = 'https://github.com/jprante/gradle-plugins'
vcsUrl = 'https://github.com/jprante/gradle-plugins' vcsUrl = 'https://github.com/jprante/gradle-plugins'
tags = ['asciidoctor'] tags = ['asciidoctor']
} }*/
} }

View file

@ -1,2 +1,2 @@
name = gradle-plugin-asciidoctor name = gradle-plugin-asciidoctor
version = 2.5.2.2 version = 3.0.0

View file

@ -25,14 +25,9 @@ if (project.hasProperty('gradle.publish.key')) {
} }
} }
} }
pluginBundle { /*pluginBundle {
/*mavenCoordinates {
groupId = "org.xbib.gradle.plugin"
artifactId = "gradle-plugin-docker"
version = project.version
}*/
website = 'https://github.com/jprante/gradle-plugins' website = 'https://github.com/jprante/gradle-plugins'
vcsUrl = 'https://github.com/jprante/gradle-plugins' vcsUrl = 'https://github.com/jprante/gradle-plugins'
tags = ['docker'] tags = ['docker']
} }*/
} }

View file

@ -1,2 +1,2 @@
name = gradle-plugin-docker name = gradle-plugin-docker
version = 2.4.0 version = 3.0.0

View file

@ -28,14 +28,9 @@ if (project.hasProperty('gradle.publish.key')) {
} }
} }
} }
pluginBundle { /*pluginBundle {
/*mavenCoordinates {
groupId = "org.xbib.gradle.plugin"
artifactId = "gradle-plugin-git"
version = project.version
}*/
website = 'https://github.com/jprante/gradle-plugins' website = 'https://github.com/jprante/gradle-plugins'
vcsUrl = 'https://github.com/jprante/gradle-plugins' vcsUrl = 'https://github.com/jprante/gradle-plugins'
tags = ['git'] tags = ['git']
} }*/
} }

View file

@ -1,2 +1,2 @@
name = gradle-plugin-docker name = gradle-plugin-docker
version = 2.2.0 version = 3.0.0

View file

@ -27,9 +27,9 @@ if (project.hasProperty('gradle.publish.key')) {
} }
} }
} }
pluginBundle { /*pluginBundle {
website = scmUrl website = scmUrl
vcsUrl = scmUrl vcsUrl = scmUrl
tags = ['jacc'] tags = ['jacc']
} }*/
} }

View file

@ -1,2 +1,2 @@
name = gradle-plugin-jacc name = gradle-plugin-jacc
version = 1.4.0 version = 3.0.0

View file

@ -27,9 +27,9 @@ if (project.hasProperty('gradle.publish.key')) {
} }
} }
} }
pluginBundle { /*pluginBundle {
website = scmUrl website = scmUrl
vcsUrl = scmUrl vcsUrl = scmUrl
tags = ['jflex'] tags = ['jflex']
} }*/
} }

View file

@ -1,2 +1,2 @@
name = gradle-plugin-jflex name = gradle-plugin-jflex
version = 1.6.0 version = 3.0.0

View file

@ -36,14 +36,9 @@ if (project.hasProperty('gradle.publish.key')) {
} }
} }
} }
pluginBundle { /*pluginBundle {
/*mavenCoordinates {
groupId = "org.xbib.gradle.plugin"
artifactId = "gradle-plugin-rpm"
version = project.version
}*/
website = 'https://github.com/jprante/gradle-plugins' website = 'https://github.com/jprante/gradle-plugins'
vcsUrl = 'https://github.com/jprante/gradle-plugins' vcsUrl = 'https://github.com/jprante/gradle-plugins'
tags = [ 'rpm' ] tags = [ 'rpm' ]
} }*/
} }

View file

@ -1,2 +1,2 @@
name = gradle-plugin-rpm name = gradle-plugin-rpm
version = 2.4.0 version = 3.0.0

View file

@ -32,9 +32,9 @@ if (project.hasProperty('gradle.publish.key')) {
} }
} }
} }
pluginBundle { /*pluginBundle {
website = scmUrl website = scmUrl
vcsUrl = scmUrl vcsUrl = scmUrl
tags = [ 'shadow' ] tags = [ 'shadow' ]
} }*/
} }

View file

@ -1,2 +1,2 @@
name = gradle-plugin-shadow name = gradle-plugin-shadow
version = 2.0.0 version = 3.0.0

View file

@ -1,5 +1,5 @@
group = org.xbib.gradle.plugin group = org.xbib.gradle.plugin
name = gradle-plugins name = gradle-plugins
version = 0.0.2 version = 0.0.3
org.gradle.warning.mode = ALL org.gradle.warning.mode = ALL

View file

@ -6,13 +6,13 @@ java {
} }
compileJava { compileJava {
sourceCompatibility = JavaVersion.VERSION_11 sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_17
} }
compileTestJava { compileTestJava {
sourceCompatibility = JavaVersion.VERSION_11 sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_17
} }
jar { jar {

View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View file

@ -2,10 +2,10 @@
dependencyResolutionManagement { dependencyResolutionManagement {
versionCatalogs { versionCatalogs {
libs { libs {
version('gradle', '7.5.1') version('gradle', '8.1.1')
version('groovy', '3.0.10') version('groovy', '3.0.17')
version('spock', '2.0-groovy-3.0') version('spock', '2.0-groovy-3.0')
version('junit', '5.9.1') version('junit', '5.9.2')
version('asm', '9.4') version('asm', '9.4')
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')