Move away from deprecation, move dependencies towards buildSrc

Dieser Commit ist enthalten in:
Kenzie Togami 2019-07-10 13:13:41 -07:00
Ursprung 59c2a15cda
Commit eccbad92e8
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 5D200B325E157A81
6 geänderte Dateien mit 46 neuen und 26 gelöschten Zeilen

Datei anzeigen

@ -1,8 +1,7 @@
plugins {
id 'net.minecrell.licenser' version '0.4.1' apply false
id "org.ajoberstar.grgit" version "3.1.1"
id "com.github.johnrengelman.shadow" version "5.1.0"
id "com.jfrog.artifactory" version "4.9.7"
id "org.ajoberstar.grgit"
id "com.github.johnrengelman.shadow"
id "com.jfrog.artifactory"
}
println """

32
buildSrc/build.gradle.kts Normale Datei
Datei anzeigen

@ -0,0 +1,32 @@
plugins {
`kotlin-dsl`
kotlin("jvm") version embeddedKotlinVersion
}
repositories {
jcenter()
gradlePluginPortal()
maven {
name = "Forge Maven"
url = uri("https://files.minecraftforge.net/maven")
}
}
configurations.all {
resolutionStrategy {
// Fabric needs this.
force("commons-io:commons-io:2.5", "org.ow2.asm:asm:7.1")
}
}
dependencies {
implementation(gradleApi())
implementation("gradle.plugin.net.minecrell:licenser:0.4.1")
implementation("org.ajoberstar.grgit:grgit-gradle:3.1.1")
implementation("com.github.jengelman.gradle.plugins:shadow:5.1.0")
implementation("net.ltgt.apt-eclipse:net.ltgt.apt-eclipse.gradle.plugin:0.21")
implementation("net.ltgt.apt-idea:net.ltgt.apt-idea.gradle.plugin:0.21")
implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.9.7")
implementation("gradle.plugin.org.spongepowered:spongegradle:0.9.0")
implementation("net.minecraftforge.gradle:ForgeGradle:3.0.130")
}

Datei anzeigen

@ -1,13 +1,11 @@
plugins {
id("net.ltgt.apt") version "0.21" apply false
id("java-library")
id("eclipse")
id("idea")
id("net.ltgt.apt-eclipse")
id("net.ltgt.apt-idea")
}
apply plugin: 'java-library'
apply plugin: 'eclipse'
apply plugin: 'idea'
apply plugin: 'net.ltgt.apt-eclipse'
apply plugin: 'net.ltgt.apt-idea'
configurations.all { Configuration it ->
it.resolutionStrategy { ResolutionStrategy rs ->
rs.force("com.google.guava:guava:21.0")

Datei anzeigen

@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
kotlin("jvm") version "1.3.31"
kotlin("jvm") version "1.3.41"
}
tasks.withType<KotlinCompile> {

Datei anzeigen

@ -77,7 +77,7 @@ jar {
}
shadowJar {
classifier = 'dist-dev'
archiveClassifier.set("dist-dev")
dependencies {
relocate "org.slf4j", "com.sk89q.worldedit.slf4j"
relocate "org.apache.logging.slf4j", "com.sk89q.worldedit.log4jbridge"
@ -89,7 +89,7 @@ shadowJar {
task deobfJar(type: Jar) {
from sourceSets.main.output
classifier = 'dev'
archiveClassifier.set("dev")
}
artifacts {
@ -97,8 +97,8 @@ artifacts {
}
task shadowJarRemap(type: RemapJarTask) {
input shadowJar.archivePath
output new File(shadowJar.archivePath.getAbsolutePath().replaceFirst('-dev\\.jar$', ".jar"))
input shadowJar.archiveFile
output new File(shadowJar.archiveFile.get().asFile.getAbsolutePath().replaceFirst('-dev\\.jar$', ".jar"))
}
shadowJarRemap.dependsOn(shadowJar)

Datei anzeigen

@ -1,14 +1,5 @@
buildscript {
repositories {
mavenCentral()
maven { url = "https://files.minecraftforge.net/maven" }
maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" }
jcenter()
}
}
plugins {
id 'org.spongepowered.plugin' version '0.9.0'
id("org.spongepowered.plugin")
}
repositories {