mirror of
https://github.com/GeyserMC/Geyser.git
synced 2024-08-14 23:57:35 +00:00
Cleanup buildscript, add github actions
This commit is contained in:
parent
5a805bc688
commit
7bf9b92cbb
4 changed files with 13 additions and 25 deletions
7
.github/workflows/pullrequest.yml
vendored
7
.github/workflows/pullrequest.yml
vendored
|
@ -19,6 +19,13 @@ jobs:
|
||||||
uses: snickerbockers/submodules-init@v4
|
uses: snickerbockers/submodules-init@v4
|
||||||
- name: Build with Gradle
|
- name: Build with Gradle
|
||||||
run: ./gradlew build
|
run: ./gradlew build
|
||||||
|
|
||||||
|
- name: Archive artifacts (Geyser Fabric)
|
||||||
|
uses: actions/upload-artifact@v2
|
||||||
|
if: success()
|
||||||
|
with:
|
||||||
|
name: Geyser Fabric
|
||||||
|
path: bootstrap/fabric/build/libs/Geyser-Fabric.jar
|
||||||
- name: Archive artifacts (Geyser Standalone)
|
- name: Archive artifacts (Geyser Standalone)
|
||||||
uses: actions/upload-artifact@v2
|
uses: actions/upload-artifact@v2
|
||||||
if: success()
|
if: success()
|
||||||
|
|
|
@ -51,21 +51,6 @@ repositories {
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
processResources {
|
|
||||||
// inputs.property "version", project.version
|
|
||||||
//
|
|
||||||
// filesMatching("fabric.mod.json") {
|
|
||||||
// expand "version": project.version
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
|
|
||||||
// ensure that the encoding is set to UTF-8, no matter what the system default is
|
|
||||||
// this fixes some edge cases with special characters not displaying correctly
|
|
||||||
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
|
|
||||||
compileJava {
|
|
||||||
options.encoding = "UTF-8"
|
|
||||||
}
|
|
||||||
|
|
||||||
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
|
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
|
||||||
// if it is present.
|
// if it is present.
|
||||||
// If you remove this task, sources will not be generated.
|
// If you remove this task, sources will not be generated.
|
||||||
|
@ -79,11 +64,6 @@ tasks {
|
||||||
relocate("org.yaml", "org.geysermc.relocate.yaml") // https://github.com/CardboardPowered/cardboard/issues/139
|
relocate("org.yaml", "org.geysermc.relocate.yaml") // https://github.com/CardboardPowered/cardboard/issues/139
|
||||||
relocate("com.fasterxml.jackson", "org.geysermc.relocate.jackson")
|
relocate("com.fasterxml.jackson", "org.geysermc.relocate.jackson")
|
||||||
relocate("net.kyori", "org.geysermc.relocate.kyori")
|
relocate("net.kyori", "org.geysermc.relocate.kyori")
|
||||||
archiveClassifier.set("unshaded") // We don't want it included in the archived artifacts
|
|
||||||
}
|
|
||||||
|
|
||||||
jar {
|
|
||||||
from("LICENSE")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
remapJar {
|
remapJar {
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
{
|
{
|
||||||
"schemaVersion": 1,
|
"schemaVersion": 1,
|
||||||
"id": "geyser-fabric",
|
"id": "${id}-fabric",
|
||||||
"version": "${version}",
|
"version": "${version}",
|
||||||
"name": "Geyser-Fabric",
|
"name": "${name}-Fabric",
|
||||||
"description": "A bridge/proxy allowing you to connect to Minecraft: Java Edition servers with Minecraft: Bedrock Edition. ",
|
"description": "A bridge/proxy allowing you to connect to Minecraft: Java Edition servers with Minecraft: Bedrock Edition. ",
|
||||||
"authors": [
|
"authors": [
|
||||||
"GeyserMC"
|
"${author}"
|
||||||
],
|
],
|
||||||
"contact": {
|
"contact": {
|
||||||
"website": "https://geysermc.org",
|
"website": "${url}",
|
||||||
"repo": "https://github.com/GeyserMC/Geyser-Fabric"
|
"repo": "https://github.com/GeyserMC/Geyser-Fabric"
|
||||||
},
|
},
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
|
|
@ -9,7 +9,8 @@ dependencies {
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
processResources {
|
processResources {
|
||||||
filesMatching(listOf("plugin.yml", "bungee.yml", "velocity-plugin.json", "META-INF/sponge_plugins.json")) {
|
// Spigot, BungeeCord, Velocity, Sponge, Fabric
|
||||||
|
filesMatching(listOf("plugin.yml", "bungee.yml", "velocity-plugin.json", "META-INF/sponge_plugins.json", "fabric.mod.json")) {
|
||||||
expand(
|
expand(
|
||||||
"id" to "geyser",
|
"id" to "geyser",
|
||||||
"name" to "Geyser",
|
"name" to "Geyser",
|
||||||
|
|
Loading…
Reference in a new issue