joerg/graphics
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Groovy 4/JDK17

Browse source
This commit is contained in:
Jörg Prante 2022-04-29 17:14:15 +02:00 committed by Jörg Prante
parent f6c8d37457
commit 78828c472d
4 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gradle/compile/groovy.gradle
View file

@ -1,17 +1,17 @@
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 {
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) {

8
gradle/compile/java.gradle
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 {

18
graphics-pdfbox-groovy/build.gradle
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

4
graphics-pdfbox-groovy/gradle.properties
View file

@ -1,2 +1,2 @@
groovy.version = 3.0.9 groovy.version = 4.0.2
spock.version = 2.0-groovy-3.0 spock.version = 2.2-M1-groovy-4.0