From 0a94c69d7bffdd9d1251e2453b188c7ad8bccee4 Mon Sep 17 00:00:00 2001 From: DenaryDev Date: Fri, 24 Nov 2023 14:32:09 +0500 Subject: [PATCH] Update dependencies --- .../extension/CrystalLibraryExtension.java | 4 ---- .../src/main/kotlin/crystal.base.gradle.kts | 3 ++- library/paper/nms/build.gradle.kts | 2 +- .../me/denarydev/crystal/nms/CrystalNMS.java | 2 +- library/paper/serializers/build.gradle.kts | 3 +-- library/paper/utils/build.gradle.kts | 3 --- settings.gradle.kts | 20 ++++++++----------- 7 files changed, 13 insertions(+), 24 deletions(-) diff --git a/buildSrc/src/main/java/crystal/extension/CrystalLibraryExtension.java b/buildSrc/src/main/java/crystal/extension/CrystalLibraryExtension.java index 3dc7ac9..b175bdf 100644 --- a/buildSrc/src/main/java/crystal/extension/CrystalLibraryExtension.java +++ b/buildSrc/src/main/java/crystal/extension/CrystalLibraryExtension.java @@ -27,8 +27,4 @@ public CrystalLibraryExtension(ObjectFactory factory, Project project) { public Property getLibraryName() { return this.libraryName; } - - public void setLibraryName(String name) { - this.libraryName.set(name); - } } diff --git a/buildSrc/src/main/kotlin/crystal.base.gradle.kts b/buildSrc/src/main/kotlin/crystal.base.gradle.kts index 6c2d386..feb7699 100644 --- a/buildSrc/src/main/kotlin/crystal.base.gradle.kts +++ b/buildSrc/src/main/kotlin/crystal.base.gradle.kts @@ -44,10 +44,11 @@ java { } val env: Map = System.getenv() +val repo = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "snapshots" else "releases" publishing { repositories { - maven("https://the-planet.fun/repo/snapshots/") { + maven("https://the-planet.fun/repo/$repo/") { name = "sapphire" credentials(PasswordCredentials::class) } diff --git a/library/paper/nms/build.gradle.kts b/library/paper/nms/build.gradle.kts index fbe9035..7f006d4 100644 --- a/library/paper/nms/build.gradle.kts +++ b/library/paper/nms/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("io.papermc.paperweight.userdev") version "1.5.4" + id("io.papermc.paperweight.userdev") version "1.5.10" } crystalModule { diff --git a/library/paper/nms/src/main/java/me/denarydev/crystal/nms/CrystalNMS.java b/library/paper/nms/src/main/java/me/denarydev/crystal/nms/CrystalNMS.java index 1454300..26b2026 100644 --- a/library/paper/nms/src/main/java/me/denarydev/crystal/nms/CrystalNMS.java +++ b/library/paper/nms/src/main/java/me/denarydev/crystal/nms/CrystalNMS.java @@ -7,7 +7,7 @@ */ package me.denarydev.crystal.nms; -import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack; import org.bukkit.entity.EntityType; import org.bukkit.inventory.ItemStack; diff --git a/library/paper/serializers/build.gradle.kts b/library/paper/serializers/build.gradle.kts index 83feb42..dc0e392 100644 --- a/library/paper/serializers/build.gradle.kts +++ b/library/paper/serializers/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("io.papermc.paperweight.userdev") version "1.5.4" + id("io.papermc.paperweight.userdev") version "1.5.10" } crystalModule { @@ -16,7 +16,6 @@ dependencies { testImplementation(platform(libs.junit.bom)) testImplementation("org.junit.jupiter:junit-jupiter") - //testImplementation(libs.mockito) testImplementation(libs.mockbukkit) } diff --git a/library/paper/utils/build.gradle.kts b/library/paper/utils/build.gradle.kts index cca08df..06400c4 100644 --- a/library/paper/utils/build.gradle.kts +++ b/library/paper/utils/build.gradle.kts @@ -7,7 +7,4 @@ crystalModule { dependencies { compileOnly(libs.paper) - compileOnly(libs.lombok) - compileOnly(libs.authlib) - annotationProcessor(libs.lombok) } diff --git a/settings.gradle.kts b/settings.gradle.kts index e80cb37..19f11b6 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -12,13 +12,10 @@ dependencyResolutionManagement { versionCatalogs { create("libs") { - library("paper", "io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT") + library("paper", "io.papermc.paper:paper-api:1.20.2-R0.1-SNAPSHOT") - library("slf4j", "org.slf4j:slf4j-api:2.0.7") - library("annotations", "org.jetbrains:annotations:24.0.1") - library("lombok", "org.projectlombok:lombok:1.18.26") - library("commons-lang3", "org.apache.commons:commons-lang3:3.12.0") - library("authlib", "com.mojang:authlib:4.0.43") + library("slf4j", "org.slf4j:slf4j-api:2.0.9") + library("annotations", "org.jetbrains:annotations:24.1.0") val configurateVersion = "4.1.2" library("configurate", "org.spongepowered:configurate-core:$configurateVersion") @@ -26,13 +23,12 @@ dependencyResolutionManagement { library("yaml", "org.spongepowered:configurate-yaml:$configurateVersion") library("gson", "org.spongepowered:configurate-gson:$configurateVersion") - library("hikari", "com.zaxxer:HikariCP:5.0.1") - library("mysql-connector", "com.mysql:mysql-connector-j:8.0.33") - library("sqlite-jdbc", "org.xerial:sqlite-jdbc:3.42.0.0") + library("hikari", "com.zaxxer:HikariCP:5.1.0") + library("mysql-connector", "com.mysql:mysql-connector-j:8.2.0") + library("sqlite-jdbc", "org.xerial:sqlite-jdbc:3.44.0.0") - library("junit-bom", "org.junit:junit-bom:5.10.0") - library("mockito", "org.mockito:mockito-core:5.6.0") - library("mockbukkit", "com.github.seeseemelk:MockBukkit-v1.20:3.44.0") + library("junit-bom", "org.junit:junit-bom:5.10.1") + library("mockbukkit", "com.github.seeseemelk:MockBukkit-v1.20:3.47.0") bundle("sql", listOf("hikari", "mysql-connector", "sqlite-jdbc")) bundle("configurate", listOf("hocon", "yaml", "gson"))