commit ad3d8e3bd0fe0762b0e999408f619ebc7306ab31
parent bde531f6fc60bc2a194062c3f8fc8e8071ec3b2f
Author: typable <contact@typable.dev>
Date: Sun, 1 Sep 2024 14:09:22 +0200
feat: Updated build workflow
Diffstat:
8 files changed, 11 insertions(+), 47 deletions(-)
diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
@@ -12,18 +12,16 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'adopt'
- java-version: '17'
+ java-version: '20'
cache: gradle
- name: Build Jar
- uses: gradle/gradle-build-action@v2
- with:
- gradle-version: 7.5
- arguments: build --scan --no-daemon
+ run: ./build.sh
+ shell: bash
- name: Upload Artifacts
uses: actions/upload-artifact@v3
with:
name: poppy.zip
- path: build/libs/poppy.jar
+ path: poppy.jar
- name: Configure SSH
run: |
mkdir -p ~/.ssh/
@@ -46,4 +44,4 @@ jobs:
- name: Deploy Jar
run: |
scp build/libs/poppy.jar minecraft:run/mc/plugins/
- ssh minecraft 'cd run/mc/ && ./deploy.sh'
-\ No newline at end of file
+ ssh minecraft 'cd run/mc/ && ./deploy.sh'
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1 @@
-/bin/
-/.vscode/
-/lib/
-*.jar
-.classpath
-.project
-*.prefs
-/build/**
-/.gradle/**
-/.env/**
-*.sh
+poppy.jar
diff --git a/build.gradle b/build.gradle
@@ -1,26 +0,0 @@
-apply plugin: 'java'
-
-sourceSets {
- main {
- java {
- srcDirs 'src'
- }
- resources {
- srcDirs 'res'
- }
- }
-}
-
-repositories {
- mavenCentral()
- maven {
- url = 'https://hub.spigotmc.org/nexus/content/repositories/public/'
- }
-}
-
-sourceCompatibility = 1.11
-targetCompatibility = 1.11
-
-dependencies {
- implementation 'org.spigotmc:spigot-api:1.21.1-R0.1-SNAPSHOT'
-}
diff --git a/build.sh b/build.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+javac -cp "./libs/bungeecord-chat-1.20-R0.2.jar:./libs/spigot-api-1.21.1-R0.1-20240831.215322-16.jar" src/poppy/*.java src/poppy/modules/*.java -d build
+jar cvfm poppy.jar res/MANIFEST.MF -C res plugin.yml -C build poppy
+rm -rf ./build
diff --git a/gradle.properties b/gradle.properties
@@ -1 +0,0 @@
-org.gradle.console = plain
-\ No newline at end of file
diff --git a/libs/bungeecord-chat-1.20-R0.2.jar b/libs/bungeecord-chat-1.20-R0.2.jar
Binary files differ.
diff --git a/libs/spigot-api-1.21.1-R0.1-20240831.215322-16.jar b/libs/spigot-api-1.21.1-R0.1-20240831.215322-16.jar
Binary files differ.
diff --git a/res/MANIFEST.MF b/res/MANIFEST.MF
@@ -0,0 +1 @@
+Manifest-Version: 1.0