Merge pull request #3411 from kosma/gradle-7.1

Gradle 7.1
This commit is contained in:
mikeprimm 2021-06-27 16:32:58 -05:00 committed by GitHub
commit 6a8475d018
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 138 additions and 260 deletions

View File

@ -1,26 +1,27 @@
description = "DynmapCore"
dependencies {
compile project(path: ':DynmapCoreAPI', configuration: 'shadow')
compile 'javax.servlet:javax.servlet-api:3.1'
compile 'org.eclipse.jetty:jetty-server:9.4.26.v20200117'
compile 'org.eclipse.jetty:jetty-servlet:9.4.26.v20200117'
compile 'com.googlecode.json-simple:json-simple:1.1.1'
compile 'org.yaml:snakeyaml:1.23'
compile 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20180219.1'
compile 'org.postgresql:postgresql:42.2.18'
implementation project(path: ':DynmapCoreAPI', configuration: 'shadow')
implementation 'javax.servlet:javax.servlet-api:3.1'
implementation 'org.eclipse.jetty:jetty-server:9.4.26.v20200117'
implementation 'org.eclipse.jetty:jetty-servlet:9.4.26.v20200117'
implementation 'com.googlecode.json-simple:json-simple:1.1.1'
implementation 'org.yaml:snakeyaml:1.23'
implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20180219.1'
implementation 'org.postgresql:postgresql:42.2.18'
}
processResources {
// replace stuff in mcmod.info, nothing else
from('src/main/resources') {
include 'core.yml'
include 'lightings.txt'
include 'perspectives.txt'
include 'shaders.txt'
include 'extracted/web/version.js'
include 'extracted/web/index.html'
include 'extracted/web/login.html'
filesMatching([
'core.yml',
'lightings.txt',
'perspectives.txt',
'shaders.txt',
'extracted/web/version.js',
'extracted/web/index.html',
'extracted/web/login.html',
]) {
// replace version and mcversion
expand(
buildnumber: project.parent.ext.globals.buildNumber,

View File

@ -1,7 +1,6 @@
plugins {
id "com.github.johnrengelman.shadow" version "2.0.4"
id 'java'
id 'maven'
id 'maven-publish'
}
@ -32,7 +31,6 @@ ext {
subprojects {
apply plugin: "com.github.johnrengelman.shadow"
apply plugin: 'java'
apply plugin: 'maven'
apply plugin: 'maven-publish'
sourceCompatibility = 1.8

View File

@ -2,9 +2,9 @@
description = 'bukkit-helper-1.13.2'
dependencies {
compile project(':bukkit-helper')
compile project(':dynmap-api')
compile project(path: ':DynmapCore', configuration: 'shadow')
compile group: 'org.bukkit', name: 'bukkit', version:'1.13.2-R0.1-SNAPSHOT'
compile group: 'org.bukkit', name: 'craftbukkit', version:'1.13.2-R0.1-SNAPSHOT'
implementation project(':bukkit-helper')
implementation project(':dynmap-api')
implementation project(path: ':DynmapCore', configuration: 'shadow')
implementation group: 'org.bukkit', name: 'bukkit', version:'1.13.2-R0.1-SNAPSHOT'
implementation group: 'org.bukkit', name: 'craftbukkit', version:'1.13.2-R0.1-SNAPSHOT'
}

View File

@ -2,9 +2,9 @@
description = 'bukkit-helper-1.14.1'
dependencies {
compile project(':bukkit-helper')
compile project(':dynmap-api')
compile project(path: ':DynmapCore', configuration: 'shadow')
compile group: 'org.bukkit', name: 'bukkit', version:'1.14.1-R0.1-SNAPSHOT'
compile group: 'org.bukkit', name: 'craftbukkit', version:'1.14.1-R0.1-SNAPSHOT'
implementation project(':bukkit-helper')
implementation project(':dynmap-api')
implementation project(path: ':DynmapCore', configuration: 'shadow')
implementation group: 'org.bukkit', name: 'bukkit', version:'1.14.1-R0.1-SNAPSHOT'
implementation group: 'org.bukkit', name: 'craftbukkit', version:'1.14.1-R0.1-SNAPSHOT'
}

View File

@ -2,9 +2,9 @@
description = 'bukkit-helper-1.15'
dependencies {
compile project(':bukkit-helper')
compile project(':dynmap-api')
compile project(path: ':DynmapCore', configuration: 'shadow')
compile group: 'org.bukkit', name: 'bukkit', version:'1.15-R0.1-SNAPSHOT'
compile group: 'org.bukkit', name: 'craftbukkit', version:'1.15-R0.1-SNAPSHOT'
implementation project(':bukkit-helper')
implementation project(':dynmap-api')
implementation project(path: ':DynmapCore', configuration: 'shadow')
implementation group: 'org.bukkit', name: 'bukkit', version:'1.15-R0.1-SNAPSHOT'
implementation group: 'org.bukkit', name: 'craftbukkit', version:'1.15-R0.1-SNAPSHOT'
}

View File

@ -2,9 +2,9 @@
description = 'bukkit-helper-1.16'
dependencies {
compile project(':bukkit-helper')
compile project(':dynmap-api')
compile project(path: ':DynmapCore', configuration: 'shadow')
compile group: 'org.spigotmc', name: 'spigot-api', version:'1.16.2-R0.1-SNAPSHOT'
compile group: 'org.spigotmc', name: 'spigot', version:'1.16.2-R0.1-SNAPSHOT'
implementation project(':bukkit-helper')
implementation project(':dynmap-api')
implementation project(path: ':DynmapCore', configuration: 'shadow')
implementation group: 'org.spigotmc', name: 'spigot-api', version:'1.16.2-R0.1-SNAPSHOT'
implementation group: 'org.spigotmc', name: 'spigot', version:'1.16.2-R0.1-SNAPSHOT'
}

View File

@ -2,10 +2,10 @@
description = 'bukkit-helper-1.16.3'
dependencies {
compile project(':bukkit-helper')
compile project(':dynmap-api')
compile project(path: ':DynmapCore', configuration: 'shadow')
compile group: 'org.spigotmc', name: 'spigot-api', version:'1.16.3-R0.1-SNAPSHOT'
compile group: 'org.spigotmc', name: 'spigot', version:'1.16.3-R0.1-SNAPSHOT'
implementation project(':bukkit-helper')
implementation project(':dynmap-api')
implementation project(path: ':DynmapCore', configuration: 'shadow')
implementation group: 'org.spigotmc', name: 'spigot-api', version:'1.16.3-R0.1-SNAPSHOT'
implementation group: 'org.spigotmc', name: 'spigot', version:'1.16.3-R0.1-SNAPSHOT'
}

View File

@ -2,9 +2,9 @@
description = 'bukkit-helper-1.16.4'
dependencies {
compile project(':bukkit-helper')
compile project(':dynmap-api')
compile project(path: ':DynmapCore', configuration: 'shadow')
compile group: 'org.spigotmc', name: 'spigot-api', version:'1.16.4-R0.1-SNAPSHOT'
compile group: 'org.spigotmc', name: 'spigot', version:'1.16.4-R0.1-SNAPSHOT'
implementation project(':bukkit-helper')
implementation project(':dynmap-api')
implementation project(path: ':DynmapCore', configuration: 'shadow')
implementation group: 'org.spigotmc', name: 'spigot-api', version:'1.16.4-R0.1-SNAPSHOT'
implementation group: 'org.spigotmc', name: 'spigot', version:'1.16.4-R0.1-SNAPSHOT'
}

View File

@ -2,9 +2,9 @@
description = 'bukkit-helper-1.16'
dependencies {
compile project(':bukkit-helper')
compile project(':dynmap-api')
compile project(path: ':DynmapCore', configuration: 'shadow')
compile group: 'org.spigotmc', name: 'spigot-api', version:'1.16.1-R0.1-SNAPSHOT'
compile group: 'org.spigotmc', name: 'spigot', version:'1.16.1-R0.1-SNAPSHOT'
implementation project(':bukkit-helper')
implementation project(':dynmap-api')
implementation project(path: ':DynmapCore', configuration: 'shadow')
implementation group: 'org.spigotmc', name: 'spigot-api', version:'1.16.1-R0.1-SNAPSHOT'
implementation group: 'org.spigotmc', name: 'spigot', version:'1.16.1-R0.1-SNAPSHOT'
}

View File

@ -2,9 +2,9 @@
description = 'bukkit-helper-1.17'
dependencies {
compile project(':bukkit-helper')
compile project(':dynmap-api')
compile project(path: ':DynmapCore', configuration: 'shadow')
compile group: 'org.spigotmc', name: 'spigot-api', version:'1.17-R0.1-SNAPSHOT'
compile group: 'org.spigotmc', name: 'spigot', version:'1.17-R0.1-SNAPSHOT'
implementation project(':bukkit-helper')
implementation project(':dynmap-api')
implementation project(path: ':DynmapCore', configuration: 'shadow')
implementation group: 'org.spigotmc', name: 'spigot-api', version:'1.17-R0.1-SNAPSHOT'
implementation group: 'org.spigotmc', name: 'spigot', version:'1.17-R0.1-SNAPSHOT'
}

View File

@ -2,8 +2,8 @@
description = 'bukkit-helper'
dependencies {
compile project(':dynmap-api')
compile project(path: ':DynmapCore', configuration: 'shadow')
compile group: 'org.bukkit', name: 'bukkit', version:'1.7.10-R0.1-SNAPSHOT'
compile group: 'com.google.code.gson', name: 'gson', version:'2.8.2'
implementation project(':dynmap-api')
implementation project(path: ':DynmapCore', configuration: 'shadow')
implementation group: 'org.bukkit', name: 'bukkit', version:'1.7.10-R0.1-SNAPSHOT'
implementation group: 'com.google.code.gson', name: 'gson', version:'2.8.2'
}

View File

@ -2,8 +2,8 @@
description = "dynmap-api"
dependencies {
compile group: 'org.bukkit', name: 'bukkit', version:'1.7.10-R0.1-SNAPSHOT'
compile project(":DynmapCoreAPI")
implementation group: 'org.bukkit', name: 'bukkit', version:'1.7.10-R0.1-SNAPSHOT'
implementation project(":DynmapCoreAPI")
}
jar {

View File

@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.5.9'
classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.6-SNAPSHOT'
}
}
apply plugin: 'fabric-loom'
@ -33,7 +33,6 @@ dependencies {
compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
shadow project(path: ':DynmapCoreAPI', configuration: 'shadow')
shadow project(path: ':DynmapCore', configuration: 'shadow')
// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
@ -41,16 +40,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

View File

@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.5.9'
classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.6-SNAPSHOT'
}
}
apply plugin: 'fabric-loom'
@ -33,7 +33,6 @@ dependencies {
compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
shadow project(path: ':DynmapCoreAPI', configuration: 'shadow')
shadow project(path: ':DynmapCore', configuration: 'shadow')
// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
@ -41,16 +40,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

View File

@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.5.9'
classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.6-SNAPSHOT'
}
}
apply plugin: 'fabric-loom'
@ -33,7 +33,6 @@ dependencies {
compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
shadow project(path: ':DynmapCoreAPI', configuration: 'shadow')
shadow project(path: ':DynmapCore', configuration: 'shadow')
// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
@ -41,16 +40,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

View File

@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.5.9'
classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.6-SNAPSHOT'
}
}
apply plugin: 'fabric-loom'
@ -33,7 +33,6 @@ dependencies {
compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
shadow project(path: ':DynmapCoreAPI', configuration: 'shadow')
shadow project(path: ':DynmapCore', configuration: 'shadow')
// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
@ -41,16 +40,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

View File

@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.5.35'
classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.6-SNAPSHOT'
}
}
apply plugin: 'fabric-loom'
@ -33,7 +33,6 @@ dependencies {
compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
shadow project(path: ':DynmapCoreAPI', configuration: 'shadow')
shadow project(path: ':DynmapCore', configuration: 'shadow')
// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
@ -41,16 +40,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

View File

@ -16,10 +16,10 @@ apply plugin: 'net.minecraftforge.gradle.forge'
apply plugin: 'com.github.johnrengelman.shadow'
dependencies {
compile project(path: ":DynmapCore", configuration: "shadow")
compile 'com.googlecode.json-simple:json-simple:1.1.1'
compile 'org.yaml:snakeyaml:1.23'
compile 'org.spongepowered:spongeapi:7.0.0'
implementation project(path: ":DynmapCore", configuration: "shadow")
implementation 'com.googlecode.json-simple:json-simple:1.1.1'
implementation 'org.yaml:snakeyaml:1.23'
implementation 'org.spongepowered:spongeapi:7.0.0'
}
sourceCompatibility = 1.8

View File

@ -14,10 +14,10 @@ apply plugin: 'net.minecraftforge.gradle.forge'
apply plugin: 'com.github.johnrengelman.shadow'
dependencies {
compile project(path: ":DynmapCore", configuration: "shadow")
compile 'com.googlecode.json-simple:json-simple:1.1.1'
compile 'org.yaml:snakeyaml:1.23'
compile 'org.spongepowered:spongeapi:7.0.0'
implementation project(path: ":DynmapCore", configuration: "shadow")
implementation 'com.googlecode.json-simple:json-simple:1.1.1'
implementation 'org.yaml:snakeyaml:1.23'
implementation 'org.spongepowered:spongeapi:7.0.0'
}
sourceCompatibility = 1.8

View File

@ -7,7 +7,7 @@ buildscript {
maven {url = "https://oss.sonatype.org/content/repositories/snapshots/"}
}
dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true
}
}
@ -16,7 +16,7 @@ apply plugin: 'eclipse'
apply plugin: 'com.github.johnrengelman.shadow'
dependencies {
compile project(path: ":DynmapCore", configuration: "shadow")
implementation project(path: ":DynmapCore", configuration: "shadow")
minecraft 'net.minecraftforge:forge:1.13.2-25.0.219'
}
@ -37,23 +37,13 @@ project.archivesBaseName = "${project.archivesBaseName}-forge-1.13.2"
processResources
{
inputs.property "version", project.version + '-' + project.ext.buildNumber
// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'META-INF/mods.toml'
filesMatching('META-INF/mods.toml') {
// replace version and mcversion
expand(
version: project.version + '-' + project.ext.buildNumber,
mcversion: "1.13.2"
)
}
// copy everything else, thats not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'META-INF/mods.toml'
}
}
shadowJar {

View File

@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true
}
}
apply plugin: 'net.minecraftforge.gradle'
@ -29,29 +29,19 @@ minecraft {
project.archivesBaseName = "${project.archivesBaseName}-forge-1.14.4"
dependencies {
compile project(path: ":DynmapCore", configuration: "shadow")
implementation project(path: ":DynmapCore", configuration: "shadow")
minecraft 'net.minecraftforge:forge:1.14.4-28.2.10'
}
processResources
{
inputs.property "version", project.version + '-' + project.ext.buildNumber
// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'META-INF/mods.toml'
filesMatching('META-INF/mods.toml') {
// replace version and mcversion
expand(
version: project.version + '-' + project.ext.buildNumber,
mcversion: "1.14.4"
)
}
// copy everything else, thats not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'META-INF/mods.toml'
}
}
shadowJar {

View File

@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true
}
}
apply plugin: 'net.minecraftforge.gradle'
@ -29,29 +29,19 @@ minecraft {
project.archivesBaseName = "${project.archivesBaseName}-forge-1.15.2"
dependencies {
compile project(path: ":DynmapCore", configuration: "shadow")
implementation project(path: ":DynmapCore", configuration: "shadow")
minecraft 'net.minecraftforge:forge:1.15.2-31.2.3'
}
processResources
{
inputs.property "version", project.version + '-' + project.ext.buildNumber
// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'META-INF/mods.toml'
filesMatching('META-INF/mods.toml') {
// replace version and mcversion
expand(
version: project.version + '-' + project.ext.buildNumber,
mcversion: "1.15.2"
)
}
// copy everything else, thats not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'META-INF/mods.toml'
}
}
shadowJar {

View File

@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true
}
}
apply plugin: 'net.minecraftforge.gradle'
@ -29,29 +29,19 @@ minecraft {
project.archivesBaseName = "${project.archivesBaseName}-forge-1.16.1"
dependencies {
compile project(path: ":DynmapCore", configuration: "shadow")
implementation project(path: ":DynmapCore", configuration: "shadow")
minecraft 'net.minecraftforge:forge:1.16.1-32.0.106'
}
processResources
{
inputs.property "version", project.version + '-' + project.ext.buildNumber
// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'META-INF/mods.toml'
filesMatching('META-INF/mods.toml') {
// replace version and mcversion
expand(
version: project.version + '-' + project.ext.buildNumber,
mcversion: "1.16.1"
)
}
// copy everything else, thats not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'META-INF/mods.toml'
}
}
shadowJar {

View File

@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true
}
}
apply plugin: 'net.minecraftforge.gradle'
@ -29,29 +29,19 @@ minecraft {
project.archivesBaseName = "${project.archivesBaseName}-forge-1.16.2"
dependencies {
compile project(path: ":DynmapCore", configuration: "shadow")
implementation project(path: ":DynmapCore", configuration: "shadow")
minecraft 'net.minecraftforge:forge:1.16.2-33.0.5'
}
processResources
{
inputs.property "version", project.version + '-' + project.ext.buildNumber
// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'META-INF/mods.toml'
filesMatching('META-INF/mods.toml') {
// replace version and mcversion
expand(
version: project.version + '-' + project.ext.buildNumber,
mcversion: "1.16.2"
)
}
// copy everything else, thats not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'META-INF/mods.toml'
}
}
shadowJar {

View File

@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true
}
}
apply plugin: 'net.minecraftforge.gradle'
@ -29,29 +29,19 @@ minecraft {
project.archivesBaseName = "${project.archivesBaseName}-forge-1.16.3"
dependencies {
compile project(path: ":DynmapCore", configuration: "shadow")
implementation project(path: ":DynmapCore", configuration: "shadow")
minecraft 'net.minecraftforge:forge:1.16.3-34.1.19'
}
processResources
{
inputs.property "version", project.version + '-' + project.ext.buildNumber
// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'META-INF/mods.toml'
filesMatching('META-INF/mods.toml') {
// replace version and mcversion
expand(
version: project.version + '-' + project.ext.buildNumber,
mcversion: "1.16.3"
)
}
// copy everything else, thats not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'META-INF/mods.toml'
}
}
shadowJar {

View File

@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true
}
}
apply plugin: 'net.minecraftforge.gradle'
@ -29,29 +29,19 @@ minecraft {
project.archivesBaseName = "${project.archivesBaseName}-forge-1.16.4"
dependencies {
compile project(path: ":DynmapCore", configuration: "shadow")
implementation project(path: ":DynmapCore", configuration: "shadow")
minecraft 'net.minecraftforge:forge:1.16.4-35.1.36'
}
processResources
{
inputs.property "version", project.version + '-' + project.ext.buildNumber
// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'META-INF/mods.toml'
filesMatching('META-INF/mods.toml') {
// replace version and mcversion
expand(
version: project.version + '-' + project.ext.buildNumber,
mcversion: "1.16.4"
)
}
// copy everything else, thats not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'META-INF/mods.toml'
}
}
shadowJar {

View File

@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true
}
}
apply plugin: 'net.minecraftforge.gradle'
@ -29,29 +29,19 @@ minecraft {
project.archivesBaseName = "${project.archivesBaseName}-forge-1.16.5"
dependencies {
compile project(path: ":DynmapCore", configuration: "shadow")
implementation project(path: ":DynmapCore", configuration: "shadow")
minecraft 'net.minecraftforge:forge:1.16.5-36.0.15'
}
processResources
{
inputs.property "version", project.version + '-' + project.ext.buildNumber
// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'META-INF/mods.toml'
filesMatching('META-INF/mods.toml') {
// replace version and mcversion
expand(
version: project.version + '-' + project.ext.buildNumber,
mcversion: "1.16.5"
)
}
// copy everything else, thats not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'META-INF/mods.toml'
}
}
shadowJar {

Binary file not shown.

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

View File

@ -17,14 +17,14 @@ include ':fabric-1.16.2'
include ':fabric-1.16.1'
include ':fabric-1.15.2'
include ':fabric-1.14.4'
//include ':forge-1.16.5'
//include ':forge-1.16.4'
//include ':forge-1.16.3'
//include ':forge-1.16.2'
//include ':forge-1.16.1'
//include ':forge-1.15.2'
//include ':forge-1.14.4'
//include ':forge-1.13.2'
include ':forge-1.16.5'
include ':forge-1.16.4'
include ':forge-1.16.3'
include ':forge-1.16.2'
include ':forge-1.16.1'
include ':forge-1.15.2'
include ':forge-1.14.4'
include ':forge-1.13.2'
//include ':forge-1.12.2'
//include ':forge-1.11.2'
@ -46,14 +46,14 @@ project(':fabric-1.16.2').projectDir = "$rootDir/fabric-1.16.2" as File
project(':fabric-1.16.1').projectDir = "$rootDir/fabric-1.16.1" as File
project(':fabric-1.15.2').projectDir = "$rootDir/fabric-1.15.2" as File
project(':fabric-1.14.4').projectDir = "$rootDir/fabric-1.14.4" as File
//project(':forge-1.16.5').projectDir = "$rootDir/forge-1.16.5" as File
//project(':forge-1.16.4').projectDir = "$rootDir/forge-1.16.4" as File
//project(':forge-1.16.3').projectDir = "$rootDir/forge-1.16.3" as File
//project(':forge-1.16.2').projectDir = "$rootDir/forge-1.16.2" as File
//project(':forge-1.16.1').projectDir = "$rootDir/forge-1.16.1" as File
//project(':forge-1.15.2').projectDir = "$rootDir/forge-1.15.2" as File
//project(':forge-1.14.4').projectDir = "$rootDir/forge-1.14.4" as File
//project(':forge-1.13.2').projectDir = "$rootDir/forge-1.13.2" as File
project(':forge-1.16.5').projectDir = "$rootDir/forge-1.16.5" as File
project(':forge-1.16.4').projectDir = "$rootDir/forge-1.16.4" as File
project(':forge-1.16.3').projectDir = "$rootDir/forge-1.16.3" as File
project(':forge-1.16.2').projectDir = "$rootDir/forge-1.16.2" as File
project(':forge-1.16.1').projectDir = "$rootDir/forge-1.16.1" as File
project(':forge-1.15.2').projectDir = "$rootDir/forge-1.15.2" as File
project(':forge-1.14.4').projectDir = "$rootDir/forge-1.14.4" as File
project(':forge-1.13.2').projectDir = "$rootDir/forge-1.13.2" as File
//project(':forge-1.12.2').projectDir = "$rootDir/forge-1.12.2" as File
//project(':forge-1.11.2').projectDir = "$rootDir/forge-1.11.2" as File

View File

@ -10,22 +10,22 @@ repositories {
}
dependencies {
compile group: 'org.bukkit', name: 'bukkit', version: '1.7.10-R0.1-SNAPSHOT'
compile 'com.nijikokun.bukkit:Permissions:3.1.6'
compile 'me.lucko.luckperms:luckperms-api:4.3'
compile 'net.luckperms:api:5.0'
compile('com.github.MilkBowl:VaultAPI:1.7') { transitive = false }
implementation group: 'org.bukkit', name: 'bukkit', version: '1.7.10-R0.1-SNAPSHOT'
implementation 'com.nijikokun.bukkit:Permissions:3.1.6'
implementation 'me.lucko.luckperms:luckperms-api:4.3'
implementation 'net.luckperms:api:5.0'
implementation('com.github.MilkBowl:VaultAPI:1.7') { transitive = false }
compileOnly 'net.skinsrestorer:skinsrestorer:14.1.0-SNAPSHOT@jar'
compile project(":dynmap-api")
compile project(path: ":DynmapCore", configuration: "shadow")
compile group: 'ru.tehkode', name: 'PermissionsEx', version: '1.19.1'
compile group: 'de.bananaco', name: 'bPermissions', version: '2.9.1'
compile group: 'com.platymuus.bukkit.permissions', name: 'PermissionsBukkit', version: '1.6'
compile group: 'org.anjocaido', name: 'EssentialsGroupManager', version: '2.10.1'
compile group: 'org.bstats', name: 'bstats-bukkit', version: '1.5'
compile group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
compile group: 'com.google.code.gson', name: 'gson', version: '2.8.2'
compile project(':bukkit-helper')
implementation project(":dynmap-api")
implementation project(path: ":DynmapCore", configuration: "shadow")
implementation group: 'ru.tehkode', name: 'PermissionsEx', version: '1.19.1'
implementation group: 'de.bananaco', name: 'bPermissions', version: '2.9.1'
implementation group: 'com.platymuus.bukkit.permissions', name: 'PermissionsBukkit', version: '1.6'
implementation group: 'org.anjocaido', name: 'EssentialsGroupManager', version: '2.10.1'
implementation group: 'org.bstats', name: 'bstats-bukkit', version: '1.5'
implementation group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.2'
implementation project(':bukkit-helper')
implementation(project(':bukkit-helper-113-2')) {
transitive = false
}
@ -54,8 +54,7 @@ dependencies {
processResources {
// replace stuff in mcmod.info, nothing else
from('src/main/resources') {
include "plugin.yml"
filesMatching('plugin.yml') {
// replace version and mcversion
expand(
buildnumber: project.parent.ext.globals.buildNumber,