mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2024-11-24 22:26:46 +01:00
Move mcmmo into submodule
Goal will be to slowly move out the bukkit* dependencies from -core, but, we have our starting point
This commit is contained in:
parent
3700128b21
commit
83373275f7
@ -1,9 +1,8 @@
|
|||||||
import org.apache.tools.ant.filters.ReplaceTokens
|
subprojects {
|
||||||
|
apply(plugin = "java-library")
|
||||||
|
// Java is not explicitly needed, but keeps IJ happy with the tasks block
|
||||||
|
apply(plugin = "java")
|
||||||
|
|
||||||
plugins {
|
|
||||||
`java-library`
|
|
||||||
id("com.github.johnrengelman.shadow") version "5.1.0"
|
|
||||||
}
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenLocal()
|
mavenLocal()
|
||||||
maven("https://repo.spongepowered.org/maven")
|
maven("https://repo.spongepowered.org/maven")
|
||||||
@ -17,49 +16,11 @@ tasks {
|
|||||||
withType(JavaCompile::class.java) {
|
withType(JavaCompile::class.java) {
|
||||||
options.encoding = "UTF-8"
|
options.encoding = "UTF-8"
|
||||||
}
|
}
|
||||||
|
|
||||||
shadowJar {
|
|
||||||
dependencies {
|
|
||||||
include(dependency("org.spongepowered:configurate-yaml"))
|
|
||||||
include(dependency("org.spongepowered:configurate-hocon"))
|
|
||||||
include(dependency("org.spongepowered:configurate-core"))
|
|
||||||
include(dependency("org.bstats:bstats-bukkit"))
|
|
||||||
include(dependency("org.apache.tomcat:tomcat-jdbc"))
|
|
||||||
include(dependency("org.apache.tomcat:tomcat-juli"))
|
|
||||||
include(dependency("com.typesafe:config"))
|
|
||||||
exclude(dependency("org.spigotmc:spigot"))
|
|
||||||
}
|
|
||||||
relocate("org.apache.commons.logging", "com.gmail.nossr50.commons.logging")
|
|
||||||
relocate("org.apache.juli", "com.gmail.nossr50.database.tomcat.juli")
|
|
||||||
relocate("org.apache.tomcat", "com.gmail.nossr50.database.tomcat")
|
|
||||||
relocate("org.bstats", "com.gmail.nossr50.metrics.bstat")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
processResources {
|
configure<JavaPluginConvention> {
|
||||||
filter<ReplaceTokens>("tokens" to mapOf("project.version" to project.version))
|
|
||||||
filesMatching("**/locales/*") {
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
java {
|
|
||||||
targetCompatibility = JavaVersion.VERSION_1_8
|
targetCompatibility = JavaVersion.VERSION_1_8
|
||||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
|
||||||
api("org.apache.tomcat:tomcat-jdbc:7.0.52")
|
|
||||||
api("com.typesafe:config:1.3.2")
|
|
||||||
api("org.spongepowered:configurate-core:3.7-SNAPSHOT")
|
|
||||||
api("org.spongepowered:configurate-yaml:3.7-SNAPSHOT")
|
|
||||||
api("org.spongepowered:configurate-hocon:3.7-SNAPSHOT")
|
|
||||||
implementation("org.jetbrains:annotations:17.0.0")
|
|
||||||
implementation("org.apache.maven.scm:maven-scm-provider-gitexe:1.8.1")
|
|
||||||
implementation("org.bstats:bstats-bukkit:1.4")
|
|
||||||
implementation("org.spigotmc:spigot:1.14.4-R0.1-SNAPSHOT")
|
|
||||||
implementation("com.sk89q.worldguard:worldguard-legacy:7.0.0-SNAPSHOT")
|
|
||||||
testImplementation("junit:junit:4.10")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
5
gradle/wrapper/gradle-wrapper.properties
vendored
5
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,5 +1,6 @@
|
|||||||
|
#Mon Sep 30 20:08:33 BST 2019
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
|
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
50
mcmmo-core/build.gradle.kts
Normal file
50
mcmmo-core/build.gradle.kts
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
import org.apache.tools.ant.filters.ReplaceTokens
|
||||||
|
|
||||||
|
plugins {
|
||||||
|
`java-library`
|
||||||
|
id("com.github.johnrengelman.shadow") version "5.1.0"
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks {
|
||||||
|
|
||||||
|
shadowJar {
|
||||||
|
dependencies {
|
||||||
|
include(dependency("org.spongepowered:configurate-yaml"))
|
||||||
|
include(dependency("org.spongepowered:configurate-hocon"))
|
||||||
|
include(dependency("org.spongepowered:configurate-core"))
|
||||||
|
include(dependency("org.bstats:bstats-bukkit"))
|
||||||
|
include(dependency("org.apache.tomcat:tomcat-jdbc"))
|
||||||
|
include(dependency("org.apache.tomcat:tomcat-juli"))
|
||||||
|
include(dependency("com.typesafe:config"))
|
||||||
|
exclude(dependency("org.spigotmc:spigot"))
|
||||||
|
}
|
||||||
|
relocate("org.apache.commons.logging", "com.gmail.nossr50.commons.logging")
|
||||||
|
relocate("org.apache.juli", "com.gmail.nossr50.database.tomcat.juli")
|
||||||
|
relocate("org.apache.tomcat", "com.gmail.nossr50.database.tomcat")
|
||||||
|
relocate("org.bstats", "com.gmail.nossr50.metrics.bstat")
|
||||||
|
}
|
||||||
|
|
||||||
|
processResources {
|
||||||
|
filter<ReplaceTokens>("tokens" to mapOf("project.version" to project.version))
|
||||||
|
filesMatching("**/locales/*") {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
api("org.apache.tomcat:tomcat-jdbc:7.0.52")
|
||||||
|
api("com.typesafe:config:1.3.2")
|
||||||
|
api("org.spongepowered:configurate-core:3.7-SNAPSHOT")
|
||||||
|
api("org.spongepowered:configurate-yaml:3.7-SNAPSHOT")
|
||||||
|
api("org.spongepowered:configurate-hocon:3.7-SNAPSHOT")
|
||||||
|
implementation("org.jetbrains:annotations:17.0.0")
|
||||||
|
implementation("org.apache.maven.scm:maven-scm-provider-gitexe:1.8.1")
|
||||||
|
implementation("org.bstats:bstats-bukkit:1.4")
|
||||||
|
implementation("org.spigotmc:spigot:1.14.4-R0.1-SNAPSHOT")
|
||||||
|
implementation("com.sk89q.worldguard:worldguard-legacy:7.0.0-SNAPSHOT")
|
||||||
|
testImplementation("junit:junit:4.10")
|
||||||
|
}
|
||||||
|
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user