Remove common lib & use Eden modules
This commit is contained in:
@@ -1,41 +0,0 @@
|
|||||||
import java.util.Locale
|
|
||||||
import java.net.URI
|
|
||||||
|
|
||||||
plugins {
|
|
||||||
`maven-publish`
|
|
||||||
}
|
|
||||||
|
|
||||||
java {
|
|
||||||
withSourcesJar()
|
|
||||||
withJavadocJar()
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
val annotations = "org.jetbrains:annotations:21.0.1"
|
|
||||||
compileOnly(annotations)
|
|
||||||
testCompileOnly(annotations)
|
|
||||||
}
|
|
||||||
|
|
||||||
configure<PublishingExtension> {
|
|
||||||
publications.create<MavenPublication>("maven") {
|
|
||||||
from(components["java"])
|
|
||||||
groupId = project.group as String?
|
|
||||||
artifactId = "Parchment-Common"
|
|
||||||
version = "1.17-R0.1-SNAPSHOT"
|
|
||||||
|
|
||||||
pom {
|
|
||||||
name.set(project.name)
|
|
||||||
description.set("Common annotations for Parchment and other software")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
maven {
|
|
||||||
credentials {
|
|
||||||
username = properties["edenusr"] as String?
|
|
||||||
password = properties["edenpwd"] as String?
|
|
||||||
}
|
|
||||||
url = URI.create("https://sonatype.projecteden.gg/repository/maven-snapshots/")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
package gg.projecteden.common;
|
|
||||||
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
|
||||||
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Represents an object that has a {@link UUID}
|
|
||||||
*/
|
|
||||||
public interface HasUniqueId extends OptionalUniqueId {
|
|
||||||
/**
|
|
||||||
* Returns a unique and persistent id for this object
|
|
||||||
*
|
|
||||||
* @return unique id
|
|
||||||
*/
|
|
||||||
@NotNull UUID getUniqueId(); // named getUniqueId to maintain compatibility with Bukkit
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
package gg.projecteden.common;
|
|
||||||
|
|
||||||
import org.jetbrains.annotations.Nullable;
|
|
||||||
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Represents an object that may have a {@link UUID}
|
|
||||||
*/
|
|
||||||
public interface OptionalUniqueId {
|
|
||||||
/**
|
|
||||||
* Returns a unique and persistent id for this object which may be null
|
|
||||||
*
|
|
||||||
* @return unique id or null
|
|
||||||
*/
|
|
||||||
@Nullable UUID getUniqueId(); // named getUniqueId to maintain compatibility with Bukkit
|
|
||||||
}
|
|
||||||
@@ -46,6 +46,7 @@ subprojects {
|
|||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven("https://papermc.io/repo/repository/maven-public/")
|
maven("https://papermc.io/repo/repository/maven-public/")
|
||||||
|
maven("https://sonatype.projecteden.gg/repository/maven-public/")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ index a23b2bd8e1ca1ff8d0ad5ed5d5e41c89e4795090..590754921a6c7de54fa79d0a15c95a96
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
+ api(project(":Parchment-Common")) // Parchment
|
+ api("gg.projecteden:eden-common:2.0.0-SNAPSHOT") // Parchment
|
||||||
// api dependencies are listed transitively to API consumers
|
// api dependencies are listed transitively to API consumers
|
||||||
api("commons-lang:commons-lang:2.6")
|
api("commons-lang:commons-lang:2.6")
|
||||||
api("com.google.guava:guava:31.0.1-jre")
|
api("com.google.guava:guava:31.0.1-jre")
|
||||||
|
|||||||
@@ -7,4 +7,4 @@ pluginManagement {
|
|||||||
|
|
||||||
rootProject.name = "Parchment"
|
rootProject.name = "Parchment"
|
||||||
|
|
||||||
include("Parchment-Common", "Parchment-API", "Parchment-Server")
|
include("Parchment-API", "Parchment-Server")
|
||||||
|
|||||||
Reference in New Issue
Block a user