Merge pull request #37 from LolHens/dependabot/gradle/net.fabricmc-fabric-loom-0.8.17

LolHens · web-flow · commit 63c8863ec062 · 2021-07-14T19:23:53.000+02:00
Bump fabric-loom from 0.7.9 to 0.8.17 and ForgeGradle from 4.1.+ to 5.0.8
diff --git a/fabric-1.15.2/build.gradle b/fabric-1.15.2/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.7.9'
+        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.7.33'
     }
 }
 apply plugin: 'fabric-loom'
@@ -22,8 +22,7 @@ version = parent.version + "+fabric-" + project.minecraft_version
 group = parent.group
 
 configurations {
-    shadow
-    compile.extendsFrom(shadow)
+    implementation.extendsFrom(shadow)
 }
 
 dependencies {
@@ -52,14 +51,9 @@ dependencies {
 processResources {
     inputs.property "version", project.version
 
-    from(sourceSets.main.resources.srcDirs) {
-        include "fabric.mod.json"
+    filesMatching("fabric.mod.json") {
         expand "version": project.version
     }
-
-    from(sourceSets.main.resources.srcDirs) {
-        exclude "fabric.mod.json"
-    }
 }
 
 // ensure that the encoding is set to UTF-8, no matter what the system default is
@@ -69,16 +63,17 @@ tasks.withType(JavaCompile) {
     options.encoding = "UTF-8"
 }
 
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
-    from sourceSets.main.allSource
+java {
+    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+    // if it is present.
+    // If you remove this line, sources will not be generated.
+    withSourcesJar()
 }
 
 jar {
-    from "LICENSE"
+    from("LICENSE") {
+        rename { "${it}_${project.archivesBaseName}"}
+    }
     from {
         configurations.shadow.collect { file ->
             [
diff --git a/fabric-1.16.1/build.gradle b/fabric-1.16.1/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.7.9'
+        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.7.33'
     }
 }
 apply plugin: 'fabric-loom'
@@ -22,8 +22,7 @@ version = parent.version + "+fabric-" + project.minecraft_version
 group = parent.group
 
 configurations {
-    shadow
-    compile.extendsFrom(shadow)
+    implementation.extendsFrom(shadow)
 }
 
 dependencies {
@@ -52,14 +51,9 @@ dependencies {
 processResources {
     inputs.property "version", project.version
 
-    from(sourceSets.main.resources.srcDirs) {
-        include "fabric.mod.json"
+    filesMatching("fabric.mod.json") {
         expand "version": project.version
     }
-
-    from(sourceSets.main.resources.srcDirs) {
-        exclude "fabric.mod.json"
-    }
 }
 
 // ensure that the encoding is set to UTF-8, no matter what the system default is
@@ -69,16 +63,17 @@ tasks.withType(JavaCompile) {
     options.encoding = "UTF-8"
 }
 
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
-    from sourceSets.main.allSource
+java {
+    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+    // if it is present.
+    // If you remove this line, sources will not be generated.
+    withSourcesJar()
 }
 
 jar {
-    from "LICENSE"
+    from("LICENSE") {
+        rename { "${it}_${project.archivesBaseName}"}
+    }
     from {
         configurations.shadow.collect { file ->
             [
diff --git a/fabric-1.16.2/build.gradle b/fabric-1.16.2/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.7.9'
+        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.7.33'
     }
 }
 apply plugin: 'fabric-loom'
@@ -22,8 +22,7 @@ version = parent.version + "+fabric-" + project.minecraft_version
 group = parent.group
 
 configurations {
-    shadow
-    compile.extendsFrom(shadow)
+    implementation.extendsFrom(shadow)
 }
 
 dependencies {
@@ -52,14 +51,9 @@ dependencies {
 processResources {
     inputs.property "version", project.version
 
-    from(sourceSets.main.resources.srcDirs) {
-        include "fabric.mod.json"
+    filesMatching("fabric.mod.json") {
         expand "version": project.version
     }
-
-    from(sourceSets.main.resources.srcDirs) {
-        exclude "fabric.mod.json"
-    }
 }
 
 // ensure that the encoding is set to UTF-8, no matter what the system default is
@@ -69,16 +63,17 @@ tasks.withType(JavaCompile) {
     options.encoding = "UTF-8"
 }
 
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
-    from sourceSets.main.allSource
+java {
+    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+    // if it is present.
+    // If you remove this line, sources will not be generated.
+    withSourcesJar()
 }
 
 jar {
-    from "LICENSE"
+    from("LICENSE") {
+        rename { "${it}_${project.archivesBaseName}"}
+    }
     from {
         configurations.shadow.collect { file ->
             [
diff --git a/fabric-1.16.4/build.gradle b/fabric-1.16.4/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.7.9'
+        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.7.33'
     }
 }
 apply plugin: 'fabric-loom'
@@ -22,8 +22,7 @@ version = parent.version + "+fabric-" + project.minecraft_version
 group = parent.group
 
 configurations {
-    shadow
-    compile.extendsFrom(shadow)
+    implementation.extendsFrom(shadow)
 }
 
 dependencies {
@@ -52,14 +51,9 @@ dependencies {
 processResources {
     inputs.property "version", project.version
 
-    from(sourceSets.main.resources.srcDirs) {
-        include "fabric.mod.json"
+    filesMatching("fabric.mod.json") {
         expand "version": project.version
     }
-
-    from(sourceSets.main.resources.srcDirs) {
-        exclude "fabric.mod.json"
-    }
 }
 
 // ensure that the encoding is set to UTF-8, no matter what the system default is
@@ -69,16 +63,17 @@ tasks.withType(JavaCompile) {
     options.encoding = "UTF-8"
 }
 
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
-    from sourceSets.main.allSource
+java {
+    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+    // if it is present.
+    // If you remove this line, sources will not be generated.
+    withSourcesJar()
 }
 
 jar {
-    from "LICENSE"
+    from("LICENSE") {
+        rename { "${it}_${project.archivesBaseName}"}
+    }
     from {
         configurations.shadow.collect { file ->
             [
diff --git a/fabric-1.17/build.gradle b/fabric-1.17/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.7.9'
+        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.7.33'
     }
 }
 apply plugin: 'fabric-loom'
@@ -23,8 +23,7 @@ version = parent.version + "+fabric-" + project.minecraft_version
 group = parent.group
 
 configurations {
-    shadow
-    compile.extendsFrom(shadow)
+    implementation.extendsFrom(shadow)
 }
 
 dependencies {
@@ -53,33 +52,30 @@ dependencies {
 processResources {
     inputs.property "version", project.version
 
-    from(sourceSets.main.resources.srcDirs) {
-        include "fabric.mod.json"
+    filesMatching("fabric.mod.json") {
         expand "version": project.version
     }
-
-    from(sourceSets.main.resources.srcDirs) {
-        exclude "fabric.mod.json"
-    }
 }
 
 // ensure that the encoding is set to UTF-8, no matter what the system default is
 // this fixes some edge cases with special characters not displaying correctly
 // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
 tasks.withType(JavaCompile) {
     options.encoding = "UTF-8"
+    options.release = 16
 }
 
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
-    from sourceSets.main.allSource
+java {
+    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+    // if it is present.
+    // If you remove this line, sources will not be generated.
+    withSourcesJar()
 }
 
 jar {
-    from "LICENSE"
+    from("LICENSE") {
+        rename { "${it}_${project.archivesBaseName}"}
+    }
     from {
         configurations.shadow.collect { file ->
             [
diff --git a/forge-1.15.2/build.gradle b/forge-1.15.2/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '4.1.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '4.1.3'
         classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
         classpath 'de.lolhens:java-mixin-stubber:0.0.2'
     }
@@ -98,15 +98,18 @@ minecraft {
 }
 
 configurations {
-    shadow
-    compile.extendsFrom(shadow)
+    implementation.extendsFrom(compile)
+    implementation.extendsFrom(shadow)
 }
 
 repositories {
     maven {
         url = 'https://minecraft.curseforge.com/api/maven/'
         metadataSources { artifact() }
     }
+    maven {
+        url = 'https://repo.spongepowered.org/repository/maven-public/'
+    }
 }
 
 dependencies {
@@ -115,9 +118,9 @@ dependencies {
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
     minecraft 'net.minecraftforge:forge:1.15.2-31.2.43'
 
-    annotationProcessor 'org.spongepowered:mixin:0.8.2:processor'
+    annotationProcessor 'org.spongepowered:mixin:0.8.3:processor'
 
-    implementation 'org.spongepowered:mixin:0.8'
+    implementation 'org.spongepowered:mixin:0.8.3'
     implementation "scalable-cats-force:ScalableCatsForce-2.13.2-build:2:dev"
     implementation "org.scala-lang:scala-library:2.13.6"
     implementation group: 'org.typelevel', name: "cats-core_2.13", version: '2.6.1'
diff --git a/forge-1.16.1/build.gradle b/forge-1.16.1/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '4.1.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '4.1.3'
         classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
         classpath 'de.lolhens:java-mixin-stubber:0.0.2'
     }
@@ -98,15 +98,18 @@ minecraft {
 }
 
 configurations {
-    shadow
-    compile.extendsFrom(shadow)
+    implementation.extendsFrom(compile)
+    implementation.extendsFrom(shadow)
 }
 
 repositories {
     maven {
         url = 'https://minecraft.curseforge.com/api/maven/'
         metadataSources { artifact() }
     }
+    maven {
+        url = 'https://repo.spongepowered.org/repository/maven-public/'
+    }
 }
 
 dependencies {
@@ -115,7 +118,7 @@ dependencies {
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
     minecraft 'net.minecraftforge:forge:1.16.1-32.0.108'
 
-    annotationProcessor 'org.spongepowered:mixin:0.8.2:processor'
+    annotationProcessor 'org.spongepowered:mixin:0.8.3:processor'
 
     implementation "scalable-cats-force:ScalableCatsForce-2.13.2-build:2:dev"
     implementation "org.scala-lang:scala-library:2.13.6"
diff --git a/forge-1.16.2/build.gradle b/forge-1.16.2/build.gradle
diff --git a/forge-1.16.4/build.gradle b/forge-1.16.4/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`mavenCentral()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '4.1.+', changing: true`
	`9`	`+ classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '4.1.3'`
`10`	`10`	`classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'`
`11`	`11`	`classpath 'de.lolhens:java-mixin-stubber:0.0.2'`
`12`	`12`	`}`
`@@ -98,15 +98,18 @@ minecraft {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`configurations {`
`101`		`- shadow`
`102`		`- compile.extendsFrom(shadow)`
	`101`	`+ implementation.extendsFrom(compile)`
	`102`	`+ implementation.extendsFrom(shadow)`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`repositories {`
`106`	`106`	`maven {`
`107`	`107`	`url = 'https://minecraft.curseforge.com/api/maven/'`
`108`	`108`	`metadataSources { artifact() }`
`109`	`109`	`}`
	`110`	`+ maven {`
	`111`	`+ url = 'https://repo.spongepowered.org/repository/maven-public/'`
	`112`	`+ }`
`110`	`113`	`}`
`111`	`114`
`112`	`115`	`dependencies {`
`@@ -115,7 +118,7 @@ dependencies {`
`115`	`118`	`// The userdev artifact is a special name and will get all sorts of transformations applied to it.`
`116`	`119`	`minecraft 'net.minecraftforge:forge:1.16.1-32.0.108'`
`117`	`120`
`118`		`- annotationProcessor 'org.spongepowered:mixin:0.8.2:processor'`
	`121`	`+ annotationProcessor 'org.spongepowered:mixin:0.8.3:processor'`
`119`	`122`
`120`	`123`	`implementation "scalable-cats-force:ScalableCatsForce-2.13.2-build:2:dev"`
`121`	`124`	`implementation "org.scala-lang:scala-library:2.13.6"`