diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index faf4905..7de0a01 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -18,6 +18,6 @@ jobs: uses: actions/setup-java@v5 with: distribution: temurin - java-version: 21 + java-version: 25 - name: Build on ${{ matrix.os }} run: ./gradlew clean build \ No newline at end of file diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml index 665e132..95dccc7 100644 --- a/.github/workflows/main-build.yml +++ b/.github/workflows/main-build.yml @@ -25,6 +25,6 @@ jobs: uses: actions/setup-java@v5 with: distribution: temurin - java-version: 21 + java-version: 25 - name: Build on ${{ matrix.os }} run: ./gradlew test \ No newline at end of file diff --git a/.github/workflows/publishing.yaml b/.github/workflows/publishing.yaml index e697e20..f83cf8b 100644 --- a/.github/workflows/publishing.yaml +++ b/.github/workflows/publishing.yaml @@ -7,25 +7,18 @@ on: jobs: build: runs-on: ubuntu-latest - + env: + ONELITEFEATHER_MAVEN_USERNAME: ${{ secrets.ONELITEFEATHER_MAVEN_USERNAME }} + ONELITEFEATHER_MAVEN_PASSWORD: ${{ secrets.ONELITEFEATHER_MAVEN_PASSWORD }} steps: - name: Checkout repository uses: actions/checkout@v5 - - name: Set up JDK 21 uses: actions/setup-java@v5 with: distribution: 'temurin' - java-version: '21' - + java-version: '25' - name: Build with Gradle run: ./gradlew build - env: - ONELITEFEATHER_MAVEN_USERNAME: ${{ secrets.ONELITEFEATHER_MAVEN_USERNAME }} - ONELITEFEATHER_MAVEN_PASSWORD: ${{ secrets.ONELITEFEATHER_MAVEN_PASSWORD }} - - name: Publish to Maven - run: ./gradlew publish - env: - ONELITEFEATHER_MAVEN_USERNAME: ${{ secrets.ONELITEFEATHER_MAVEN_USERNAME }} - ONELITEFEATHER_MAVEN_PASSWORD: ${{ secrets.ONELITEFEATHER_MAVEN_PASSWORD }} \ No newline at end of file + run: ./gradlew publish \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 577260b..bc5777d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ version = "0.2.0" java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(25)) } } @@ -34,7 +34,7 @@ dependencies { tasks { compileJava { options.encoding = "UTF-8" - options.release = 21 + options.release = 25 } jacocoTestReport { diff --git a/settings.gradle.kts b/settings.gradle.kts index d73ad60..df8ab19 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -22,7 +22,7 @@ dependencyResolutionManagement { versionCatalogs { create("libs") { version("schem", "1.3.1") - version("bom", "1.4.5") + version("bom", "1.5.0") library("bom.base", "net.onelitefeather", "mycelium-bom").versionRef("bom")