groovy 4 branch

This commit is contained in:
Jörg Prante 2022-01-18 20:00:47 +01:00 committed by Jörg Prante
parent cbbb1b6bfa
commit da64b3634b
4 changed files with 13 additions and 13 deletions

View file

@ -1,6 +1,6 @@
group = org.xbib.graphics group = org.xbib.graphics
name = graphics name = graphics
version = 4.1.0 version = 5.0.0
org.gradle.warning.mode = ALL org.gradle.warning.mode = ALL
gradle.wrapper.version = 7.3.2 gradle.wrapper.version = 7.3.2

View file

@ -1,7 +1,7 @@
apply plugin: 'groovy' apply plugin: 'groovy'
dependencies { dependencies {
implementation "org.codehaus.groovy:groovy:${project.property('groovy.version')}" implementation "org.apache.groovy:groovy:${project.property('groovy.version')}"
} }
compileGroovy { compileGroovy {

View file

@ -3,17 +3,17 @@ apply from: rootProject.file('gradle/compile/groovy.gradle')
dependencies { dependencies {
api project(':graphics-pdfbox') api project(':graphics-pdfbox')
api project(':graphics-barcode') api project(':graphics-barcode')
api("org.codehaus.groovy:groovy-xml:${project.property('groovy.version')}") api("org.apache.groovy:groovy-xml:${project.property('groovy.version')}")
// spock need junit vintage // spock need junit vintage
testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${project.property('junit.version')}" testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${project.property('junit.version')}"
testImplementation("org.codehaus.groovy:groovy:${project.property('groovy.version')}") testImplementation("org.apache.groovy:groovy:${project.property('groovy.version')}")
testImplementation("org.codehaus.groovy:groovy-json:${project.property('groovy.version')}") testImplementation("org.apache.groovy:groovy-json:${project.property('groovy.version')}")
testImplementation("org.codehaus.groovy:groovy-nio:${project.property('groovy.version')}") testImplementation("org.apache.groovy:groovy-nio:${project.property('groovy.version')}")
testImplementation("org.codehaus.groovy:groovy-sql:${project.property('groovy.version')}") testImplementation("org.apache.groovy:groovy-sql:${project.property('groovy.version')}")
testImplementation("org.codehaus.groovy:groovy-xml:${project.property('groovy.version')}") testImplementation("org.apache.groovy:groovy-xml:${project.property('groovy.version')}")
testImplementation("org.codehaus.groovy:groovy-macro:${project.property('groovy.version')}") testImplementation("org.apache.groovy:groovy-macro:${project.property('groovy.version')}")
testImplementation("org.codehaus.groovy:groovy-templates:${project.property('groovy.version')}") testImplementation("org.apache.groovy:groovy-templates:${project.property('groovy.version')}")
testImplementation("org.codehaus.groovy:groovy-test:${project.property('groovy.version')}") testImplementation("org.apache.groovy:groovy-test:${project.property('groovy.version')}")
testImplementation("org.spockframework:spock-core:${project.property('spock.version')}") testImplementation("org.spockframework:spock-core:${project.property('spock.version')}")
testImplementation "cglib:cglib-nodep:${project.property('cglib.version')}" // for spock mock testImplementation "cglib:cglib-nodep:${project.property('cglib.version')}" // for spock mock
testImplementation "org.objenesis:objenesis:${project.property('objenesis.version')}" // for spock mock testImplementation "org.objenesis:objenesis:${project.property('objenesis.version')}" // for spock mock

View file

@ -1,2 +1,2 @@
groovy.version = 2.5.12 groovy.version = 4.0.0-rc-2
spock.version = 2.0-groovy-2.5 spock.version = 2.0-groovy-3.0