Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@
# we use maven!
/build.xml

# maven
# gradle out dir
/target

# vim
.*.sw[a-p]

# various other potential build files
/build
**/build/
/bin
/dist
/manifest.mf
Expand All @@ -33,6 +34,7 @@

*.log
/.gradle
**/.gradle
/fabric-1.16.1_client.launch
/fabric-1.16.1_server.launch
/fabric-1.16.2_client.launch
Expand Down
88 changes: 0 additions & 88 deletions DynmapCore/build.gradle

This file was deleted.

85 changes: 85 additions & 0 deletions DynmapCore/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar

plugins {
eclipse
}

eclipse {
project {
name = "Dynmap(DynmapCore)"
}
}

description = "DynmapCore"

tasks.named<JavaCompile>("compileJava") {
sourceCompatibility = "1.8"
targetCompatibility = "1.8"
}

dependencies {
implementation(project(":DynmapCoreAPI"))
implementation("javax.servlet:javax.servlet-api:3.1")
implementation("org.eclipse.jetty:jetty-server:9.4.26.v20200117")
implementation("org.eclipse.jetty:jetty-servlet:9.4.26.v20200117")
implementation("com.googlecode.json-simple:json-simple:1.1.1")
implementation("org.yaml:snakeyaml:1.23") // DON'T UPDATE - NEWER ONE TRIPS ON WINDOWS ENCODED FILES
implementation("com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20180219.1")
implementation("org.postgresql:postgresql:42.2.18")
implementation("io.github.linktosriram.s3lite:core:0.0.2-SNAPSHOT")
implementation("io.github.linktosriram.s3lite:api:0.0.2-SNAPSHOT")
implementation("io.github.linktosriram.s3lite:http-client-url-connection:0.0.2-SNAPSHOT")
implementation("io.github.linktosriram.s3lite:http-client-spi:0.0.2-SNAPSHOT")
implementation("io.github.linktosriram.s3lite:util:0.0.2-SNAPSHOT")
implementation("jakarta.xml.bind:jakarta.xml.bind-api:3.0.1")
implementation("com.sun.xml.bind:jaxb-impl:3.0.0")
}

tasks.named<Copy>("processResources") {
filesMatching(listOf("core.yml",
"lightings.txt",
"perspectives.txt",
"shaders.txt",
"extracted/web/version.js",
"extracted/web/index.html",
"extracted/web/login.html")) {
expand("buildNumber" to project.parent!!.ext["buildNumber"])
expand("version" to project.version)
}
}

tasks.named<ShadowJar>("shadowJar") {
dependencies {
include(dependency("com.googlecode.json-simple:json-simple:"))
include(dependency("org.yaml:snakeyaml:"))
include(dependency("com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:"))
include(dependency("javax.servlet::"))
include(dependency("org.eclipse.jetty::"))
include(dependency("org.eclipse.jetty.orbit:javax.servlet:"))
include(dependency("org.postgresql:postgresql:"))
include(dependency("io.github.linktosriram.s3lite:core:"))
include(dependency("io.github.linktosriram.s3lite:api:"))
include(dependency("io.github.linktosriram.s3lite:http-client-url-connection:"))
include(dependency("io.github.linktosriram.s3lite:http-client-spi:"))
include(dependency("io.github.linktosriram.s3lite:util:"))
include(dependency("jakarta.xml.bind::"))
include(dependency("com.sun.xml.bind::"))
include(dependency(":DynmapCoreAPI"))
exclude("META-INF/maven/**")
exclude("META-INF/services/**")
}
relocate("org.json.simple", "org.dynmap.json.simple")
relocate("org.yaml.snakeyaml", "org.dynmap.snakeyaml")
relocate("org.eclipse.jetty", "org.dynmap.jetty")
relocate("org.owasp.html", "org.dynmap.org.owasp.html")
relocate("javax.servlet", "org.dynmap.javax.servlet" )
relocate("org.postgresql", "org.dynmap.org.postgresql")
relocate("io.github.linktosriram.s3lite", "org.dynmap.s3lite")

destinationDirectory.set(File("../target"))
archiveClassifier.set("")
}

tasks.named("assemble").configure {
dependsOn("shadowJar")
}
27 changes: 0 additions & 27 deletions DynmapCoreAPI/build.gradle

This file was deleted.

26 changes: 26 additions & 0 deletions DynmapCoreAPI/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
plugins {
eclipse
}

eclipse {
project {
name = "Dynmap(DynmapCoreAPI)"
}
}

tasks.named<JavaCompile>("compileJava") {
sourceCompatibility = "1.8"
targetCompatibility = "1.8"
}

description = "DynmapCoreAPI"

tasks.withType<Jar>() {
destinationDirectory.set(File("../target"))
}

configure<PublishingExtension> {
publications.withType<MavenPublication>() {
from(components["java"])
}
}
72 changes: 0 additions & 72 deletions build.gradle

This file was deleted.

55 changes: 55 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
plugins {
id("com.gradleup.shadow") version "8.3.5"
id("java")
id("maven-publish")
id("io.papermc.paperweight.userdev") version "1.7.5" apply false
eclipse
}

eclipse {
project {
name = "Dynmap"
}
}

allprojects {
repositories {
mavenLocal()
mavenCentral()
maven { url = uri("https://libraries.minecraft.net/") }
maven { url = uri("https://oss.sonatype.org/content/repositories/releases") }
maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots") }
maven { url = uri("https://repo.mikeprimm.com") }
maven { url = uri("https://repo.maven.apache.org/maven2") }
maven { url = uri("https://papermc.io/repo/repository/maven-public/") }
maven { url = uri("https://repo.codemc.org/repository/maven-public/") }
}

apply(plugin = "java")

group = "us.dynmap"
version = "3.8-beta-1"
}

ext["buildNumber"] = System.getenv("BUILD_NUMBER") ?: "Dev"

subprojects {
apply(plugin = "com.gradleup.shadow")
apply(plugin = "java")
apply(plugin = "maven-publish")

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

tasks.withType<JavaCompile> {
options.encoding = "UTF-8"
}
}

tasks.named<Delete>("clean") {
delete("target")
}

tasks.register("setupCIWorkspace")
1 change: 0 additions & 1 deletion bukkit-helper-121/.gitignore

This file was deleted.

Loading