Skip to content

Commit

Permalink
Update Gradle
Browse files Browse the repository at this point in the history
  • Loading branch information
LXGaming committed Dec 7, 2021
1 parent a5049f9 commit de606c3
Show file tree
Hide file tree
Showing 4 changed files with 166 additions and 116 deletions.
23 changes: 12 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ buildscript {
}
maven {
name = "minecraftforge"
url = "https://files.minecraftforge.net/maven"
url = "https://maven.minecraftforge.net/"
}
maven {
name = "spongepowered"
url = "https://repo.spongepowered.org/maven"
url = "https://repo.spongepowered.org/repository/maven-public"
}
}

dependencies {
classpath("com.github.jengelman.gradle.plugins:shadow:6.1.0")
classpath("gradle.plugin.com.github.johnrengelman:shadow:7.1.0")
classpath("net.kyori:blossom:1.3.0")
classpath("net.minecraftforge.gradle:ForgeGradle:4.1.+")
classpath("net.minecraftforge.gradle:ForgeGradle:5.1.+")
classpath("org.spongepowered:mixingradle:0.7-SNAPSHOT")
}
}
Expand Down Expand Up @@ -74,8 +74,8 @@ mixin {
}

configurations {
shadow {
runtime.extendsFrom(shadow)
compileJar {
implementation.extendsFrom(compileJar)
}
}

Expand All @@ -95,13 +95,13 @@ repositories {
}

dependencies {
minecraft("net.minecraftforge:forge:1.16.5-36.1.32")
shadow("org.checkerframework:checker-qual:3.15.0")
minecraft("net.minecraftforge:forge:1.16.5-36.2.19")
compileJar("org.checkerframework:checker-qual:3.15.0")
testImplementation("org.junit.jupiter:junit-jupiter-engine:5.7.2")
shadow("org.spongepowered:configurate-hocon:4.1.1") {
compileJar("org.spongepowered:configurate-hocon:4.1.1") {
exclude(module: "checker-qual")
}
annotationProcessor("org.spongepowered:mixin:0.8.2:processor")
annotationProcessor("org.spongepowered:mixin:0.8.4:processor")

// First Party Mods
// compileOnly("northerncompass:NorthernCompass:1.14.4:1.0.0")
Expand Down Expand Up @@ -140,6 +140,7 @@ jar {
}

processResources {
duplicatesStrategy(DuplicatesStrategy.INCLUDE)
from("LICENSE")
rename("LICENSE", "LICENSE-${archivesBaseName}")

Expand All @@ -158,7 +159,7 @@ reobf {

shadowJar {
archiveClassifier.set(null)
configurations = [project.configurations.shadow]
configurations = [project.configurations.compileJar]
exclude("module-info.class")
relocate("com.typesafe.config", "io.github.lxgaming.sledgehammer.lib.config")
relocate("io.leangen.geantyref", "io.github.lxgaming.sledgehammer.lib.geantyref")
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit de606c3

Please sign in to comment.