Skip to content

Commit 6fdd968

Browse files
committed
Fix and update building
1 parent d738414 commit 6fdd968

File tree

6 files changed

+20
-31
lines changed

6 files changed

+20
-31
lines changed

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
allprojects {
22
apply plugin: 'java'
33

4+
group = 'work.raru.discordchat'
45
version = "0.6"
56

67
jar {

common/build.gradle

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,6 @@ targetCompatibility = 1.8
1313
repositories {
1414
// Use Maven Central for resolving dependencies.
1515
mavenCentral()
16-
maven {
17-
url = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/'
18-
19-
// As of Gradle 5.1, you can limit this to only those
20-
// dependencies you expect from it
21-
content {
22-
includeGroup 'org.bukkit'
23-
includeGroup 'org.spigotmc'
24-
}
25-
}
2616
maven {
2717
name 'm2-dv8tion'
2818
url 'https://m2.dv8tion.net/releases'
@@ -36,9 +26,9 @@ dependencies {
3626

3727
implementation 'com.vdurmont:emoji-java:5.1.1'
3828

39-
implementation 'com.google.code.gson:gson:2.9.+'
29+
implementation 'com.google.code.gson:gson:2.10.+'
4030

41-
implementation 'org.xerial:sqlite-jdbc:3.39.+'
31+
implementation 'org.xerial:sqlite-jdbc:3.45.+'
4232

43-
implementation 'org.postgresql:postgresql:42.5.+'
33+
implementation 'org.postgresql:postgresql:42.7.+'
4434
}

forge12/build.gradle

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ buildscript {
55
}
66

77
dependencies {
8-
classpath 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2'
9-
classpath 'net.kyori:blossom:1.3.0'
8+
classpath 'gradle.plugin.com.github.johnrengelman:shadow:8.+'
109
classpath 'net.minecraftforge.gradle:ForgeGradle:6.+'
1110
}
1211
}
@@ -17,25 +16,20 @@ apply plugin: 'net.minecraftforge.gradle'
1716
sourceCompatibility = 1.8
1817
targetCompatibility = 1.8
1918

20-
// blossom {
21-
// replaceTokenIn 'src/main/java/me/lucko/luckperms/forge/LPForgeBootstrap.java'
22-
// replaceToken '@version@', project.ext.fullVersion
23-
// }
24-
2519
minecraft {
2620
mappings channel: 'snapshot', version: '20171003-1.12'
2721
}
2822

2923
configurations {
3024
shadowDep
25+
implementation.extendsFrom shadowDep
3126
}
3227

3328
repositories {
3429
}
3530

3631
dependencies {
3732
minecraft "net.minecraftforge:forge:${minecraftVersion}-${forgeVersion}"
38-
implementation project(':common')
3933
shadowDep project(':common')
4034
}
4135

@@ -67,6 +61,11 @@ shadowJar {
6761
relocate 'org.postgresql', 'work.raru.discordchat.libs.org.postgresql'
6862
relocate 'org.slf4j', 'work.raru.discordchat.libs.org.slf4j'
6963
// relocate 'org.sqlite', 'work.raru.discordchat.libs.org.sqlite'
64+
65+
exclude 'module-info.class'
66+
exclude 'META-INF/maven/**'
67+
exclude 'META-INF/proguard/**'
68+
exclude 'META-INF/versions/**'
7069
}
7170

7271
artifacts {

forge16/build.gradle

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ buildscript {
55
}
66

77
dependencies {
8-
classpath 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2'
9-
classpath 'net.kyori:blossom:1.3.0'
8+
classpath 'gradle.plugin.com.github.johnrengelman:shadow:8.+'
109
classpath 'net.minecraftforge.gradle:ForgeGradle:6.+'
1110
}
1211
}
@@ -17,25 +16,20 @@ apply plugin: 'net.minecraftforge.gradle'
1716
sourceCompatibility = 1.8
1817
targetCompatibility = 1.8
1918

20-
// blossom {
21-
// replaceTokenIn 'src/main/java/me/lucko/luckperms/forge/LPForgeBootstrap.java'
22-
// replaceToken '@version@', project.ext.fullVersion
23-
// }
24-
2519
minecraft {
2620
mappings channel: 'official', version: minecraftVersion
2721
}
2822

2923
configurations {
3024
shadowDep
25+
implementation.extendsFrom shadowDep
3126
}
3227

3328
repositories {
3429
}
3530

3631
dependencies {
3732
minecraft "net.minecraftforge:forge:${minecraftVersion}-${forgeVersion}"
38-
implementation project(':common')
3933
shadowDep project(':common')
4034
}
4135

@@ -67,6 +61,11 @@ shadowJar {
6761
relocate 'org.postgresql', 'work.raru.discordchat.libs.org.postgresql'
6862
relocate 'org.slf4j', 'work.raru.discordchat.libs.org.slf4j'
6963
// relocate 'org.sqlite', 'work.raru.discordchat.libs.org.sqlite'
64+
65+
exclude 'module-info.class'
66+
exclude 'META-INF/maven/**'
67+
exclude 'META-INF/proguard/**'
68+
exclude 'META-INF/versions/**'
7069
}
7170

7271
artifacts {

forge19/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id 'eclipse'
33
id 'maven-publish'
4-
id 'com.github.johnrengelman.shadow' version '7.+'
4+
id 'com.github.johnrengelman.shadow' version '8.+'
55
id 'net.minecraftforge.gradle' version '6.+'
66
}
77

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)