From 02ec59b72d837704a424fd851b1926618802c1fb Mon Sep 17 00:00:00 2001 From: Kosma Moczek Date: Sun, 27 Jun 2021 15:58:26 +0200 Subject: [PATCH] fabric-*: update processResources to Gradle 7 --- fabric-1.14.4/build.gradle | 9 +-------- fabric-1.15.2/build.gradle | 9 +-------- fabric-1.16.1/build.gradle | 9 +-------- fabric-1.16.2/build.gradle | 9 +-------- fabric-1.16.4/build.gradle | 9 +-------- 5 files changed, 5 insertions(+), 40 deletions(-) diff --git a/fabric-1.14.4/build.gradle b/fabric-1.14.4/build.gradle index d14a8a05..f5733ef5 100644 --- a/fabric-1.14.4/build.gradle +++ b/fabric-1.14.4/build.gradle @@ -41,16 +41,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 diff --git a/fabric-1.15.2/build.gradle b/fabric-1.15.2/build.gradle index d14a8a05..f5733ef5 100644 --- a/fabric-1.15.2/build.gradle +++ b/fabric-1.15.2/build.gradle @@ -41,16 +41,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 diff --git a/fabric-1.16.1/build.gradle b/fabric-1.16.1/build.gradle index d14a8a05..f5733ef5 100644 --- a/fabric-1.16.1/build.gradle +++ b/fabric-1.16.1/build.gradle @@ -41,16 +41,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 diff --git a/fabric-1.16.2/build.gradle b/fabric-1.16.2/build.gradle index d14a8a05..f5733ef5 100644 --- a/fabric-1.16.2/build.gradle +++ b/fabric-1.16.2/build.gradle @@ -41,16 +41,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 diff --git a/fabric-1.16.4/build.gradle b/fabric-1.16.4/build.gradle index d14a8a05..f5733ef5 100644 --- a/fabric-1.16.4/build.gradle +++ b/fabric-1.16.4/build.gradle @@ -41,16 +41,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