Skip to content

Commit

Permalink
Merge branch 'refs/heads/main' into feature/cloud-2.0.0
Browse files Browse the repository at this point in the history
# Conflicts:
#	settings.gradle.kts
  • Loading branch information
TheMeinerLP committed Aug 21, 2024
2 parents b63c885 + 8a0e4f0 commit d59b526
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 4 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# 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
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down
8 changes: 4 additions & 4 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ rootProject.name = "ClipboardConnect"
dependencyResolutionManagement {
versionCatalogs {
create("libs") {
library("worldedit", "com.sk89q.worldedit","worldedit-bukkit").version("7.3.3")
library("worldedit", "com.sk89q.worldedit","worldedit-bukkit").version("7.3.6")

library("fawe.bom", "com.intellectualsites.bom", "bom-newest").version("1.45")
library("fawe.bom", "com.intellectualsites.bom", "bom-newest").version("1.48")
library("fawe.core", "com.fastasyncworldedit", "FastAsyncWorldEdit-Core").withoutVersion()
library("fawe.bukkit", "com.fastasyncworldedit", "FastAsyncWorldEdit-Bukkit").withoutVersion()

Expand All @@ -24,13 +24,13 @@ dependencyResolutionManagement {
library("cloud.annotations", "cloud.commandframework", "cloud-annotations").versionRef("cloud")
library("cloud.minecraft.extras", "cloud.commandframework", "cloud-minecraft-extras").versionRef("cloud")

library("redis", "org.redisson","redisson").version("3.32.0")
library("redis", "org.redisson","redisson").version("3.34.1")

library("kotlin.test", "org.jetbrains.kotlin", "kotlin-test").withoutVersion()
library("kotlin.jackson", "com.fasterxml.jackson.module", "jackson-module-kotlin").version("2.17.+")
library("aerogel", "dev.derklaro.aerogel", "aerogel").version("2.1.0")
library("paper", "io.papermc.paper", "paper-api").version("1.20.2-R0.1-SNAPSHOT")
library("zstd", "com.github.luben", "zstd-jni").version("1.5.6-3")
library("zstd", "com.github.luben", "zstd-jni").version("1.5.6-4")

library("bstats", "org.bstats", "bstats-bukkit").version("3.0.2")

Expand Down

0 comments on commit d59b526

Please sign in to comment.