From 0aa6d1f7adad8eefd8d4b2fae1d9e12f771bc9c2 Mon Sep 17 00:00:00 2001
From: David Bernard <david.bernard.31@gmail.com>
Date: Sun, 25 Feb 2024 17:04:04 +0100
Subject: [PATCH] Upgrade to java 11

Signed-off-by: David Bernard <david.bernard.31@gmail.com>
---
 .github/workflows/ci.yaml |  2 +-
 .mise.toml                |  3 +++
 pom.xml                   |  6 ++++--
 shell.nix                 | 32 --------------------------------
 4 files changed, 8 insertions(+), 35 deletions(-)
 create mode 100644 .mise.toml
 delete mode 100644 shell.nix

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f4c1d281..6fc8b26e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: "adopt" # See 'Supported distributions' for available options
-          java-version: "8"
+          java-version: "11"
       - name: Cache Maven packages
         uses: actions/cache@v4
         with:
diff --git a/.mise.toml b/.mise.toml
new file mode 100644
index 00000000..b89351f2
--- /dev/null
+++ b/.mise.toml
@@ -0,0 +1,3 @@
+[tools]
+java = "openjdk-11"
+maven = "3.3.9"
diff --git a/pom.xml b/pom.xml
index 67ed56a7..81176c56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>net.alchim31.maven</groupId>
   <artifactId>scala-maven-plugin</artifactId>
@@ -474,7 +476,7 @@
           <attach>false</attach>
           <doclint>-missing</doclint>
           <links>
-            <link>http://java.sun.com/j2se/${maven.compiler.source}/docs/api/</link>
+            <!--link>http://java.sun.com/j2se/${maven.compiler.source}/docs/api/</link-->
             <link>http://slf4j.org/api/</link>
             <link>http://commons.apache.org/lang/api-release/</link>
             <link>http://commons.apache.org/io/api-release/</link>
diff --git a/shell.nix b/shell.nix
deleted file mode 100644
index 48ccd214..00000000
--- a/shell.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ pkgs ? import (builtins.fetchTarball {
-  # Descriptive name to make the store path easier to identify
-  name = "nixpkgs-unstable-2021-05-15";
-  # Commit hash for nixpkgs-unstable as of 2021-05-15 from https://status.nixos.org/
-  url = "https://github.com/nixos/nixpkgs/archive/a2c3ea5bf825.tar.gz";
-  # Hash obtained using `nix-prefetch-url --unpack <url>`
-  sha256 = "0rxn9wg73gvgb7zwzrdhranlj3jpkkcnsqmrzw5m0znwv6apj6k4";
-}) {}}:
-
-# { pkgs ? import (builtins.fetchTarball {
-#   # Descriptive name to make the store path easier to identify
-#   name = "nixpkgs-20.09-darwin";
-#   # Commit hash for nixpkgs-20.09-darwin as of 2021-05-15 from https://status.nixos.org/
-#   url = "https://github.com/nixos/nixpkgs/archive/339f21f3d46e.tar.gz";
-#   # Hash obtained using `nix-prefetch-url --unpack <url>`
-#   sha256 = "062h33j8ig5i22xhkcwfw79lfq90xg4vpx6xn2fib77nw793562r";
-# }) {}}:
-
-pkgs.mkShell {                  # mkShell is a helper function
-  name="dev-environment";       # that requires a name
-  buildInputs = with pkgs; [    # for a list of packages (search https://search.nixos.org/packages)
-    # openjdk8_headless
-    adoptopenjdk-hotspot-bin-8
-    git
-    gnupg1
-    starship
-  ];
-  shellHook = ''             # bash to run when you enter the shell
-    echo "Start developing..."
-    source <(starship init bash --print-full-init)
-  '';
-}