Skip to content
Merged
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
34 changes: 25 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,38 @@
name: Java CI with Gradle
name: Build

on: [ push, pull_request ]
on:
push:
branches:
- master
pull_request:
workflow_dispatch:

permissions:
contents: read

concurrency:
group: build-${{ github.ref }}
cancel-in-progress: true

jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 15
steps:
- name: Checkout
uses: actions/checkout@v3.0.1
- name: Set up JDK 17
uses: actions/setup-java@v3.1.1
uses: actions/checkout@v4
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
java-version: '21'
- name: Set up Gradle
uses: gradle/actions/setup-gradle@v4
- name: Build
run: ./gradlew build
run: ./gradlew --no-daemon clean build
- name: Upload artifact
uses: actions/upload-artifact@v3.0.0
uses: actions/upload-artifact@v4
with:
name: framedImage
path: build/libs/framedimage*.jar
path: build/libs/framedimage*.jar
if-no-files-found: error
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

High performance Bukkit/Folia plugin for map-arts.

Requires Java 21+.

<b>Features</b>:
<ul>
<li><b>Performance.</b> The plugin inserts thousands of frames in just a few seconds (during testing, the plugin inserted ~3000 frames in 2 seconds)</li>
Expand Down
18 changes: 9 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
plugins {
id 'java'
id 'com.github.johnrengelman.shadow' version '7.1.2'
id 'com.gradleup.shadow' version '9.3.1'
}

group = 'com.jnngl'
version = '1.8.0'
version = '1.8.1'

repositories {
mavenCentral()
Expand All @@ -21,14 +21,14 @@ repositories {
dependencies {
implementation 'net.elytrium:elytrium-java-commons:1.0.8'
implementation 'com.jnngl:mapcolor:1.0.1'
implementation 'org.bstats:bstats-bukkit:3.0.0'
implementation 'org.bstats:bstats-bukkit:3.1.0'

compileOnly 'dev.folia:folia-api:1.19.4-R0.1-SNAPSHOT'
compileOnly 'dev.folia:folia-api:1.21.11-R0.1-SNAPSHOT'

compileOnly 'io.netty:netty-all:4.1.85.Final'
compileOnly 'io.netty:netty-all:4.2.10.Final'
}

def targetJavaVersion = 17
def targetJavaVersion = 21
java {
def javaVersion = JavaVersion.toVersion(targetJavaVersion)
sourceCompatibility = javaVersion
Expand All @@ -47,16 +47,16 @@ tasks.withType(JavaCompile).configureEach {
processResources {
def props = [version: version]
inputs.properties props
filteringCharset 'UTF-8'
filteringCharset = 'UTF-8'
filesMatching('plugin.yml') {
expand props
}
}

shadowJar {
getArchiveClassifier() set ''
archiveClassifier.set('')

relocate 'org.bstats', 'com.jnngl.framedimage.thirdparty.org.bstats'
}

assemble.dependsOn shadowJar
assemble.dependsOn shadowJar
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
50 changes: 32 additions & 18 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading