From 6f6ed63eda73e4b0cb7cf3ac7f7d402d27704478 Mon Sep 17 00:00:00 2001 From: Colt Frederickson Date: Wed, 17 Jun 2026 11:06:33 -0600 Subject: [PATCH] Update to java 21 in ci and locally --- .github/workflows/ci.yaml | 16 ++++------ README.md | 2 +- flake.lock | 65 +++++++++++---------------------------- flake.nix | 7 ++--- 4 files changed, 28 insertions(+), 62 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index afbac92..bdc14a8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -11,16 +11,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up JDK 11 - uses: olafurpg/setup-scala@v14 + - name: Restore caches + uses: coursier/cache-action@v8 + - name: Setup Scala + uses: coursier/setup-action@v3 with: - java-version: 11 - - name: Cache - uses: actions/cache@v4 - with: - path: | - ~/.cache/coursier - ~/.sbt - key: sbt-${{ hashFiles('**/build.sbt', '**/build.properties') }} + jvm: 21 + apps: sbt - name: Run tests run: sbt +compile +test scalastyle diff --git a/README.md b/README.md index 9d7ccfa..490ad59 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,7 @@ The NCC Group has conducted an audit of this library - we have a blog post about ## Building -Recrypt requires openjdk8+ and is known to build under Linux and MacOSX. +Recrypt requires openjdk21+ and is known to build under Linux and MacOSX. https://github.com/paulp/sbt-extras can be used to get sbt. diff --git a/flake.lock b/flake.lock index c6acf6c..9777e79 100644 --- a/flake.lock +++ b/flake.lock @@ -2,15 +2,17 @@ "nodes": { "devshell": { "inputs": { - "nixpkgs": "nixpkgs", - "systems": "systems" + "nixpkgs": [ + "typelevel-nix", + "nixpkgs" + ] }, "locked": { - "lastModified": 1688380630, - "narHash": "sha256-8ilApWVb1mAi4439zS3iFeIT0ODlbrifm/fegWwgHjA=", + "lastModified": 1768818222, + "narHash": "sha256-460jc0+CZfyaO8+w8JNtlClB2n4ui1RbHfPTLkpwhU8=", "owner": "numtide", "repo": "devshell", - "rev": "f9238ec3d75cefbb2b42a44948c4e8fb1ae9a205", + "rev": "255a2b1725a20d060f566e4755dbf571bbbb5f76", "type": "github" }, "original": { @@ -21,14 +23,14 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -39,27 +41,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1677383253, - "narHash": "sha256-UfpzWfSxkfXHnb4boXZNaKsAcUrZT9Hw+tao1oZxd08=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9952d6bc395f5841262b006fbace8dd7e143b634", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1688221086, - "narHash": "sha256-cdW6qUL71cNWhHCpMPOJjlw0wzSRP0pVlRn2vqX/VVg=", + "lastModified": 1781359544, + "narHash": "sha256-iUuzKQcyXvopYDDzFpMK5eQKP3WIJExYny2kJtbgUcE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cd99c2b3c9f160cd004318e0697f90bbd5960825", + "rev": "9f11f828c213641c2369a9f1fa31fe31557e3156", "type": "github" }, "original": { @@ -97,33 +83,18 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "typelevel-nix": { "inputs": { "devshell": "devshell", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1688414327, - "narHash": "sha256-NmY28Qd1m3VBnPw+kq5qq+obOEeEH2F9XngunDEvgiA=", + "lastModified": 1781531207, + "narHash": "sha256-rZKx58CHL6iuBBids64n8OTk1S6/JdrnN4gJYuhn1cc=", "owner": "typelevel", "repo": "typelevel-nix", - "rev": "a09e2c0f410955262f4e5a6cec75fc38233fc5ad", + "rev": "c6a694aae59a084551cc04fd948a9543af611789", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 810ab0f..4b5b3da 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ let pkgs = import nixpkgs { inherit system; - overlays = [ typelevel-nix.overlay ]; + overlays = [ typelevel-nix.overlays.default ]; }; mkShell = jdk: pkgs.devshell.mkShell { @@ -22,11 +22,10 @@ }; in rec { - devShell = devShells."temurin@11"; + devShell = devShells."temurin@21"; devShells = { - "temurin@11" = mkShell pkgs.temurin-bin-11; - "temurin@17" = mkShell pkgs.temurin-bin-17; + "temurin@21" = mkShell pkgs.temurin-bin-21; }; } );