Skip to content

Commit ded7ceb

Browse files
Prepare next release (#48)
* Update dependency net.onelitefeather:mycelium-bom to v1.4.4 (#43) * Update mycelium bom to version 1.4.5 * Remove publishdata plugin usage (#45) * Remove publishdata plugin definition and plugin portal integration * Switch from publishdata to the standard publishing style * Revert downgrade of the mycelium bom version * Publish only on tags * Improve env configuration * Remove double usage of the java plugin * Update dependency net.onelitefeather:mycelium-bom to v1.5.0 (#47) * Update dependency net.onelitefeather:mycelium-bom to v1.5.0 * Update to java 25 * Migrate boolean consumer usage * Update minor version Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: theEvilReaper <theEvilReaper@users.noreply.github.com>
1 parent 1a194c1 commit ded7ceb

File tree

6 files changed

+13
-24
lines changed

6 files changed

+13
-24
lines changed

.github/workflows/build-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
uses: actions/setup-java@v5
1919
with:
2020
distribution: temurin
21-
java-version: 21
21+
java-version: 25
2222
- name: Build on ${{ matrix.os }}
2323
run: ./gradlew clean build

.github/workflows/main-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ jobs:
2525
uses: actions/setup-java@v5
2626
with:
2727
distribution: temurin
28-
java-version: 21
28+
java-version: 25
2929
- name: Build on ${{ matrix.os }}
3030
run: ./gradlew test

.github/workflows/publishing.yaml

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,24 @@ name: Publish JAR
22

33
on:
44
push:
5-
branches:
6-
- main
7-
- master
8-
- develop
95
tags:
106
- '**'
117
jobs:
128
build:
139
runs-on: ubuntu-latest
14-
10+
env:
11+
ONELITEFEATHER_MAVEN_USERNAME: ${{ secrets.ONELITEFEATHER_MAVEN_USERNAME }}
12+
ONELITEFEATHER_MAVEN_PASSWORD: ${{ secrets.ONELITEFEATHER_MAVEN_PASSWORD }}
1513
steps:
1614
- name: Checkout repository
1715
uses: actions/checkout@v5
1816

19-
- name: Set up JDK 21
17+
- name: Set up JDK 25
2018
uses: actions/setup-java@v5
2119
with:
2220
distribution: 'temurin'
23-
java-version: '21'
24-
21+
java-version: '25'
2522
- name: Build with Gradle
2623
run: ./gradlew build
27-
env:
28-
ONELITEFEATHER_MAVEN_USERNAME: ${{ secrets.ONELITEFEATHER_MAVEN_USERNAME }}
29-
ONELITEFEATHER_MAVEN_PASSWORD: ${{ secrets.ONELITEFEATHER_MAVEN_PASSWORD }}
30-
3124
- name: Publish to Maven
3225
run: ./gradlew publish
33-
env:
34-
ONELITEFEATHER_MAVEN_USERNAME: ${{ secrets.ONELITEFEATHER_MAVEN_USERNAME }}
35-
ONELITEFEATHER_MAVEN_PASSWORD: ${{ secrets.ONELITEFEATHER_MAVEN_PASSWORD }}

build.gradle.kts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
plugins {
2-
java
32
`java-library`
43
`maven-publish`
54
jacoco
65
}
76

87
group = "net.theevilreaper"
9-
version = "1.11.2"
8+
version = "1.12.0"
109
description = "Aves"
1110

1211
java {
1312
toolchain {
14-
languageVersion = JavaLanguageVersion.of(21)
13+
languageVersion = JavaLanguageVersion.of(25)
1514
}
1615
withJavadocJar()
1716
withSourcesJar()
@@ -38,7 +37,7 @@ dependencies {
3837
tasks {
3938
compileJava {
4039
options.encoding = "UTF-8"
41-
options.release.set(21)
40+
options.release.set(25)
4241
}
4342

4443
jacocoTestReport {

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencyResolutionManagement {
2121
}
2222
versionCatalogs {
2323
create("libs") {
24-
version("bom", "1.4.5")
24+
version("bom", "1.5.0")
2525
library("mycelium.bom", "net.onelitefeather", "mycelium-bom").versionRef("bom")
2626
library("minestom","net.minestom", "minestom").withoutVersion()
2727
library("adventure", "net.kyori", "adventure-text-minimessage").withoutVersion()

src/main/java/net/theevilreaper/aves/util/Futures.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package net.theevilreaper.aves.util;
22

3-
import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
43
import org.jetbrains.annotations.NotNull;
54

65
import java.time.Duration;
76
import java.util.concurrent.CompletableFuture;
87
import java.util.concurrent.CountDownLatch;
98
import java.util.concurrent.TimeUnit;
9+
import java.util.function.Consumer;
1010

1111
/**
1212
* Taken from <a href="https://github.com/Minestom/Arena/blob/master/src/main/java/net/minestom/arena/utils/ConcurrentUtils.java">...</a>
@@ -33,7 +33,7 @@ private Futures() {
3333
* </ul>
3434
* @return the new CompletionStage
3535
*/
36-
public static CompletableFuture<Void> thenRunOrTimeout(@NotNull CompletableFuture<?> future, @NotNull Duration timeout, BooleanConsumer action) {
36+
public static CompletableFuture<Void> thenRunOrTimeout(@NotNull CompletableFuture<?> future, @NotNull Duration timeout, Consumer<Boolean> action) {
3737
final CompletableFuture<Boolean> f = new CompletableFuture<>();
3838
CompletableFuture.delayedExecutor(timeout.toNanos(), TimeUnit.NANOSECONDS).execute(() -> f.complete(true));
3939
future.thenRun(() -> f.complete(false));

0 commit comments

Comments
 (0)