diff --git a/gradle/test/junit5.gradle b/gradle/test/junit5.gradle index 9abeea9..f7af95c 100644 --- a/gradle/test/junit5.gradle +++ b/gradle/test/junit5.gradle @@ -1,9 +1,9 @@ dependencies { - testImplementation libs.junit.jupiter.api - testImplementation libs.junit.jupiter.params - testImplementation libs.hamcrest - testRuntimeOnly libs.junit.jupiter.engine - testRuntimeOnly libs.junit.jupiter.platform.launcher + testImplementation testLibs.junit.jupiter.api + testImplementation testLibs.junit.jupiter.params + testImplementation testLibs.hamcrest + testRuntimeOnly testLibs.junit.jupiter.engine + testRuntimeOnly testLibs.junit.jupiter.platform.launcher } test { diff --git a/graphics-barcode/build.gradle b/graphics-barcode/build.gradle index 943cdb6..5d36677 100644 --- a/graphics-barcode/build.gradle +++ b/graphics-barcode/build.gradle @@ -3,8 +3,8 @@ dependencies { testImplementation project(':graphics-vector-eps') testImplementation project(':graphics-vector-pdf') testImplementation project(':graphics-vector-svg') - testImplementation libs.junit.jupiter.params - testImplementation libs.junit4 - testImplementation libs.zxing - testImplementation libs.reflections + testImplementation testLibs.junit.jupiter.params + testImplementation testLibs.junit4 + testImplementation testLibs.zxing + testImplementation testLibs.reflections } diff --git a/graphics-graph-gral/build.gradle b/graphics-graph-gral/build.gradle index 69af333..71ade4b 100644 --- a/graphics-graph-gral/build.gradle +++ b/graphics-graph-gral/build.gradle @@ -1,3 +1,3 @@ dependencies { - testImplementation libs.junit.jupiter.vintage + testImplementation testLibs.junit.jupiter.vintage } diff --git a/graphics-pdfbox-groovy/build.gradle b/graphics-pdfbox-groovy/build.gradle index 008f06b..fdc5952 100644 --- a/graphics-pdfbox-groovy/build.gradle +++ b/graphics-pdfbox-groovy/build.gradle @@ -4,16 +4,15 @@ dependencies { api project(':graphics-pdfbox') api project(':graphics-barcode') api libs.groovy.xml - testRuntimeOnly libs.junit.jupiter.vintage - testImplementation libs.groovy - testImplementation libs.groovy.json - testImplementation libs.groovy.nio - testImplementation libs.groovy.sql - testImplementation libs.groovy.xml - testImplementation libs.groovy.macro - testImplementation libs.groovy.templates - testImplementation libs.groovy.test - testImplementation libs.spock - testImplementation libs.bytebuddy - testImplementation libs.objenesis + testRuntimeOnly testLibs.junit.jupiter.vintage + testImplementation testLibs.groovy + testImplementation testLibs.groovy.json + testImplementation testLibs.groovy.nio + testImplementation testLibs.groovy.sql + testImplementation testLibs.groovy.macro + testImplementation testLibs.groovy.templates + testImplementation testLibs.groovy.test + testImplementation testLibs.spock + testImplementation testLibs.bytebuddy + testImplementation testLibs.objenesis } diff --git a/graphics-pdfbox/build.gradle b/graphics-pdfbox/build.gradle index 6926fd7..a702b69 100644 --- a/graphics-pdfbox/build.gradle +++ b/graphics-pdfbox/build.gradle @@ -1,5 +1,5 @@ dependencies { api libs.pdfbox - testImplementation libs.jfreechart + testImplementation testLibs.jfreechart testImplementation project(':graphics-svg') } diff --git a/graphics-png/build.gradle b/graphics-png/build.gradle index df37c09..f15c854 100644 --- a/graphics-png/build.gradle +++ b/graphics-png/build.gradle @@ -1,4 +1,4 @@ dependencies { - testImplementation libs.junit.jupiter.params - testImplementation libs.junit4 + testImplementation testLibs.junit.jupiter.params + testImplementation testLibs.junit4 } diff --git a/settings.gradle b/settings.gradle index e027bdc..78d1873 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,11 +16,21 @@ dependencyResolutionManagement { versionCatalogs { libs { version('gradle', '8.4') + version('groovy', '4.0.15') + version('datastructures', '5.0.5') + library('groovy', 'org.apache.groovy', 'groovy').versionRef('groovy') + library('groovy-xml', 'org.apache.groovy', 'groovy-xml').versionRef('groovy') + library('jna', 'net.java.dev.jna', 'jna').version('5.13.0') + library('pdfbox', 'org.apache.pdfbox', 'pdfbox').version('4.0.0-SNAPSHOT') + library('datastructures-settings', 'org.xbib', 'settings-datastructures').versionRef('datastructures') + library('datastructures-settings-json', 'org.xbib', 'settings-datastructures-json').versionRef('datastructures') + library('datastructures-settings-yaml', 'org.xbib', 'settings-datastructures-yaml').versionRef('datastructures') + } + testLibs { + version('groovy', '4.0.15') version('junit', '5.10.0') version('junit4', '4.13.2') - version('groovy', '4.0.15') version('spock', '2.4-M1-groovy-4.0') - version('datastructures', '5.0.5') library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit') library('junit-jupiter-params', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junit') library('junit-jupiter-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit') @@ -29,24 +39,18 @@ dependencyResolutionManagement { library('junit4', 'junit', 'junit').versionRef('junit4') library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2') library('groovy', 'org.apache.groovy', 'groovy').versionRef('groovy') - library('groovy-xml', 'org.apache.groovy', 'groovy-xml').versionRef('groovy') library('groovy-json', 'org.apache.groovy', 'groovy-json').versionRef('groovy') library('groovy-nio', 'org.apache.groovy', 'groovy-nio').versionRef('groovy') library('groovy-sql', 'org.apache.groovy', 'groovy-sql').versionRef('groovy') library('groovy-macro', 'org.apache.groovy', 'groovy-macro').versionRef('groovy') library('groovy-templates', 'org.apache.groovy', 'groovy-templates').versionRef('groovy') - library('groovy-test', 'org.apache.groovy', 'groovy-test').versionRef('groovy') // test only - library('spock', 'org.spockframework', 'spock-core').versionRef('spock') // test only - library('bytebuddy', 'net.bytebuddy', 'byte-buddy').version('1.14.4') // test only - library('objenesis', 'org.objenesis', 'objenesis').version('2.6') // test only - library('jna', 'net.java.dev.jna', 'jna').version('5.13.0') - library('pdfbox', 'org.apache.pdfbox', 'pdfbox').version('4.0.0-SNAPSHOT') - library('zxing', 'com.google.zxing', 'javase').version('3.5.2') // test only - library('reflections', 'org.reflections', 'reflections').version('0.9.11') // test only - library('jfreechart', 'org.jfree', 'jfreechart').version('1.5.2') // test only - library('datastructures-settings', 'org.xbib', 'settings-datastructures').versionRef('datastructures') - library('datastructures-settings-json', 'org.xbib', 'settings-datastructures-json').versionRef('datastructures') - library('datastructures-settings-yaml', 'org.xbib', 'settings-datastructures-yaml').versionRef('datastructures') + library('groovy-test', 'org.apache.groovy', 'groovy-test').versionRef('groovy') + library('spock', 'org.spockframework', 'spock-core').versionRef('spock') + library('bytebuddy', 'net.bytebuddy', 'byte-buddy').version('1.14.4') + library('objenesis', 'org.objenesis', 'objenesis').version('2.6') + library('zxing', 'com.google.zxing', 'javase').version('3.5.2') + library('reflections', 'org.reflections', 'reflections').version('0.9.11') + library('jfreechart', 'org.jfree', 'jfreechart').version('1.5.2') } } }