From 4608d53a8ca694d4b5bfa3e3605a0b83434aa5d3 Mon Sep 17 00:00:00 2001
From: RaphiMC <50594595+RaphiMC@users.noreply.github.com>
Date: Sun, 3 Sep 2023 00:48:44 +0200
Subject: [PATCH] Updated gradle

---
 build.gradle                             | 16 +++++++++-------
 gradle.properties                        |  4 +---
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index e41d08e..73cf888 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,12 +4,14 @@ plugins {
     id "net.kyori.blossom" version "1.3.1"
 }
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(8)
-compileJava.options.encoding = compileTestJava.options.encoding = javadoc.options.encoding = "UTF-8"
+base {
+    java.toolchain.languageVersion = JavaLanguageVersion.of(8)
+    compileJava.options.encoding = compileTestJava.options.encoding = javadoc.options.encoding = "UTF-8"
 
-group = project.maven_group
-archivesBaseName = project.maven_name
-version = project.maven_version
+    group = project.maven_group ?: rootProject.maven_group
+    archivesName = project.maven_name ?: rootProject.maven_name
+    version = project.maven_version ?: rootProject.maven_version
+}
 
 repositories {
     mavenCentral()
@@ -29,7 +31,7 @@ dependencies {
 
 blossom {
     replaceToken("\${version}", project.version, "src/main/java/net/raphimc/viaaprilfools/ViaAprilFools.java")
-    replaceToken("\${impl_version}", "git-${project.archivesBaseName}-${project.version}:${latestCommitHash()}", "src/main/java/net/raphimc/viaaprilfools/ViaAprilFools.java")
+    replaceToken("\${impl_version}", "git-${project.name}-${project.version}:${latestCommitHash()}", "src/main/java/net/raphimc/viaaprilfools/ViaAprilFools.java")
 }
 
 java {
@@ -39,7 +41,7 @@ java {
 
 jar {
     from("LICENSE") {
-        rename { "${it}_${project.archivesBaseName}" }
+        rename { "${it}_${project.name ?: rootProject.name}" }
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 591327c..94a965f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,9 +1,7 @@
-# Gradle properties
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.configureondemand=true
 
-# Project properties
-maven_name=ViaAprilFools
 maven_group=net.raphimc
+maven_name=ViaAprilFools
 maven_version=2.0.9-SNAPSHOT
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ae04661..db9a6b8 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.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists