From dd72b9d690217c2532e8c61a2b16fb90ac162a44 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Wed, 8 Mar 2023 13:39:34 -0600 Subject: [PATCH] Update Gradle and dependencies --- build.gradle.kts | 14 +++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle.kts | 2 +- src/main/java/dev/plex/ShopModule.kt | 2 +- src/main/resources/module.yml | 2 +- src/main/resources/{data => shop}/config.yml | 0 6 files changed, 11 insertions(+), 11 deletions(-) rename src/main/resources/{data => shop}/config.yml (100%) diff --git a/build.gradle.kts b/build.gradle.kts index 4d1a8ae..bc0581d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,12 +3,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { java `maven-publish` - kotlin("jvm") version "1.7.0" + kotlin("jvm") version "1.8.20-RC" } repositories { maven { - url = uri("https://papermc.io/repo/repository/maven-public/") + url = uri("https://repo.papermc.io/repository/maven-public/") } maven { @@ -19,15 +19,15 @@ repositories { } dependencies { - compileOnly("org.projectlombok:lombok:1.18.24") - annotationProcessor("org.projectlombok:lombok:1.18.24") - compileOnly("io.papermc.paper:paper-api:1.18.2-R0.1-SNAPSHOT") - compileOnly("dev.plex:server:1.2-SNAPSHOT") + compileOnly("org.projectlombok:lombok:1.18.26") + annotationProcessor("org.projectlombok:lombok:1.18.26") + compileOnly("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT") + compileOnly("dev.plex:server:1.3-SNAPSHOT") implementation(kotlin("stdlib-jdk8")) } group = "dev.plex" -version = "1.0" +version = "1.3-SNAPSHOT" description = "ShopModule" java { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index aa991fc..e1bef7e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts index 4b44fc2..38cb2e1 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,2 +1,2 @@ -rootProject.name = "plex-shop" +rootProject.name = "Module-Shop" diff --git a/src/main/java/dev/plex/ShopModule.kt b/src/main/java/dev/plex/ShopModule.kt index f10a213..58b5573 100644 --- a/src/main/java/dev/plex/ShopModule.kt +++ b/src/main/java/dev/plex/ShopModule.kt @@ -25,7 +25,7 @@ class ShopModule : PlexModule() { override fun load() { module = this; - config = ModuleConfig(this, "data/config.yml", "config.yml") + config = ModuleConfig(this, "shop/config.yml", "config.yml") getConfig().load() } diff --git a/src/main/resources/module.yml b/src/main/resources/module.yml index a032727..5ab8e7d 100644 --- a/src/main/resources/module.yml +++ b/src/main/resources/module.yml @@ -1,4 +1,4 @@ name: Module-Shop main: dev.plex.ShopModule description: The shop module for Plex -version: 1.2-SNAPSHOT +version: 1.3-SNAPSHOT diff --git a/src/main/resources/data/config.yml b/src/main/resources/shop/config.yml similarity index 100% rename from src/main/resources/data/config.yml rename to src/main/resources/shop/config.yml