Fix and update building

ozraru · Mar 10, 2024 · 6fdd968 · 6fdd968
1 parent d738414
commit 6fdd968
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 31 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,7 @@
 allprojects {
     apply plugin: 'java'
 
+    group = 'work.raru.discordchat'
     version = "0.6"
 
     jar {

diff --git a/common/build.gradle b/common/build.gradle
@@ -13,16 +13,6 @@ targetCompatibility = 1.8
 repositories {
     // Use Maven Central for resolving dependencies.
     mavenCentral()
-    maven {
-        url = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/'
-
-        // As of Gradle 5.1, you can limit this to only those
-        // dependencies you expect from it
-        content {
-            includeGroup 'org.bukkit'
-            includeGroup 'org.spigotmc'
-        }
-    }
     maven {
       name 'm2-dv8tion'
       url 'https://m2.dv8tion.net/releases'
@@ -36,9 +26,9 @@ dependencies {
 
     implementation 'com.vdurmont:emoji-java:5.1.1'
 
-    implementation 'com.google.code.gson:gson:2.9.+'
+    implementation 'com.google.code.gson:gson:2.10.+'
 
-    implementation 'org.xerial:sqlite-jdbc:3.39.+'
+    implementation 'org.xerial:sqlite-jdbc:3.45.+'
 
-    implementation 'org.postgresql:postgresql:42.5.+'
+    implementation 'org.postgresql:postgresql:42.7.+'
 }
diff --git a/forge12/build.gradle b/forge12/build.gradle
@@ -5,8 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2'
-        classpath 'net.kyori:blossom:1.3.0'
+        classpath 'gradle.plugin.com.github.johnrengelman:shadow:8.+'
         classpath 'net.minecraftforge.gradle:ForgeGradle:6.+'
     }
 }
@@ -17,25 +16,20 @@ apply plugin: 'net.minecraftforge.gradle'
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
-// blossom {
-//     replaceTokenIn 'src/main/java/me/lucko/luckperms/forge/LPForgeBootstrap.java'
-//     replaceToken '@version@', project.ext.fullVersion
-// }
-
 minecraft {
     mappings channel: 'snapshot', version: '20171003-1.12'
 }
 
 configurations {
     shadowDep
+    implementation.extendsFrom shadowDep
 }
 
 repositories {
 }
 
 dependencies {
     minecraft "net.minecraftforge:forge:${minecraftVersion}-${forgeVersion}"
-    implementation project(':common')
     shadowDep project(':common')
 }
 
@@ -67,6 +61,11 @@ shadowJar {
     relocate 'org.postgresql', 'work.raru.discordchat.libs.org.postgresql'
     relocate 'org.slf4j', 'work.raru.discordchat.libs.org.slf4j'
     // relocate 'org.sqlite', 'work.raru.discordchat.libs.org.sqlite'
+
+    exclude 'module-info.class'
+    exclude 'META-INF/maven/**'
+    exclude 'META-INF/proguard/**'
+    exclude 'META-INF/versions/**'
 }
 
 artifacts {

diff --git a/forge16/build.gradle b/forge16/build.gradle
@@ -5,8 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2'
-        classpath 'net.kyori:blossom:1.3.0'
+        classpath 'gradle.plugin.com.github.johnrengelman:shadow:8.+'
         classpath 'net.minecraftforge.gradle:ForgeGradle:6.+'
     }
 }
@@ -17,25 +16,20 @@ apply plugin: 'net.minecraftforge.gradle'
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
-// blossom {
-//     replaceTokenIn 'src/main/java/me/lucko/luckperms/forge/LPForgeBootstrap.java'
-//     replaceToken '@version@', project.ext.fullVersion
-// }
-
 minecraft {
     mappings channel: 'official', version: minecraftVersion
 }
 
 configurations {
     shadowDep
+    implementation.extendsFrom shadowDep
 }
 
 repositories {
 }
 
 dependencies {
     minecraft "net.minecraftforge:forge:${minecraftVersion}-${forgeVersion}"
-    implementation project(':common')
     shadowDep project(':common')
 }
 
@@ -67,6 +61,11 @@ shadowJar {
     relocate 'org.postgresql', 'work.raru.discordchat.libs.org.postgresql'
     relocate 'org.slf4j', 'work.raru.discordchat.libs.org.slf4j'
     // relocate 'org.sqlite', 'work.raru.discordchat.libs.org.sqlite'
+
+    exclude 'module-info.class'
+    exclude 'META-INF/maven/**'
+    exclude 'META-INF/proguard/**'
+    exclude 'META-INF/versions/**'
 }
 
 artifacts {

diff --git a/forge19/build.gradle b/forge19/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'eclipse'
     id 'maven-publish'
-    id 'com.github.johnrengelman.shadow' version '7.+'
+    id 'com.github.johnrengelman.shadow' version '8.+'
     id 'net.minecraftforge.gradle' version '6.+'
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME