From 189936ecd2fbeba1ef2c7232606b966ad0aea1bb Mon Sep 17 00:00:00 2001 From: KennyTV Date: Wed, 24 Feb 2021 14:24:06 +0100 Subject: [PATCH] Make it build:tm: --- build.gradle.kts | 65 +++++++++++++++++++++++--------------- buildSrc/build.gradle.kts | 2 -- universal/build.gradle.kts | 8 ----- 3 files changed, 40 insertions(+), 35 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8ea307f2..ac9097cc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,22 +1,19 @@ -import net.kyori.indra.IndraPlugin -import net.kyori.indra.IndraPublishingPlugin -import net.kyori.indra.sonatypeSnapshots +import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin plugins { `java-library` `maven-publish` - id("net.kyori.indra") } -group = "com.viaversion" -version = "3.3.0-21w07a" -description = "Allow older clients to join newer server versions." +allprojects { + group = "com.viaversion" + version = "3.3.0-21w07a" + description = "Allow older clients to join newer server versions." +} subprojects { apply() apply() - apply() - apply() tasks { // Variable replacements @@ -27,7 +24,11 @@ subprojects { "url" to "https://github.com/ViaVersion/ViaBackwards") } } + withType { + options.encoding = Charsets.UTF_8.name() + } withType { + options.encoding = Charsets.UTF_8.name() options.compilerArgs.addAll(listOf("-nowarn", "-Xlint:-unchecked", "-Xlint:-deprecation")) } } @@ -42,9 +43,12 @@ subprojects { if (platforms.contains(project.name)) { configureShadowJar() } + if (project.name == "viabackwards") { + apply() + } repositories { - sonatypeSnapshots() + maven("https://oss.sonatype.org/content/repositories/snapshots/") maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots") maven("https://nexus.velocitypowered.com/repository/velocity-artifacts-snapshots/") maven("https://repo.spongepowered.org/maven") @@ -53,23 +57,34 @@ subprojects { mavenLocal() } - indra { - javaVersions { - target.set(8) - testWith(8, 11, 15) - } - github("ViaVersion", "ViaBackwards") { - issues = true - } - mitLicense() + java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + withSourcesJar() + withJavadocJar() } - publishing.repositories.maven { - name = "Via" - url = uri("https://repo.viaversion.com/") - credentials(PasswordCredentials::class) - authentication { - create("basic") + publishing { + publications { + create("mavenJava") { + groupId = rootProject.group as String + artifactId = project.name + version = rootProject.version as String + + if (plugins.hasPlugin(ShadowPlugin::class.java)) { + artifact(tasks["shadowJar"]) + } else { + from(components["java"]) + } + } + } + repositories.maven { + name = "Via" + url = uri("https://repo.viaversion.com/") + credentials(PasswordCredentials::class) + authentication { + create("basic") + } } } } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 3b0f9bc2..7f236a57 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -7,7 +7,5 @@ repositories { } dependencies { - implementation("net.kyori", "indra-common", "1.3.1") - implementation("net.kyori", "indra-publishing-gradle-plugin", "1.3.1") implementation("com.github.jengelman.gradle.plugins", "shadow", "6.1.0") } \ No newline at end of file diff --git a/universal/build.gradle.kts b/universal/build.gradle.kts index b4456ddc..a3cfb268 100644 --- a/universal/build.gradle.kts +++ b/universal/build.gradle.kts @@ -1,8 +1,5 @@ -import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar -apply() - tasks { withType { archiveClassifier.set("") @@ -25,9 +22,4 @@ tasks { build { dependsOn(withType()) } - withType { - if (name == "jar") { - archiveClassifier.set("unshaded") - } - } }