feat: Setup project structure for 1.18

This commit is contained in:
NotMyFault 2021-11-30 00:16:19 +01:00
parent 0b45248b8c
commit 38130f701c
No known key found for this signature in database
GPG Key ID: 158F5701A6AAD00C
7 changed files with 44 additions and 13 deletions

View File

@ -8,14 +8,17 @@ plugins {
repositories { repositories {
mavenCentral() mavenCentral()
gradlePluginPortal() gradlePluginPortal()
maven {
name = "PaperMC"
url = uri("https://papermc.io/repo/repository/maven-public/")
}
maven { maven {
name = "EngineHub" name = "EngineHub"
url = uri("https://maven.enginehub.org/repo/") url = uri("https://maven.enginehub.org/repo/")
} }
maven {
name = "PaperMC"
url = uri("https://papermc.io/repo/repository/maven-public/")
content {
includeGroupByRegex("io\\.papermc\\..*")
}
}
} }
val properties = Properties().also { props -> val properties = Properties().also { props ->
@ -28,7 +31,7 @@ dependencies {
implementation(gradleApi()) implementation(gradleApi())
implementation("org.ajoberstar.grgit:grgit-gradle:4.1.0") implementation("org.ajoberstar.grgit:grgit-gradle:4.1.0")
implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.0") implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.0")
implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.2.0") implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.3.0-SNAPSHOT")
} }
kotlin { kotlin {

View File

@ -5,9 +5,7 @@ import org.gradle.kotlin.dsl.dependencies
// For specific version pinning, see // For specific version pinning, see
// https://papermc.io/repo/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/ // https://papermc.io/repo/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
fun Project.applyPaperweightAdapterConfiguration( fun Project.applyPaperweightAdapterConfiguration() {
paperVersion: String
) {
applyCommonConfiguration() applyCommonConfiguration()
apply(plugin = "java-library") apply(plugin = "java-library")
applyCommonJavaConfiguration( applyCommonJavaConfiguration(
@ -17,7 +15,6 @@ fun Project.applyPaperweightAdapterConfiguration(
apply(plugin = "io.papermc.paperweight.userdev") apply(plugin = "io.papermc.paperweight.userdev")
dependencies { dependencies {
paperDevBundle(paperVersion)
"implementation"(project(":worldedit-bukkit")) "implementation"(project(":worldedit-bukkit"))
} }

View File

@ -52,6 +52,7 @@ fun Project.applyLibrariesConfiguration() {
dependencies { dependencies {
exclude(dependency("com.google.guava:guava")) exclude(dependency("com.google.guava:guava"))
exclude(dependency("com.google.code.gson:gson")) exclude(dependency("com.google.code.gson:gson"))
exclude(dependency("com.google.errorprone:error_prone_annotations"))
exclude(dependency("org.checkerframework:checker-qual")) exclude(dependency("org.checkerframework:checker-qual"))
exclude(dependency("org.apache.logging.log4j:log4j-api")) exclude(dependency("org.apache.logging.log4j:log4j-api"))
exclude(dependency("com.google.code.findbugs:jsr305")) exclude(dependency("com.google.code.findbugs:jsr305"))

View File

@ -4,6 +4,7 @@ include("worldedit-libs")
include("worldedit-bukkit:adapters:adapter-legacy") include("worldedit-bukkit:adapters:adapter-legacy")
include("worldedit-bukkit:adapters:adapter-1_17_1") include("worldedit-bukkit:adapters:adapter-1_17_1")
include("worldedit-bukkit:adapters:adapter-1_18")
listOf("bukkit", "core", "cli").forEach { listOf("bukkit", "core", "cli").forEach {
include("worldedit-libs:$it") include("worldedit-libs:$it")

View File

@ -1,11 +1,19 @@
// TODO await https://github.com/PaperMC/paperweight/issues/116
//applyPaperweightAdapterConfiguration()
//
//dependencies {
// paperDevBundle("1.17.1-R0.1-20211120.192557-194")
//}
// Until the above issue is resolved, we are bundling old versions using their last assembled JAR.
// Technically this means we cannot really update them, but that is is the price we pay for supporting older versions.
plugins { plugins {
base
java java
} }
applyPaperweightAdapterConfiguration(
"1.17.1-R0.1-20211120.192557-194"
)
repositories { repositories {
maven { maven {
name = "PaperMC" name = "PaperMC"
@ -16,6 +24,10 @@ repositories {
} }
} }
artifacts {
add("default", file("./src/main/resources/worldedit-adapter-1.17.1.jar"))
}
dependencies { dependencies {
compileOnly(libs.paperlib) compileOnly(libs.paperlib)
} }

View File

@ -0,0 +1,17 @@
plugins {
java
}
applyPaperweightAdapterConfiguration()
repositories {
maven {
name = "PaperMC"
url = uri("https://papermc.io/repo/repository/maven-public/")
}
}
dependencies {
paperDevBundle("1.18-rc3-R0.1-SNAPSHOT")
compileOnly(libs.paperlib)
}