diff --git a/gradle.properties b/gradle.properties index 02233b7..8bbf08e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ version = 4.2.0 org.gradle.warning.mode = ALL gradle.wrapper.version = 7.3.2 -pdfbox.version = 2.0.25 +pdfbox.version = 2.0.26 jna.version = 5.10.0 zxing.version = 3.4.1 reflections.version = 0.9.11 diff --git a/gradle/compile/groovy.gradle b/gradle/compile/groovy.gradle index c70f6b9..b7a58d4 100644 --- a/gradle/compile/groovy.gradle +++ b/gradle/compile/groovy.gradle @@ -1,17 +1,17 @@ apply plugin: 'groovy' dependencies { - implementation "org.codehaus.groovy:groovy:${project.property('groovy.version')}" + implementation "org.apache.groovy:groovy:${project.property('groovy.version')}" } 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 73c6705..96f6e09 100644 --- a/gradle/compile/java.gradle +++ b/gradle/compile/java.gradle @@ -6,13 +6,13 @@ java { } compileJava { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } compileTestJava { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } jar { diff --git a/graphics-pdfbox-groovy/build.gradle b/graphics-pdfbox-groovy/build.gradle index 5706b4e..ca21782 100644 --- a/graphics-pdfbox-groovy/build.gradle +++ b/graphics-pdfbox-groovy/build.gradle @@ -3,17 +3,17 @@ apply from: rootProject.file('gradle/compile/groovy.gradle') dependencies { api project(':graphics-pdfbox') 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 testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${project.property('junit.version')}" - testImplementation("org.codehaus.groovy:groovy:${project.property('groovy.version')}") - testImplementation("org.codehaus.groovy:groovy-json:${project.property('groovy.version')}") - testImplementation("org.codehaus.groovy:groovy-nio:${project.property('groovy.version')}") - testImplementation("org.codehaus.groovy:groovy-sql:${project.property('groovy.version')}") - testImplementation("org.codehaus.groovy:groovy-xml:${project.property('groovy.version')}") - testImplementation("org.codehaus.groovy:groovy-macro:${project.property('groovy.version')}") - testImplementation("org.codehaus.groovy:groovy-templates:${project.property('groovy.version')}") - testImplementation("org.codehaus.groovy:groovy-test:${project.property('groovy.version')}") + testImplementation("org.apache.groovy:groovy:${project.property('groovy.version')}") + testImplementation("org.apache.groovy:groovy-json:${project.property('groovy.version')}") + testImplementation("org.apache.groovy:groovy-nio:${project.property('groovy.version')}") + testImplementation("org.apache.groovy:groovy-sql:${project.property('groovy.version')}") + testImplementation("org.apache.groovy:groovy-xml:${project.property('groovy.version')}") + testImplementation("org.apache.groovy:groovy-macro:${project.property('groovy.version')}") + testImplementation("org.apache.groovy:groovy-templates:${project.property('groovy.version')}") + testImplementation("org.apache.groovy:groovy-test:${project.property('groovy.version')}") testImplementation("org.spockframework:spock-core:${project.property('spock.version')}") testImplementation "cglib:cglib-nodep:${project.property('cglib.version')}" // for spock mock testImplementation "org.objenesis:objenesis:${project.property('objenesis.version')}" // for spock mock diff --git a/graphics-pdfbox-groovy/gradle.properties b/graphics-pdfbox-groovy/gradle.properties index edaf6f3..7f7b522 100644 --- a/graphics-pdfbox-groovy/gradle.properties +++ b/graphics-pdfbox-groovy/gradle.properties @@ -1,2 +1,2 @@ -groovy.version = 3.0.9 -spock.version = 2.0-groovy-3.0 +groovy.version = 4.0.2 +spock.version = 2.2-M1-groovy-4.0