Start sadu migration (#596)

rainbowdashlabs · Jun 1, 2024 · e5ade23 · e5ade23
1 parent d33aae3
commit e5ade23
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/.envrc b/.envrc
@@ -0,0 +1 @@
+use nix
diff --git a/.gitignore b/.gitignore
@@ -36,3 +36,4 @@ buildNumber.properties
 /out/
 
 /site/
+/.direnv
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,7 +4,6 @@ plugins {
     alias(libs.plugins.shadow)
     alias(libs.plugins.spotless)
     java
-    `maven-publish`
 }
 
 group = "de.chojo"
@@ -49,7 +48,7 @@ dependencies {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(19))
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
     withSourcesJar()
     withJavadocJar()

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:jdk19-alpine as build
+FROM gradle:jdk21-alpine as build
 
 COPY . .
 RUN gradle clean build --no-daemon

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -8,7 +8,7 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             // misc
-            version("sadu", "2.0.0")
+            version("sadu", "2.2.0")
             library("sadu-queries", "de.chojo.sadu", "sadu-queries").versionRef("sadu")
             library("sadu-updater", "de.chojo.sadu", "sadu-updater").versionRef("sadu")
             library("sadu-postgresql", "de.chojo.sadu", "sadu-postgresql").versionRef("sadu")

diff --git a/shell.nix b/shell.nix
@@ -0,0 +1,6 @@
+{ pkgs ? import <nixpkgs> {}, ... }:
+
+pkgs.mkShell {
+  packages = with pkgs; [jdk21];
+}
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,3 +36,4 @@ buildNumber.properties
		/out/

		/site/
		/.direnv