Skip to content

Commit

Permalink
fix: bug in OPERATOR executor
Browse files Browse the repository at this point in the history
  • Loading branch information
titivermeesch committed Jul 18, 2024
1 parent 74ea636 commit 1e05cc5
Show file tree
Hide file tree
Showing 10 changed files with 363 additions and 221 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,23 @@ jobs:
- uses: actions/upload-artifact@v2
with:
path: build/libs/commandtimer-java17.jar
Build-Java-21:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: '21'
- run: gradle :shadowJar
- uses: actions/upload-artifact@v2
with:
path: build/libs/commandtimer-java21.jar
Release:
needs:
- Build-Java-8
- Build-Java-17
- Build-Java-21
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
13 changes: 7 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
plugins {
id 'java'
id 'com.github.johnrengelman.shadow' version '7.0.0'
id 'io.github.goooler.shadow' version '8.1.8'
id 'maven-publish'
}

java {
toolchain.languageVersion.set(JavaLanguageVersion.of(17))
toolchain.languageVersion.set(JavaLanguageVersion.of(21))
}


group = 'me.playbosswar.com'
version = '8.7.2'
version = '8.7.3'
description = 'CommandTimer'

repositories {
Expand Down Expand Up @@ -40,7 +41,7 @@ shadowJar {
}
// Needed in case the server software already packs sentry
relocate 'io.sentry', 'me.playbosswar.com.commandtimer.sentry'
archiveFileName = "commandtimer-java17.jar"
archiveFileName = "commandtimer-java21.jar"
}

dependencies {
Expand All @@ -51,7 +52,7 @@ dependencies {
implementation 'com.googlecode.json-simple:json-simple:1.1.1'
implementation 'org.apache.commons:commons-text:1.10.0'
implementation 'io.sentry:sentry:7.0.0'
compileOnly 'io.papermc.paper:paper-api:1.20.2-R0.1-SNAPSHOT'
compileOnly 'io.papermc.paper:paper-api:1.21-R0.1-SNAPSHOT'
compileOnly 'me.clip:placeholderapi:2.10.9'
compileOnly 'org.jetbrains:annotations:23.1.0'
}
Expand All @@ -61,7 +62,7 @@ publishing {
maven(MavenPublication) {
groupId = 'me.playbosswar.com'
artifactId = 'commandtimer'
version = '8.7.2'
version = '8.7.3'

from components.java
}
Expand Down
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.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 1e05cc5

Please sign in to comment.