From 2f2dec233f123c1433fb2b8e28b84eefe34381b6 Mon Sep 17 00:00:00 2001 From: Phillipp Glanz <6745190+TheMeinerLP@users.noreply.github.com> Date: Thu, 23 May 2024 07:10:21 +0200 Subject: [PATCH] Move miss landed classes after patching source --- .../microtus/ExtensionPlugin.kt | 0 .../microtus/GenerateExtension.kt | 0 .../microtus/models/Extension.kt | 0 .../minestom.common-conventions.gradle.kts | 28 ------------- .../minestom.native-conventions.gradle.kts | 14 ------- ...minestom.publishing-conventions.gradle.kts | 40 ------------------- 6 files changed, 82 deletions(-) rename {src => extension/src}/main/kotlin/net/onelitefeather/microtus/ExtensionPlugin.kt (100%) rename {src => extension/src}/main/kotlin/net/onelitefeather/microtus/GenerateExtension.kt (100%) rename {src => extension/src}/main/kotlin/net/onelitefeather/microtus/models/Extension.kt (100%) delete mode 100644 src/main/kotlin/minestom.common-conventions.gradle.kts delete mode 100644 src/main/kotlin/minestom.native-conventions.gradle.kts delete mode 100644 src/main/kotlin/minestom.publishing-conventions.gradle.kts diff --git a/src/main/kotlin/net/onelitefeather/microtus/ExtensionPlugin.kt b/extension/src/main/kotlin/net/onelitefeather/microtus/ExtensionPlugin.kt similarity index 100% rename from src/main/kotlin/net/onelitefeather/microtus/ExtensionPlugin.kt rename to extension/src/main/kotlin/net/onelitefeather/microtus/ExtensionPlugin.kt diff --git a/src/main/kotlin/net/onelitefeather/microtus/GenerateExtension.kt b/extension/src/main/kotlin/net/onelitefeather/microtus/GenerateExtension.kt similarity index 100% rename from src/main/kotlin/net/onelitefeather/microtus/GenerateExtension.kt rename to extension/src/main/kotlin/net/onelitefeather/microtus/GenerateExtension.kt diff --git a/src/main/kotlin/net/onelitefeather/microtus/models/Extension.kt b/extension/src/main/kotlin/net/onelitefeather/microtus/models/Extension.kt similarity index 100% rename from src/main/kotlin/net/onelitefeather/microtus/models/Extension.kt rename to extension/src/main/kotlin/net/onelitefeather/microtus/models/Extension.kt diff --git a/src/main/kotlin/minestom.common-conventions.gradle.kts b/src/main/kotlin/minestom.common-conventions.gradle.kts deleted file mode 100644 index 6c56062ffab..00000000000 --- a/src/main/kotlin/minestom.common-conventions.gradle.kts +++ /dev/null @@ -1,28 +0,0 @@ -plugins { - java -} - -// Always exclude checker-qual. This is the single most annoying thing that always reappears. -configurations.all { - // We only use Jetbrains Annotations - exclude("org.checkerframework", "checker-qual") -} - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) - } -} - -tasks { - withType { - // We are fully aware, that we should be suppressing these instead of ignoring them here, but man keep my terminal clean. - options.compilerArgs.addAll(listOf("-Xlint:none", "-Xlint:-deprecation", "-Xlint:-unchecked")) - } - withType { - useJUnitPlatform() - // Viewable packets make tracking harder. Could be re-enabled later. - jvmArgs("-Dminestom.viewable-packet=false") - jvmArgs("-Dminestom.inside-test=true") - } -} \ No newline at end of file diff --git a/src/main/kotlin/minestom.native-conventions.gradle.kts b/src/main/kotlin/minestom.native-conventions.gradle.kts deleted file mode 100644 index 4a873e818bb..00000000000 --- a/src/main/kotlin/minestom.native-conventions.gradle.kts +++ /dev/null @@ -1,14 +0,0 @@ -plugins { - id("minestom.common-conventions") - id("org.graalvm.buildtools.native") -} - -graalvmNative { - binaries { - named("main") { - buildArgs.add("--allow-incomplete-classpath") - // One day toolchains will support getting this automagically, but that day is not today. - toolchainDetection.set(false) - } - } -} \ No newline at end of file diff --git a/src/main/kotlin/minestom.publishing-conventions.gradle.kts b/src/main/kotlin/minestom.publishing-conventions.gradle.kts deleted file mode 100644 index 305dd158be3..00000000000 --- a/src/main/kotlin/minestom.publishing-conventions.gradle.kts +++ /dev/null @@ -1,40 +0,0 @@ -plugins { - id("net.kyori.indra") - id("net.kyori.indra.publishing") - id("net.kyori.indra.publishing.sonatype") - id("io.github.gradle-nexus.publish-plugin") -} - -indra { - javaVersions { - target(21) - testWith(21) - } - - github("OneLiteFeatherNET", "Microtus") { - ci(true) - publishing(false) - } - mitLicense() - signWithKeyFromPrefixedProperties("onelitefeather") - configurePublications { - pom { - developers { - developer { - id.set("themeinerlp") - name.set("Phillipp Glanz") - email.set("p.glanz@madfix.me") - } - developer { - id.set("theEvilReaper") - name.set("Steffen Wonning") - email.set("steffenwx@gmail.com") - } - } - } - } -} - -indraSonatype { - useAlternateSonatypeOSSHost("s01") -} \ No newline at end of file