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
16 changes: 8 additions & 8 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- name: Set up JDK 21
uses: actions/setup-java@v5.0.0
uses: actions/setup-java@v5.2.0
with:
java-version: 21
distribution: 'adopt'
Expand Down Expand Up @@ -40,9 +40,9 @@ jobs:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- name: Set up JDK 21
uses: actions/setup-java@v5.0.0
uses: actions/setup-java@v5.2.0
with:
java-version: 21
distribution: 'adopt'
Expand All @@ -64,9 +64,9 @@ jobs:
needs: [build, paths-filter]
if: ${{ github.ref == 'refs/heads/master' && needs.paths-filter.outputs.output1 == 'true' }}
steps:
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- name: Set up JDK 21
uses: actions/setup-java@v5.0.0
uses: actions/setup-java@v5.2.0
with:
java-version: 21
distribution: 'adopt'
Expand Down Expand Up @@ -118,9 +118,9 @@ jobs:
needs: [createJar, releaseJar]
if: ${{ github.ref == 'refs/heads/master' }}
steps:
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- name: Set up JDK 21
uses: actions/setup-java@v5.0.0
uses: actions/setup-java@v5.2.0
with:
java-version: 21
distribution: 'adopt'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/repo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ jobs:
runs-on: ubuntu-latest
if: ${{ github.event.release.prerelease == false }}
steps:
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- name: Set up JDK 21
uses: actions/setup-java@v5.0.0
uses: actions/setup-java@v5.2.0
with:
java-version: 21
distribution: 'adopt'
Expand Down
12 changes: 6 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
id("java")
id("xyz.jpenilla.run-paper") version "3.0.2"
id("net.minecrell.plugin-yml.bukkit") version "0.6.0"
id("io.papermc.paperweight.userdev") version "2.0.0-beta.18"
id("io.papermc.paperweight.userdev") version "2.0.0-beta.21"
id("maven-publish")
id("com.modrinth.minotaur") version "2.+"
}
Expand All @@ -24,11 +24,11 @@ dependencies {
library("com.google.code.gson:gson:2.13.2")
library("club.minnced:discord-webhooks:0.8.4")
paperweight.paperDevBundle("$minecraftVersion-R0.1-SNAPSHOT")
library("org.postgresql:postgresql:42.7.7")
library("de.chojo.sadu:sadu-postgresql:2.3.3")
library("de.chojo.sadu:sadu-datasource:2.3.3")
library("de.chojo.sadu:sadu-queries:2.3.3")
library("com.zaxxer:HikariCP:6.3.2")
library("org.postgresql:postgresql:42.7.10")
library("de.chojo.sadu:sadu-postgresql:2.3.8")
library("de.chojo.sadu:sadu-datasource:2.3.8")
library("de.chojo.sadu:sadu-queries:2.3.8")
library("com.zaxxer:HikariCP:6.3.3")
}

java {
Expand Down
6 changes: 3 additions & 3 deletions flake.lock

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

6 changes: 3 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
jdk = pkgs.jdk21;
gradle = pkgs.gradle_8.override { java = jdk; };
gradle = pkgs.gradle_9.override { java = jdk; };
in
{

Expand All @@ -22,8 +22,8 @@

shellHook = ''
echo "Development environment ready!"
echo "JDK: $(java -version 2>&1 | head -n 1)"
echo "Gradle: $(gradle --version | head -n 1)"
echo "$(java -version 2>&1 | head -n 1)"
echo "$(gradle --version | head -n 3 | tail -n 1)"
'';
};

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ pluginManagement {
repositories {
gradlePluginPortal()
maven {
url "https://papermc.io/repo/repository/maven-public/"
url = "https://papermc.io/repo/repository/maven-public/"
}
}
}
Expand Down