joerg/groovy-extensions
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update to Gradle 8.7

Browse source
This commit is contained in:
Jörg Prante 2024-04-21 21:50:20 +02:00
parent 00c93e18f5
commit a843989166
8 changed files with 31 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -7,7 +7,7 @@ plugins {
wrapper { wrapper {
gradleVersion = libs.versions.gradle.get() gradleVersion = libs.versions.gradle.get()
distributionType = Wrapper.DistributionType.ALL distributionType = Wrapper.DistributionType.BIN
} }
ext { ext {

2
gradle.properties
View file

@ -1,3 +1,5 @@
group = org.xbib.groovy group = org.xbib.groovy
name = groovy-extensions name = groovy-extensions
version = 5.0.0 version = 5.0.0
org.gradle.warning.mode = all

8
gradle/test/junit5.gradle
View file

@ -1,8 +1,8 @@
dependencies { dependencies {
testImplementation libs.junit.jupiter.api testImplementation testLibs.junit.jupiter.api
testImplementation libs.junit.jupiter.params testImplementation testLibs.junit.jupiter.params
testImplementation libs.hamcrest testImplementation testLibs.hamcrest
testRuntimeOnly libs.junit.jupiter.engine testRuntimeOnly testLibs.junit.jupiter.engine
} }
test { test {

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View file

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

20
gradlew.bat vendored
View file

@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute if %ERRORLEVEL% equ 0 goto execute
echo. echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. echo location of your Java installation. 1>&2
goto fail goto fail
@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute if exist "%JAVA_EXE%" goto execute
echo. echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. echo location of your Java installation. 1>&2
goto fail goto fail

4
groovy-git/build.gradle
View file

@ -3,6 +3,6 @@ apply from: rootProject.file('gradle/compile/groovy-dynamic-tests.gradle')
dependencies { dependencies {
api project(':groovy-git-annotations') api project(':groovy-git-annotations')
api libs.jgit api libs.jgit
testImplementation libs.spock.core testImplementation testLibs.spock.core
testImplementation libs.spock.junit4 testImplementation testLibs.spock.junit4
} }

20
settings.gradle
View file

@ -15,11 +15,17 @@ pluginManagement {
dependencyResolutionManagement { dependencyResolutionManagement {
versionCatalogs { versionCatalogs {
libs { libs {
version('gradle', '8.5') version('gradle', '8.7')
version('groovy', '4.0.17') version('groovy', '4.0.21')
version('spock', '2.3-groovy-4.0')
version('junit', '5.10.1')
library('groovy-core', 'org.apache.groovy', 'groovy').versionRef('groovy') library('groovy-core', 'org.apache.groovy', 'groovy').versionRef('groovy')
library('ftp-fs', 'org.xbib', 'ftp-fs').version('2.6.0')
library('files-sftp-fs', 'org.xbib', 'files-sftp-fs').version('4.3.0')
library('jgit', 'org.eclipse.jgit', 'org.eclipse.jgit').version('6.9.0.202403050737-r')
library('mail', 'com.sun.mail', 'javax.mail').version('1.6.2')
}
testLibs {
version('spock', '2.3-groovy-4.0')
version('junit', '5.10.2')
library('spock-core', 'org.spockframework', 'spock-core').versionRef('spock') library('spock-core', 'org.spockframework', 'spock-core').versionRef('spock')
library('spock-junit4', 'org.spockframework', 'spock-junit4').versionRef('spock') library('spock-junit4', 'org.spockframework', 'spock-junit4').versionRef('spock')
library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit') library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit')
@ -27,10 +33,6 @@ dependencyResolutionManagement {
library('junit-jupiter-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit') library('junit-jupiter-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit')
library('junit4', 'junit', 'junit').version('4.13.2') library('junit4', 'junit', 'junit').version('4.13.2')
library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2') library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2')
library('ftp-fs', 'org.xbib', 'ftp-fs').version('2.6.0')
library('files-sftp-fs', 'org.xbib', 'files-sftp-fs').version('4.2.1')
library('jgit', 'org.eclipse.jgit', 'org.eclipse.jgit').version('6.8.0.202311291450-r')
library('mail', 'com.sun.mail', 'javax.mail').version('1.6.2')
} }
} }
} }
@ -38,8 +40,8 @@ dependencyResolutionManagement {
include 'groovy-crypt' include 'groovy-crypt'
include 'groovy-ftp' include 'groovy-ftp'
include 'groovy-ftps' include 'groovy-ftps'
include 'groovy-git-annotations'
include 'groovy-git' include 'groovy-git'
include 'groovy-git-annotations'
include 'groovy-ldap' include 'groovy-ldap'
include 'groovy-mail' include 'groovy-mail'
include 'groovy-sshd' include 'groovy-sshd'