Skip to content

Commit

Permalink
updated gradle to 8.7 and libs
Browse files Browse the repository at this point in the history
  • Loading branch information
Suqatri committed Apr 13, 2024
1 parent 207cee5 commit b18d7c8
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 48 deletions.
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ repositories {
}

dependencies {
compileOnly(kotlin("gradle-plugin", "1.8.22"))
runtimeOnly(kotlin("gradle-plugin", "1.8.22"))
compileOnly(kotlin("gradle-plugin", "1.9.23"))
runtimeOnly(kotlin("gradle-plugin", "1.9.23"))
}
28 changes: 13 additions & 15 deletions buildSrc/src/main/kotlin/BuildDependencies.kt
Original file line number Diff line number Diff line change
@@ -1,43 +1,41 @@
object BuildDependencies {
const val CLOUD_VERSION = "2.3.0-SNAPSHOT"
const val CLOUD_LIBLOADER_VERSION = "1.6.7"
const val CLOUD_LIBLOADER_BOOTSTRAP = "dev.redicloud.libloader:libloader-bootstrap:1.6.7"
const val CLOUD_LIBLOADER_VERSION = "1.7.0"
const val CLOUD_LIBLOADER_BOOTSTRAP = "dev.redicloud.libloader:libloader-bootstrap:1.7.0"

const val SPIGOT_API = "org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT"
const val SPIGOT_API = "org.spigotmc:spigot-api:1.20.4-R0.1-SNAPSHOT"
const val BUNGEECORD_API = "net.md-5:bungeecord-api:1.20-R0.3-SNAPSHOT"
const val VELOCITY_API = "com.velocitypowered:velocity-api:3.1.1"
const val MINESTOM_API = "dev.hollowcube:minestom-ce:1619cedc53"
const val MINESTOM_EXTENSIONS = "dev.hollowcube:minestom-ce-extensions:1.2.0"

const val KOTLIN_REFLECT = "org.jetbrains.kotlin:kotlin-reflect:1.8.22"
const val KOTLIN_REFLECT = "org.jetbrains.kotlin:kotlin-reflect:1.9.23"
const val KOTLINX_COROUTINES = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0"
const val KTOR_CLIENT_CORE = "io.ktor:ktor-client-core:2.3.10"
const val KTOR_CLIENT_CIO = "io.ktor:ktor-client-cio:2.3.10"
const val GSON = "com.google.code.gson:gson:2.10.1"
const val REDISSON = "org.redisson:redisson:3.27.1"
const val REDISSON = "org.redisson:redisson:3.28.0"
const val GUICE = "com.google.inject:guice:7.0.0"
const val SSHD = "org.apache.sshd:sshd-sftp:2.10.0"
const val SSHD = "org.apache.sshd:sshd-sftp:2.12.1"
const val JSCH = "com.jcraft:jsch:0.1.55"
const val LOGBACK_CORE = "ch.qos.logback:logback-core:1.4.14"
const val LOGBACK_CLASSIC = "ch.qos.logback:logback-classic:1.4.14"

//Check compatibility with redisson
const val NETTY_HANDLER = "io.netty:netty-handler:4.1.107.Final"
const val NETTY_RESOLVER_DNS = "io.netty:netty-resolver-dns:4.1.107.Final"
const val NETTY_RESOLVER = "io.netty:netty-resolver:4.1.107.Final"
const val NETTY_TRANSPORT = "io.netty:netty-transport:4.1.107.Final"
const val NETTY_BUFFER = "io.netty:netty-buffer:4.1.107.Final"
const val NETTY_CODEC = "io.netty:netty-codec:4.1.107.Final"
const val NETTY_COMMON = "io.netty:netty-common:4.1.107.Final"
const val NETTY_HANDLER = "io.netty:netty-handler:4.1.108.Final"
const val NETTY_RESOLVER_DNS = "io.netty:netty-resolver-dns:4.1.108.Final"
const val NETTY_RESOLVER = "io.netty:netty-resolver:4.1.108.Final"
const val NETTY_TRANSPORT = "io.netty:netty-transport:4.1.108.Final"
const val NETTY_BUFFER = "io.netty:netty-buffer:4.1.108.Final"
const val NETTY_CODEC = "io.netty:netty-codec:4.1.108.Final"
const val NETTY_COMMON = "io.netty:netty-common:4.1.108.Final"

const val JLINE_CONSOLE = "org.jline:jline-console:3.25.1"
const val JLINE_JANSI = "org.jline:jline-terminal-jansi:3.25.1"

const val DOCKER_TEST_CONTAINERS = "org.testcontainers:testcontainers:1.19.7"
const val BCPROV = "org.bouncycastle:bcprov-jdk15on:1.70"
const val BCPKIX = "org.bouncycastle:bcpkix-jdk15on:1.70"

const val JUNIT = "org.junit.jupiter:junit-jupiter:5.8.1"
}

fun String.withVersion(version: String): String {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 4 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
zipStorePath=wrapper/dists
41 changes: 28 additions & 13 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,13 +80,11 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -133,22 +131,29 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
done
fi

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@"

# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi

# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
Expand Down
35 changes: 19 additions & 16 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
Expand All @@ -25,7 +25,8 @@
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand All @@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
if %ERRORLEVEL% equ 0 goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%

:mainEnd
if "%OS%"=="Windows_NT" endlocal
Expand Down

0 comments on commit b18d7c8

Please sign in to comment.