Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some updates for Dependencies #287

Merged
merged 4 commits into from
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
`java-library`
id("io.papermc.paperweight.userdev") version "2.0.0-beta.11"
id("io.papermc.paperweight.userdev") version "2.0.0-beta.13"
id("xyz.jpenilla.run-paper") version "2.3.1" // Adds runServer and runMojangMappedServer tasks for testing
}

Expand Down Expand Up @@ -67,7 +67,7 @@ configure(subprojects.filter {
configure(subprojects.filter {
listOf("vane-regions", "vane-core", "vane-portals", "vane-regions").contains(it.name)
}) {
tasks.create<Copy>("copyJar") {
tasks.register<Copy>("copyJar") {
evaluationDependsOn(project.path)
from(tasks.findByPath("shadowJar"))
into("${project.rootProject.projectDir}/target")
Expand All @@ -79,7 +79,7 @@ configure(subprojects.filter {
configure(subprojects.filter {
listOf("vane-admin", "vane-bedtime", "vane-enchantments", "vane-permissions", "vane-trifles").contains(it.name)
}) {
tasks.create<Copy>("copyJar") {
tasks.register<Copy>("copyJar") {
from(tasks.jar)
into("${project.rootProject.projectDir}/target")
rename("(.+)-dev.jar", "$1.jar")
Expand Down Expand Up @@ -149,35 +149,35 @@ runPaper {
disablePluginJarDetection()
}

tasks.create<Delete>("cleanVaneRuntimeTranslations") {
tasks.register<Delete>("cleanVaneRuntimeTranslations") {
group = "run paper"
delete(fileTree("run").matching {
include("plugins/vane-*/lang-*.yml")
})
}

tasks.create<Delete>("cleanVaneConfigurations") {
tasks.register<Delete>("cleanVaneConfigurations") {
group = "run paper"
delete(fileTree("run").matching {
include("plugins/vane-*/config.yml")
})
}

tasks.create<Delete>("cleanVaneStorage") {
tasks.register<Delete>("cleanVaneStorage") {
group = "run paper"
delete(fileTree("run").matching {
include("plugins/vane-*/storage.json")
})
}

tasks.create<Delete>("cleanVane") {
tasks.register<Delete>("cleanVane") {
group = "run paper"
delete(fileTree("run").matching {
include("plugins/vane-*/")
})
}

tasks.create<Delete>("cleanWorld") {
tasks.register<Delete>("cleanWorld") {
group = "run paper"
delete(fileTree("run").matching {
include(
Expand Down
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.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
8 changes: 5 additions & 3 deletions 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 All @@ -23,7 +25,7 @@
# Important for running:
#
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
# non-compliant, but you have some other compliant shell such as ksh or
# noncompliant, but you have some other compliant shell such as ksh or
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
Expand Down Expand Up @@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/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 Down Expand Up @@ -84,7 +86,7 @@ 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\n' "$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
3 changes: 2 additions & 1 deletion vane-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ sourceSets {
}
}
}

dependencies {
implementation(group = "org.bstats", name = "bstats-base", version = "3.1.0")
implementation(group = "org.bstats", name = "bstats-bukkit", version = "3.1.0")
implementation(group = "org.reflections", name = "reflections", version = "0.10.2")
api(group = "org.json", name = "json", version = "20240303")
api(group = "org.json", name = "json", version = "20250107")
implementation(project(":vane-annotations"))
}

Expand Down
2 changes: 1 addition & 1 deletion vane-portals/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
}

dependencies {
compileOnly(group = "org.json", name = "json", version = "20240303")
compileOnly(group = "org.json", name = "json", version = "20250107")
}

tasks {
Expand Down
14 changes: 10 additions & 4 deletions vane-proxy-core/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
plugins {
id("io.github.goooler.shadow") version "8.1.8"
id("net.kyori.blossom") version "1.2.0"
id("net.kyori.blossom") version "2.1.0"
}

blossom {
replaceToken("\$VERSION", project.version)
sourceSets {
main {
blossom {
javaSources {
property("\$VERSION", project.version.toString())
}
}
}
}

dependencies {
implementation(group = "com.electronwill.night-config", name = "toml", version = "3.8.1")
implementation(group = "org.slf4j", name = "slf4j-api", version = "2.0.16")
implementation(rootProject.project(":vane-core"))
compileOnly(group = "org.json", name = "json", version = "20240303")
compileOnly(group = "org.json", name = "json", version = "20250107")
}

java {
Expand Down
2 changes: 1 addition & 1 deletion vane-regions/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
dependencies {
implementation(project(":vane-portals"))
compileOnly(group = "com.github.MilkBowl", name = "VaultAPI", version = "1.7.1")
compileOnly(group = "org.json", name = "json", version = "20240303")
compileOnly(group = "org.json", name = "json", version = "20250107")
}

tasks {
Expand Down
4 changes: 2 additions & 2 deletions vane-velocity/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies {
annotationProcessor(group = "com.velocitypowered", name = "velocity-api", version = "3.4.0-SNAPSHOT")
implementation(group = "org.bstats", name = "bstats-velocity", version = "3.1.0")
implementation(group = "org.bstats", name = "bstats-base", version = "3.1.0")
implementation(group = "org.json", name = "json", version = "20240303")
implementation(group = "org.json", name = "json", version = "20250107")
implementation(rootProject.project(":vane-core"))
implementation(rootProject.project(":vane-proxy-core"))
}
Expand All @@ -19,7 +19,7 @@ java {
}
}

tasks.create<Copy>("copyJar") {
tasks.register<Copy>("copyJar") {
from(tasks.shadowJar)
into("${project.rootProject.projectDir}/target")
duplicatesStrategy = DuplicatesStrategy.INCLUDE
Expand Down
Binary file modified vane-velocity/external/velocity-proxy-3.4.0-SNAPSHOT.jar
Binary file not shown.
Loading