From 80d9d3eaa2376064f4d9713c1a6c2bc2795139cb Mon Sep 17 00:00:00 2001
From: I-Al-Istannen <i-al-istannen@users.noreply.github.com>
Date: Thu, 24 Aug 2023 18:38:32 +0200
Subject: [PATCH 01/14] chore: Regret

---
 .github/workflows/tests.yml | 236 +++++++++---------------------------
 flake.lock                  |  27 +++++
 flake.nix                   | 135 +++++++++++++++++++++
 3 files changed, 222 insertions(+), 176 deletions(-)
 create mode 100644 flake.lock
 create mode 100644 flake.nix

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 77f7d53c59b..38202b99d97 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -12,11 +12,11 @@ on:
   push:
     branches:
       - master
+      - chore/flakey-flakey-rise-and-shine
   schedule:
   - cron: "0 0 * * *"
 
 env:
-  JAVA_DISTRIBUTION: temurin
   MAVEN_OPTS: >-
     -Dmaven.resolver.transport=native
     -Daether.connector.connectTimeout=300000
@@ -27,82 +27,45 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [11, 17, 20, 21-ea]
-        os: [ubuntu-latest, windows-latest]
-        exclude:
-          - os: windows-latest
-            java: 17
-          - os: windows-latest
-            java: 20
-          - os: windows-latest
-            java: 21-ea
-
-
-
+        java: [11, 17, 20]
+        os: [ubuntu-latest]
 
     name: Tests with Java ${{ matrix.java }} on ${{ matrix.os }}
     steps:
-      - name: Disable Git's autocrlf
-        run: git config --global core.autocrlf false
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
-      - uses: oracle-actions/setup-java@2c4df2930e35870536667f383d87f1246fbe613f # v1
+      - name: git checkout
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
-          website: jdk.java.net
-          java-version: ${{ matrix.java }}
-
-      - name: Get date for cache # see https://github.com/actions/cache README
-        id: get-date
-        run: echo "date=$(/bin/date -u "+%Y%m%d")" >> $GITHUB_OUTPUT
-        shell: bash
-      - name: Use Maven dependency cache
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+          fetch-depth: 0
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@v4
+      - uses: DeterminateSystems/magic-nix-cache-action@v2
+      - name: Check Nixpkgs inputs
+        uses: DeterminateSystems/flake-checker-action@v5
         with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-${{ steps.get-date.outputs.date }}-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-maven-
+          fail-mode: true
 
-      - name: Use silent log config
-        run: mv chore/logback.xml src/test/resources/
-      - name: Build
-        run: |
-          mvn -f spoon-pom -B test-compile
-      - name: Fetch final dependencies
-        # this is a hack to download the final test dependencies required to actually run the tests
-        run: timeout 20 mvn -f spoon-pom -B test || echo "Done fetching dependencies"
-        shell: bash
+      - name: Time nix setup
+        run: nix develop .#jdk${{ matrix.java }} --command true
       - name: Test
-        run:
-          mvn -f spoon-pom test
-      - name: print run tests
-        run: cat testResults.spoon
+        run: nix develop .#jdk${{ matrix.java }} --command test
   coverage:
     runs-on: ubuntu-latest
     name: Test with coverage
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
-      - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
+      - name: git checkout
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
-          java-version: 17
-          distribution: ${{ env.JAVA_DISTRIBUTION }}
-
-      - name: Get date for cache # see https://github.com/actions/cache README
-        id: get-date
-        run: echo "date=$(/bin/date -u "+%Y%m%d")" >> $GITHUB_OUTPUT
-        shell: bash
-      - name: Use Maven dependency cache
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+          fetch-depth: 0
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@v4
+      - uses: DeterminateSystems/magic-nix-cache-action@v2
+      - name: Check Nixpkgs inputs
+        uses: DeterminateSystems/flake-checker-action@v5
         with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-${{ steps.get-date.outputs.date }}-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-maven-
+          fail-mode: true
 
-      - name: Use silent log config
-        run: mv chore/logback.xml src/test/resources/
-      - name: Build
-        run: |
-          mvn -f spoon-pom -B test-compile
-      - name: Test with coverage
-        run: mvn -f spoon-pom -Pcoveralls test jacoco:report coveralls:report -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER --fail-never
+      - name: Run tests with coverage
+        run: nix develop --command coverage
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PR_NUMBER: ${{ github.event.number }}
@@ -111,136 +74,57 @@ jobs:
     runs-on: ubuntu-latest
     name: Extra checks
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - name: git checkout
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
           fetch-depth: 0
-      - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
-        with:
-          java-version: 11
-          distribution: ${{ env.JAVA_DISTRIBUTION }}
-      - uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
-        with:
-          python-version: 3.11
-      - name: Get date for cache # see https://github.com/actions/cache README
-        id: get-date
-        run: echo "date=$(/bin/date -u "+%Y%m%d")" >> $GITHUB_OUTPUT
-        shell: bash
-      - name: Use Maven dependency cache
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@v4
+      - uses: DeterminateSystems/magic-nix-cache-action@v2
+      - name: Check Nixpkgs inputs
+        uses: DeterminateSystems/flake-checker-action@v5
         with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-${{ steps.get-date.outputs.date }}-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-maven-
-      - name: Use silent log config
-        run: mv chore/logback.xml src/test/resources/
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
-        with:
-          fetch-depth: 0
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y python3-pip
-          pip3 install --user CommonMark==0.9.1 requests pygithub
+          fail-mode: true
 
-      - name: Verify and Site Maven goals
-        run: mvn verify license:check site -DskipTests -DadditionalJOption=-Xdoclint:syntax,-missing -Dscan
-      - name: Install spoon-pom
-        working-directory: spoon-pom
-        run: mvn install -DskipTests
-
-      - name: Checkstyle in src/tests
-        run: mvn -q checkstyle:checkstyle -Pcheckstyle-test
-
-      - name: Check documentation links
-        run: python3 ./chore/check-links-in-doc.py
-
-      - name: Analyze dependencies through DepClean in spoon-core
-        run: mvn -q depclean:depclean
-
-      - name: Spoon-decompiler
-        working-directory: spoon-decompiler
-        run: |
-          mvn -q versions:use-latest-versions -DallowSnapshots=true -Dincludes=fr.inria.gforge.spoon
-          mvn -q versions:update-parent -DallowSnapshots=true
-          git diff
-          mvn -q test
-          mvn -q checkstyle:checkstyle license:check
-          mvn -q depclean:depclean
-
-      - name: Spoon-control-flow
-        working-directory: spoon-control-flow
-        run: |
-          mvn -q versions:use-latest-versions -DallowSnapshots=true -Dincludes=fr.inria.gforge.spoon
-          mvn -q versions:update-parent -DallowSnapshots=true
-          git diff
-          mvn -q test
-          mvn -q checkstyle:checkstyle license:check
-      # spoon dataflow
-      - name: Cache downloaded file
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
-        with:
-          path: spoon-dataflow/z3-4.8.4.d6df51951f4c-x64-ubuntu-14.04.zip
-          key: ${{ runner.os }}-z3-4.8.4.d6df51951f4c-x64-ubuntu-14.04.zip
-          restore-keys: |
-            ${{ runner.os }}-z3-4.8.4.d6df51951f4c-x64-ubuntu-14.04.zip
-      - name: Spoon-dataflow
-        working-directory: spoon-dataflow
-        run: |
-          wget https://projects.ow2.org/download/spoon/WebHome/z3-4.8.4.d6df51951f4c-x64-ubuntu-14.04.zip
-          unzip z3-4.8.4.d6df51951f4c-x64-ubuntu-14.04.zip
-          export LD_LIBRARY_PATH=./z3-4.8.4.d6df51951f4c-x64-ubuntu-14.04/bin
-          ./gradlew build
-      - name: Spoon-visualisation
-        working-directory: spoon-visualisation
-        run: |
-          mvn -q versions:use-latest-versions -DallowSnapshots=true -Dincludes=fr.inria.gforge.spoon
-          mvn -q versions:update-parent -DallowSnapshots=true
-          git diff
-          mvn -q test
-          mvn -q depclean:depclean
-
-      - name: Spoon-smpl
-        working-directory: spoon-smpl
-        run: |
-          mvn -q versions:use-latest-versions -DallowSnapshots=true -Dincludes=fr.inria.gforge.spoon
-          mvn -q versions:update-parent -DallowSnapshots=true
-          git diff
-          mvn -q -Djava.src.version=11 test
-          mvn -q checkstyle:checkstyle license:check
-          mvn -q depclean:depclean
-      - name: Trigger extra tasks
+      - name: Run extra checks
+        run: nix develop --command extra
+      - name: Trigger extra remote tasks
         if: github.repository == 'INRIA/spoon' && github.event_name == 'pull_request'
-        run: |
-          curl https://raw.githubusercontent.com/SpoonLabs/spoon-ci-external/master/spoon-pull-request.sh | bash
+        run: nix develop --command extra-remote
       - name: Run Javadoc quality check
-        run: ./chore/check-javadoc-regressions.py COMPARE_WITH_MASTER
+        run: nix develop --command javadoc-quality
+
   reproducible-builds:
     runs-on: ubuntu-latest
     name: reproducible-builds
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - name: git checkout
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
           fetch-depth: 0
-      - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@v4
+      - uses: DeterminateSystems/magic-nix-cache-action@v2
+      - name: Check Nixpkgs inputs
+        uses: DeterminateSystems/flake-checker-action@v5
         with:
-          java-version: 17
-          distribution: ${{ env.JAVA_DISTRIBUTION }}
+          fail-mode: true
       - name: Check status
-        run: chore/check-reproducible-builds.sh
+        run: nix develop --command reproducible-builds
+
   maven-central-requirements:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3
+      - name: git checkout
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
-          java-version: '11'
-          distribution: 'temurin'
-        # the pom checker needs maven 3.9.0
-      - name: Set up Maven
-        uses: stCarolas/setup-maven@07fbbe97d97ef44336b7382563d66743297e442f # v4.5
+          fetch-depth: 0
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@v4
+      - uses: DeterminateSystems/magic-nix-cache-action@v2
+      - name: Check Nixpkgs inputs
+        uses: DeterminateSystems/flake-checker-action@v5
         with:
-          maven-version: 3.9.0
-      # we dont enforce that the version must be non snapshot as this is not possible for SNAPSHOT versions in our workflow.
+          fail-mode: true
       - name: Check maven pom quality
-        run: mvn -f spoon-pom org.kordamp.maven:pomchecker-maven-plugin:1.9.0:check-maven-central -D"checker.release=false"
+        run: nix develop --command maven-pom-quality
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 00000000000..f7acd894120
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1692734709,
+        "narHash": "sha256-SCFnyHCyYjwEmgUsHDDuU0TsbVMKeU1vwkR+r7uS2Rg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b85ed9dcbf187b909ef7964774f8847d554fab3b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 00000000000..09212b84e31
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,135 @@
+{
+  description = "A small flake building maven projects";
+
+  # Nixpkgs / NixOS version to use.
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  };
+
+  outputs = { self, nixpkgs }:
+    let
+      # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'.
+      forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed;
+    in
+    {
+      # Provide some binary packages for selected system types.
+      devShells = forAllSystems (system:
+        let
+          mkShell = javaVersion:
+            let
+              pkgs = import nixpkgs {
+                inherit system;
+                overlays = [
+                  (final: prev: rec {
+                    jdk = prev."jdk${toString javaVersion}";
+                    gradle = prev.gradle.override { java = jdk; };
+                    maven = prev.maven.override { inherit jdk; };
+                  })
+                ];
+              };
+            in
+            pkgs.mkShell rec {
+              test = pkgs.writeScriptBin "test" ''
+                set -eu
+                # Use silent log config
+                mv chore/logback.xml src/test/resources/
+                mvn -f spoon-pom -B test-compile
+
+                # this is a hack to download the final test dependencies required to actually run the tests
+                timeout 20 mvn -f spoon-pom -B test || echo "Done fetching dependencies"
+
+                # Execute tests
+                mvn -f spoon-pom test
+
+                # print test results in log
+                cat testResults.spoon
+              '';
+              coverage = pkgs.writeScriptBin "coverage" ''
+                set -eu
+                # Use silent log config
+                mv chore/logback.xml src/test/resources/
+                mvn -f spoon-pom -B test-compile
+                mvn -f spoon-pom -Pcoveralls test jacoco:report coveralls:report -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER --fail-never
+              '';
+              extra = pkgs.writeScriptBin "extra" ''
+                set -eu
+                # Use silent log config
+                mv chore/logback.xml src/test/resources/
+                # Verify and Site Maven goals
+                mvn verify license:check site -DskipTests -DadditionalJOption=-Xdoclint:syntax,-missing -Dscan
+                # Install spoon-pom
+                pushd spoon-pom || exit 1
+                mvn install -DskipTests
+                popd spoon-pom || exit 1
+                # Checkstyle in src/tests
+                mvn -q checkstyle:checkstyle -Pcheckstyle-test
+                # Check documentation links
+                python3 ./chore/check-links-in-doc.py
+                # Analyze dependencies through DepClean in spoon-core
+                mvn -q depclean:depclean
+
+                pushd spoon-decompiler || exit 1
+                mvn -q versions:use-latest-versions -DallowSnapshots=true -Dincludes=fr.inria.gforge.spoon
+                mvn -q versions:update-parent -DallowSnapshots=true
+                git diff
+                mvn -q test
+                mvn -q checkstyle:checkstyle license:check
+                mvn -q depclean:depclean
+                popd spoon-decompiler || exit 1
+
+                pushd spoon-control-flow || exit 1
+                mvn -q versions:use-latest-versions -DallowSnapshots=true -Dincludes=fr.inria.gforge.spoon
+                mvn -q versions:update-parent -DallowSnapshots=true
+                git diff
+                mvn -q test
+                mvn -q checkstyle:checkstyle license:check
+                popd spoon-control-flow || exit 1
+
+                # Requires z3
+                pushd spoon-dataflow || exit 1
+                ./gradlew build
+                popd spoon-dataflow || exit 1
+
+                pushd spoon-visualisation || exit 1
+                mvn -q versions:use-latest-versions -DallowSnapshots=true -Dincludes=fr.inria.gforge.spoon
+                mvn -q versions:update-parent -DallowSnapshots=true
+                git diff
+                mvn -q test
+                mvn -q depclean:depclean
+                popd spoon-visualisatio || exit 1
+
+                pushd spoon-smpl || exit 1
+                mvn -q versions:use-latest-versions -DallowSnapshots=true -Dincludes=fr.inria.gforge.spoon
+                mvn -q versions:update-parent -DallowSnapshots=true
+                git diff
+                mvn -q -Djava.src.version=11 test
+                mvn -q checkstyle:checkstyle license:check
+                mvn -q depclean:depclean
+                popd spoon-smp || exit 1
+              '';
+              extraRemote = pkgs.writeScriptBin "extra-remote" ''
+                curl https://raw.githubusercontent.com/SpoonLabs/spoon-ci-external/master/spoon-pull-request.sh | bash
+              '';
+              mavenPomQuality = pkgs.writeScriptBin "maven-pom-quality" ''
+                # we dont enforce that the version must be non snapshot as this is not possible for SNAPSHOT versions in our workflow.
+                mvn -f spoon-pom org.kordamp.maven:pomchecker-maven-plugin:1.9.0:check-maven-central -D"checker.release=false"
+              '';
+              reproducibleBuilds = pkgs.writeScriptBin "reproducible-builds" ''
+                chore/check-reproducible-builds.sh
+              '';
+              javadocQuality = pkgs.writeScriptBin "javadoc-quality" ''
+                ./chore/check-javadoc-regressions.py COMPARE_WITH_MASTER
+              '';
+              packages = with pkgs;
+                [ jdk maven gradle python311 z3 test coverage extra extraRemote mavenPomQuality javadocQuality reproducibleBuilds ] ++
+                (with pkgs.python311Packages; [ requests pygithub commonmark ]);
+            };
+        in
+        rec {
+          default = jdk20;
+          jdk20 = mkShell 20;
+          jdk17 = mkShell 17;
+          jdk11 = mkShell 11;
+        });
+    };
+}

From f6f7ceca8800b551a0fd956b5e6b46cae92b346c Mon Sep 17 00:00:00 2001
From: I-Al-Istannen <i-al-istannen@users.noreply.github.com>
Date: Thu, 24 Aug 2023 19:09:22 +0200
Subject: [PATCH 02/14] chore: Lament

---
 .github/workflows/tests.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 38202b99d97..6134e6818bc 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -43,6 +43,11 @@ jobs:
         uses: DeterminateSystems/flake-checker-action@v5
         with:
           fail-mode: true
+      - name: Use Maven dependency cache
+        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven
 
       - name: Time nix setup
         run: nix develop .#jdk${{ matrix.java }} --command true
@@ -63,6 +68,11 @@ jobs:
         uses: DeterminateSystems/flake-checker-action@v5
         with:
           fail-mode: true
+      - name: Use Maven dependency cache
+        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven
 
       - name: Run tests with coverage
         run: nix develop --command coverage
@@ -85,6 +95,11 @@ jobs:
         uses: DeterminateSystems/flake-checker-action@v5
         with:
           fail-mode: true
+      - name: Use Maven dependency cache
+        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven
 
       - name: Run extra checks
         run: nix develop --command extra
@@ -109,6 +124,12 @@ jobs:
         uses: DeterminateSystems/flake-checker-action@v5
         with:
           fail-mode: true
+      - name: Use Maven dependency cache
+        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven
+
       - name: Check status
         run: nix develop --command reproducible-builds
 
@@ -126,5 +147,11 @@ jobs:
         uses: DeterminateSystems/flake-checker-action@v5
         with:
           fail-mode: true
+      - name: Use Maven dependency cache
+        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven
+
       - name: Check maven pom quality
         run: nix develop --command maven-pom-quality

From 9dd5935f9b484cdc82aa302236991da04c7519c7 Mon Sep 17 00:00:00 2001
From: I-Al-Istannen <i-al-istannen@users.noreply.github.com>
Date: Thu, 24 Aug 2023 19:23:19 +0200
Subject: [PATCH 03/14] chore: Mourn

---
 .github/workflows/tests.yml |  8 ++++++++
 flake.nix                   | 27 ++++++++++++++++-----------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 6134e6818bc..02653a1035d 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -74,6 +74,8 @@ jobs:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven
 
+      - name: Time nix setup
+        run: nix develop --command true
       - name: Run tests with coverage
         run: nix develop --command coverage
         env:
@@ -101,6 +103,8 @@ jobs:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven
 
+      - name: Time nix setup
+        run: nix develop --command true
       - name: Run extra checks
         run: nix develop --command extra
       - name: Trigger extra remote tasks
@@ -130,6 +134,8 @@ jobs:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven
 
+      - name: Time nix setup
+        run: nix develop --command true
       - name: Check status
         run: nix develop --command reproducible-builds
 
@@ -153,5 +159,7 @@ jobs:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven
 
+      - name: Time nix setup
+        run: nix develop --command true
       - name: Check maven pom quality
         run: nix develop --command maven-pom-quality
diff --git a/flake.nix b/flake.nix
index 09212b84e31..33d61031060 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,7 +32,7 @@
               test = pkgs.writeScriptBin "test" ''
                 set -eu
                 # Use silent log config
-                mv chore/logback.xml src/test/resources/
+                cp chore/logback.xml src/test/resources/
                 mvn -f spoon-pom -B test-compile
 
                 # this is a hack to download the final test dependencies required to actually run the tests
@@ -47,20 +47,21 @@
               coverage = pkgs.writeScriptBin "coverage" ''
                 set -eu
                 # Use silent log config
-                mv chore/logback.xml src/test/resources/
+                cp chore/logback.xml src/test/resources/
                 mvn -f spoon-pom -B test-compile
                 mvn -f spoon-pom -Pcoveralls test jacoco:report coveralls:report -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER --fail-never
               '';
               extra = pkgs.writeScriptBin "extra" ''
                 set -eu
                 # Use silent log config
-                mv chore/logback.xml src/test/resources/
+                cp chore/logback.xml src/test/resources/
                 # Verify and Site Maven goals
                 mvn verify license:check site -DskipTests -DadditionalJOption=-Xdoclint:syntax,-missing -Dscan
                 # Install spoon-pom
                 pushd spoon-pom || exit 1
                 mvn install -DskipTests
-                popd spoon-pom || exit 1
+                popd || exit 1
+
                 # Checkstyle in src/tests
                 mvn -q checkstyle:checkstyle -Pcheckstyle-test
                 # Check documentation links
@@ -75,7 +76,7 @@
                 mvn -q test
                 mvn -q checkstyle:checkstyle license:check
                 mvn -q depclean:depclean
-                popd spoon-decompiler || exit 1
+                popd || exit 1
 
                 pushd spoon-control-flow || exit 1
                 mvn -q versions:use-latest-versions -DallowSnapshots=true -Dincludes=fr.inria.gforge.spoon
@@ -83,12 +84,12 @@
                 git diff
                 mvn -q test
                 mvn -q checkstyle:checkstyle license:check
-                popd spoon-control-flow || exit 1
+                popd || exit 1
 
                 # Requires z3
                 pushd spoon-dataflow || exit 1
                 ./gradlew build
-                popd spoon-dataflow || exit 1
+                popd || exit 1
 
                 pushd spoon-visualisation || exit 1
                 mvn -q versions:use-latest-versions -DallowSnapshots=true -Dincludes=fr.inria.gforge.spoon
@@ -96,7 +97,7 @@
                 git diff
                 mvn -q test
                 mvn -q depclean:depclean
-                popd spoon-visualisatio || exit 1
+                popd || exit 1
 
                 pushd spoon-smpl || exit 1
                 mvn -q versions:use-latest-versions -DallowSnapshots=true -Dincludes=fr.inria.gforge.spoon
@@ -105,7 +106,7 @@
                 mvn -q -Djava.src.version=11 test
                 mvn -q checkstyle:checkstyle license:check
                 mvn -q depclean:depclean
-                popd spoon-smp || exit 1
+                popd || exit 1
               '';
               extraRemote = pkgs.writeScriptBin "extra-remote" ''
                 curl https://raw.githubusercontent.com/SpoonLabs/spoon-ci-external/master/spoon-pull-request.sh | bash
@@ -120,9 +121,13 @@
               javadocQuality = pkgs.writeScriptBin "javadoc-quality" ''
                 ./chore/check-javadoc-regressions.py COMPARE_WITH_MASTER
               '';
+              pythonEnv = with pkgs; python311.withPackages (ps: [
+                ps.requests
+                ps.pygithub
+                ps.commonmark
+              ]);
               packages = with pkgs;
-                [ jdk maven gradle python311 z3 test coverage extra extraRemote mavenPomQuality javadocQuality reproducibleBuilds ] ++
-                (with pkgs.python311Packages; [ requests pygithub commonmark ]);
+                [ jdk maven gradle pythonEnv z3 test coverage extra extraRemote mavenPomQuality javadocQuality reproducibleBuilds ];
             };
         in
         rec {

From aaf21f2126ec40f26aafd9ae7060ade66e60879d Mon Sep 17 00:00:00 2001
From: I-Al-Istannen <i-al-istannen@users.noreply.github.com>
Date: Thu, 24 Aug 2023 19:49:10 +0200
Subject: [PATCH 04/14] chore: Bemoan

---
 .github/workflows/tests.yml |  8 ++++----
 flake.nix                   | 25 +++++++++++++++----------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 02653a1035d..ec6056e33a9 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -104,14 +104,14 @@ jobs:
           key: ${{ runner.os }}-maven
 
       - name: Time nix setup
-        run: nix develop --command true
+        run: nix develop .#extraChecks --command true
       - name: Run extra checks
-        run: nix develop --command extra
+        run: nix develop .#extraChecks --command extra
       - name: Trigger extra remote tasks
         if: github.repository == 'INRIA/spoon' && github.event_name == 'pull_request'
-        run: nix develop --command extra-remote
+        run: nix develop .#extraChecks --command extra-remote
       - name: Run Javadoc quality check
-        run: nix develop --command javadoc-quality
+        run: nix develop .#extraChecks --command javadoc-quality
 
   reproducible-builds:
     runs-on: ubuntu-latest
diff --git a/flake.nix b/flake.nix
index 33d61031060..7513ad1c192 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,7 +15,7 @@
       # Provide some binary packages for selected system types.
       devShells = forAllSystems (system:
         let
-          mkShell = javaVersion:
+          mkShell = extraCheckPackages: javaVersion:
             let
               pkgs = import nixpkgs {
                 inherit system;
@@ -121,20 +121,25 @@
               javadocQuality = pkgs.writeScriptBin "javadoc-quality" ''
                 ./chore/check-javadoc-regressions.py COMPARE_WITH_MASTER
               '';
-              pythonEnv = with pkgs; python311.withPackages (ps: [
-                ps.requests
-                ps.pygithub
-                ps.commonmark
-              ]);
+              pythonEnv =
+                if extraCheckPackages then
+                  with pkgs; python311.withPackages (ps: [
+                    ps.requests
+                    ps.pygithub
+                    ps.commonmark
+                  ])
+                else [];
               packages = with pkgs;
-                [ jdk maven gradle pythonEnv z3 test coverage extra extraRemote mavenPomQuality javadocQuality reproducibleBuilds ];
+                [ jdk maven test coverage mavenPomQuality javadocQuality reproducibleBuilds ]
+                ++ (if extraCheckPackages then [ gradle pythonEnv z3 extra extraRemote ] else [ ]);
             };
         in
         rec {
           default = jdk20;
-          jdk20 = mkShell 20;
-          jdk17 = mkShell 17;
-          jdk11 = mkShell 11;
+          jdk20 = mkShell false 20;
+          jdk17 = mkShell false 17;
+          jdk11 = mkShell false 11;
+          extraChecks = mkShell true 11;
         });
     };
 }

From 7f8ddc69fc364dc212830b20aa9ebd4c978ca79f Mon Sep 17 00:00:00 2001
From: I-Al-Istannen <i-al-istannen@users.noreply.github.com>
Date: Thu, 24 Aug 2023 21:20:51 +0200
Subject: [PATCH 05/14] chore: Rue

---
 flake.nix | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7513ad1c192..dcaf7e48f90 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,11 +20,18 @@
               pkgs = import nixpkgs {
                 inherit system;
                 overlays = [
-                  (final: prev: rec {
-                    jdk = prev."jdk${toString javaVersion}";
-                    gradle = prev.gradle.override { java = jdk; };
-                    maven = prev.maven.override { inherit jdk; };
-                  })
+                  (final: prev:
+                    let
+                      base = rec {
+                        jdk = prev."jdk${toString javaVersion}";
+                        maven = prev.maven.override { inherit jdk; };
+                      };
+                      extra = with base; {
+                        gradle = prev.gradle.override { java = jdk; };
+                        z3 = prev.z3.override { inherit jdk; javaBindings = true; };
+                      };
+                    in
+                    (if extraCheckPackages then base // extra else base))
                 ];
               };
             in
@@ -51,7 +58,7 @@
                 mvn -f spoon-pom -B test-compile
                 mvn -f spoon-pom -Pcoveralls test jacoco:report coveralls:report -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER --fail-never
               '';
-              extra = pkgs.writeScriptBin "extra" ''
+              extra = pkgs.writeScriptBin "extra" (if !extraCheckPackages then "exit 2" else ''
                 set -eu
                 # Use silent log config
                 cp chore/logback.xml src/test/resources/
@@ -88,7 +95,7 @@
 
                 # Requires z3
                 pushd spoon-dataflow || exit 1
-                ./gradlew build
+                env LD_LIBRARY_PATH="${pkgs.z3.lib}/lib:${pkgs.z3.java}/lib" ./gradlew build
                 popd || exit 1
 
                 pushd spoon-visualisation || exit 1
@@ -107,7 +114,7 @@
                 mvn -q checkstyle:checkstyle license:check
                 mvn -q depclean:depclean
                 popd || exit 1
-              '';
+              '');
               extraRemote = pkgs.writeScriptBin "extra-remote" ''
                 curl https://raw.githubusercontent.com/SpoonLabs/spoon-ci-external/master/spoon-pull-request.sh | bash
               '';
@@ -128,10 +135,10 @@
                     ps.pygithub
                     ps.commonmark
                   ])
-                else [];
+                else [ ];
               packages = with pkgs;
                 [ jdk maven test coverage mavenPomQuality javadocQuality reproducibleBuilds ]
-                ++ (if extraCheckPackages then [ gradle pythonEnv z3 extra extraRemote ] else [ ]);
+                ++ (if extraCheckPackages then [ gradle pythonEnv z3.java z3.lib extra extraRemote ] else [ ]);
             };
         in
         rec {

From 2fd8987985f8123279a50de52a2d7c67affd7fa6 Mon Sep 17 00:00:00 2001
From: I-Al-Istannen <i-al-istannen@users.noreply.github.com>
Date: Thu, 24 Aug 2023 23:29:33 +0200
Subject: [PATCH 06/14] chore: Grieve

---
 .github/workflows/jreleaser.yml | 102 +++++---------------------------
 chore/release.sh                |  82 +++++++++++++++++++++++++
 flake.nix                       |  57 ++++++++++++++----
 3 files changed, 144 insertions(+), 97 deletions(-)
 create mode 100644 chore/release.sh

diff --git a/.github/workflows/jreleaser.yml b/.github/workflows/jreleaser.yml
index e1193f4d390..25571c98bb1 100644
--- a/.github/workflows/jreleaser.yml
+++ b/.github/workflows/jreleaser.yml
@@ -14,11 +14,9 @@ on:
           - patch
 
 jobs:
-
-  build:
+  release:
     runs-on: ubuntu-latest
     steps:
-# Setups the environment
       - name: Checkout
         uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
         with:
@@ -28,100 +26,30 @@ jobs:
         run: |
           git config --global user.name "GitHub Actions Bot"
           git config --global user.email "<>"
-      - name: Set up JDK 11
-        uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@v4
+      - uses: DeterminateSystems/magic-nix-cache-action@v2
+      - name: Check Nixpkgs inputs
+        uses: DeterminateSystems/flake-checker-action@v5
         with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: maven
-          
-      - name: install go
-        uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4
-      - name: install semversion
-        run: go install github.com/ffurrer2/semver/cmd/semver@latest
-# Get current version from pom and remove snapshot if present.
-      - name: Get current version from pom and remove snapshot if present.
-        run: echo "CURRENT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout | sed 's/-SNAPSHOT//')" >> $GITHUB_ENV
-      - name: Get version with snapshot
-        run: echo "CURRENT_VERSION_WITH_SNAPSHOT=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
-# Calculate release version:
-# - if `version` is patch, we just increment drop the `-SNAPSHOT` suffix
-#   (e.g. 10.0.1-SNAPSHOT -> 10.0.1)
-# - if `version` is minor or major, we increment the minor or major version and
-#   set the patch version to `0` (e.g. 10.0.1-SNAPSHOT -> 11.0.0 or 10.1.0)
-#
-# As we are using a snapshot version, the first call to `semver next` slices
-# off only the `-SNAPSHOT` suffix. We therefore run `semver next` on the
-# version *without* the `-SNAPSHOT` prefix for major and minor bumps.
-#
-# After release, we run `semver next` once again and append the `-SNAPSHOT`
-# suffix. This results in our patch version from above becoming
-# `10.0.2-SNAPSHOT`. The major/minor just get the patch set to `1` and
-# `-SNAPSHOT` appended.
-      - name: Set next version for patch
-        if: ${{ github.event.inputs.version == 'patch' }}
-        run: echo "NEXT_VERSION=$(semver next ${{ github.event.inputs.version }} $CURRENT_VERSION_WITH_SNAPSHOT)" >> $GITHUB_ENV
-      - name: Set next version for major/minor
-        if: ${{ github.event.inputs.version == 'major'  || github.event.inputs.version == 'minor' }}
-        run: echo "NEXT_VERSION=$(semver next ${{ github.event.inputs.version }} $CURRENT_VERSION)" >> $GITHUB_ENV
-      - name: set branchname to next version
-        run: echo "BRANCH_NAME=release/$NEXT_VERSION" >> $GITHUB_ENV
-      - name: Set release version
-        run: |
-            mvn -f spoon-pom --no-transfer-progress --batch-mode versions:set -DnewVersion=$NEXT_VERSION -DprocessAllModules
-            mvn --no-transfer-progress --batch-mode versions:set -DnewVersion=$NEXT_VERSION -DprocessAllModules
-            mvn -f spoon-javadoc --no-transfer-progress --batch-mode versions:set -DnewVersion=$NEXT_VERSION -DprocessAllModules
-      - name: Commit & Push changes
-        run: |
-          git checkout -b ${{env.BRANCH_NAME}}
-          git commit -am "release: Releasing version ${{ env.NEXT_VERSION }}"
-          git push --set-upstream origin ${{ env.BRANCH_NAME }}
-
-
-
-# Now we can run the release
-      - name: Stage release
-        run:  |
-          mvn -f spoon-pom --no-transfer-progress --batch-mode -Pjreleaser clean deploy -DaltDeploymentRepository=local::default::file:./target/staging-deploy
-          mvn --no-transfer-progress --batch-mode -Pjreleaser deploy:deploy-file -Dfile="./spoon-pom/pom.xml" -DpomFile="./spoon-pom/pom.xml" -Durl=file://$(mvn help:evaluate -D"expression=project.basedir" -q -DforceStdout)/target/staging-deploy
-      - name: Print next version
-        run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout | sed 's/-SNAPSHOT//'
-      - name: Run JReleaser
-        uses: jreleaser/release-action@0b198089c53ad2aef0d2bff6b5e6061ead2bbb90 # v2
+          fail-mode: true
+      - name: Use Maven dependency cache
+        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
         with:
-          setup-java: false
-          version: 1.4.0
-          arguments: full-release 
+          path: ~/.m2/repository
+          key: ${{ runner.os }}
+
+      - name: Do release
+        run: nix develop .#jReleaser --command chore/release.sh ${{ github.event.inputs.version }}
         env:
-          JRELEASER_PROJECT_VERSION: ${{ env.NEXT_VERSION }}
           JRELEASER_GITHUB_TOKEN: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
           JRELEASER_GPG_PASSPHRASE: ${{ secrets.JRELEASER_GPG_PASSPHRASE }}
           JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.JRELEASER_GPG_PUBLIC_KEY }}
           JRELEASER_GPG_SECRET_KEY: ${{ secrets.JRELEASER_GPG_SECRET_KEY }}
           JRELEASER_NEXUS2_MAVEN_CENTRAL_USERNAME: ${{ secrets.JRELEASER_NEXUS2_MAVEN_CENTRAL_USERNAME }}
           JRELEASER_NEXUS2_MAVEN_CENTRAL_PASSWORD: ${{ secrets.JRELEASER_NEXUS2_MAVEN_CENTRAL_PASSWORD }}
-# Time to set the next version: The next version of any Release is a snapshot version of the next patch version
-      - name : Set next version (patch of release version) with -SNAPSHOT suffix
-        run: |
-         echo "NEXT_RELEASE_VERSION=$(semver next patch $NEXT_VERSION)-SNAPSHOT" >> $GITHUB_ENV
-         echo "NEXT_RELEASE_VERSION_WITHOUT_SNAPSHOT=$(semver next patch $NEXT_VERSION)" >> $GITHUB_ENV
-      - name: Set release version
-        run: |
-            mvn -f spoon-pom --no-transfer-progress --batch-mode versions:set -DnewVersion=$NEXT_RELEASE_VERSION -DprocessAllModules
-            mvn --no-transfer-progress --batch-mode versions:set -DnewVersion=$NEXT_RELEASE_VERSION -DprocessAllModules
-            mvn -f spoon-javadoc --no-transfer-progress --batch-mode versions:set -DnewVersion=$NEXT_RELEASE_VERSION -DprocessAllModules
-# Commit and push changes
-      - name: Commit & Push changes
-        run: |
-          git commit -am "release: Setting SNAPSHOT version $NEXT_RELEASE_VERSION"
-          git push --set-upstream origin ${{ env.BRANCH_NAME }}
-      - name: Merge Fast Forward
-        run: |
-          git checkout master
-          git merge --ff-only ${{ env.BRANCH_NAME }}
-          git push origin master
 
-# Log failure:
+        # Log failures
       - name: JReleaser release output
         if: always()
         uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3
diff --git a/chore/release.sh b/chore/release.sh
new file mode 100644
index 00000000000..0b486061d5b
--- /dev/null
+++ b/chore/release.sh
@@ -0,0 +1,82 @@
+if [ -z "$1" ]; then
+  echo "Usage: $0 <patch|major|minor>"
+  exit 1
+fi
+
+# Get current version from pom and remove snapshot if present.
+CURRENT_VERSION="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout | sed 's/-SNAPSHOT//')"
+CURRENT_VERSION_WITH_SNAPSHOT="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)"
+
+# Calculate release version:
+# - if `version` is patch, we just increment drop the `-SNAPSHOT` suffix
+#   (e.g. 10.0.1-SNAPSHOT -> 10.0.1)
+# - if `version` is minor or major, we increment the minor or major version and
+#   set the patch version to `0` (e.g. 10.0.1-SNAPSHOT -> 11.0.0 or 10.1.0)
+#
+# As we are using a snapshot version, the first call to `semver next` slices
+# off only the `-SNAPSHOT` suffix. We therefore run `semver next` on the
+# version *without* the `-SNAPSHOT` prefix for major and minor bumps.
+#
+# After release, we run `semver next` once again and append the `-SNAPSHOT`
+# suffix. This results in our patch version from above becoming
+# `10.0.2-SNAPSHOT`. The major/minor just get the patch set to `1` and
+# `-SNAPSHOT` appended.
+
+if [[ "$1" == "patch" ]]; then
+  NEXT_VERSION="$(semver next "$1" "$CURRENT_VERSION_WITH_SNAPSHOT")"
+elif [[ "$1" == "minor" ]] || [[ "$1" == "major" ]]; then
+  NEXT_VERSION="$(semver next "$1" "$CURRENT_VERSION")"
+else
+  echo "Unknown next version '$1'"
+  exit 1
+fi
+
+BRANCH_NAME="release/$NEXT_VERSION"
+
+echo "::group::Setting release version"
+mvn -f spoon-pom --no-transfer-progress --batch-mode versions:set -DnewVersion="$NEXT_VERSION" -DprocessAllModules
+mvn --no-transfer-progress --batch-mode versions:set -DnewVersion="$NEXT_VERSION" -DprocessAllModules
+mvn -f spoon-javadoc --no-transfer-progress --batch-mode versions:set -DnewVersion="$NEXT_VERSION" -DprocessAllModules
+echo "::endgroup::"
+
+echo "::group::Commit & Push changes"
+git checkout -b "$BRANCH_NAME"
+git commit -am "release: Releasing version $NEXT_VERSION"
+git push --set-upstream origin "$BRANCH_NAME"
+echo "::endgroup::"
+
+echo "::group::Staging release"
+mvn -f spoon-pom --no-transfer-progress --batch-mode -Pjreleaser clean deploy -DaltDeploymentRepository=local::default::file:./target/staging-deploy
+mvn --no-transfer-progress --batch-mode -Pjreleaser deploy:deploy-file \
+  -Dfile="./spoon-pom/pom.xml" \
+  -DpomFile="./spoon-pom/pom.xml" \
+  -Durl="file://$(mvn help:evaluate -D"expression=project.basedir" -q -DforceStdout)/target/staging-deploy"
+echo "::endgroup::"
+
+echo "::group::Next version"
+mvn help:evaluate -Dexpression=project.version -q -DforceStdout | sed 's/-SNAPSHOT//'
+echo "::endgroup::"
+
+echo "::group::Releasing"
+JRELEASER_PROJECT_VERSION="$NEXT_VERSION" jreleaser-cli full-release
+echo "::endgroup::"
+
+# Set next version (patch of release version) with -SNAPSHOT suffix
+NEXT_RELEASE_VERSION="$(semver next patch "$NEXT_VERSION")-SNAPSHOT"
+
+echo "::group::Updating poms to next target version"
+mvn -f spoon-pom --no-transfer-progress --batch-mode versions:set -DnewVersion="$NEXT_RELEASE_VERSION" -DprocessAllModules
+mvn --no-transfer-progress --batch-mode versions:set -DnewVersion="$NEXT_RELEASE_VERSION" -DprocessAllModules
+mvn -f spoon-javadoc --no-transfer-progress --batch-mode versions:set -DnewVersion="$NEXT_RELEASE_VERSION" -DprocessAllModules
+echo "::endgroup::"
+
+echo "::group::Committing changes"
+git commit -am "release: Setting SNAPSHOT version $NEXT_RELEASE_VERSION"
+git push --set-upstream origin "$BRANCH_NAME"
+echo "::endgroup::"
+
+echo "::group::Merging into master (fast-forward)"
+git checkout master
+git merge --ff-only "$BRANCH_NAME"
+git push origin master
+echo "::endgroup::"
diff --git a/flake.nix b/flake.nix
index dcaf7e48f90..2b26cfee9ad 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,7 +15,7 @@
       # Provide some binary packages for selected system types.
       devShells = forAllSystems (system:
         let
-          mkShell = extraCheckPackages: javaVersion:
+          mkShell = { release ? false, extraChecks ? false, javaVersion }:
             let
               pkgs = import nixpkgs {
                 inherit system;
@@ -31,9 +31,43 @@
                         z3 = prev.z3.override { inherit jdk; javaBindings = true; };
                       };
                     in
-                    (if extraCheckPackages then base // extra else base))
+                    (if extraChecks then base // extra else base))
                 ];
               };
+              semver = pkgs.buildGoModule rec {
+                name = "semver";
+                version = "2.1.0";
+
+                vendorHash = "sha256-HKqZbgP7vqDJMaHUbSqfSOnBYwzOtIr9o2v/T9S+uNg=";
+                subPackages = [ "cmd/semver" ];
+
+                src = pkgs.fetchFromGitHub {
+                  owner = "ffurrer2";
+                  repo = "semver";
+                  rev = "v${version}";
+                  sha256 = "sha256-i/XPA2Hr2puJFKupIeBUE/yFPJxSeVsDWcz1OepxIcU=";
+                };
+              };
+              jreleaser = pkgs.stdenv.mkDerivation rec {
+                pname = "jreleaser-cli";
+                version = "1.7.0";
+
+                src = pkgs.fetchurl {
+                  url = "https://github.com/jreleaser/jreleaser/releases/download/v${version}/jreleaser-tool-provider-${version}.jar";
+                  sha256 = "sha256-gr1IWisuep00xyoZWKXtHymWkQjbDhlk6+UC16bKXu0=";
+                };
+
+                nativeBuildInputs = with pkgs; [ makeWrapper ];
+
+                dontUnpack = true;
+
+                installPhase = ''
+                  mkdir -p $out/share/java/ $out/bin/
+                  cp $src $out/share/java/${pname}.jar
+                  makeWrapper ${pkgs.jdk}/bin/java $out/bin/${pname} \
+                    --add-flags "-jar $out/share/java/${pname}.jar"
+                '';
+              };
             in
             pkgs.mkShell rec {
               test = pkgs.writeScriptBin "test" ''
@@ -58,7 +92,7 @@
                 mvn -f spoon-pom -B test-compile
                 mvn -f spoon-pom -Pcoveralls test jacoco:report coveralls:report -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER --fail-never
               '';
-              extra = pkgs.writeScriptBin "extra" (if !extraCheckPackages then "exit 2" else ''
+              extra = pkgs.writeScriptBin "extra" (if !extraChecks then "exit 2" else ''
                 set -eu
                 # Use silent log config
                 cp chore/logback.xml src/test/resources/
@@ -129,7 +163,7 @@
                 ./chore/check-javadoc-regressions.py COMPARE_WITH_MASTER
               '';
               pythonEnv =
-                if extraCheckPackages then
+                if extraChecks then
                   with pkgs; python311.withPackages (ps: [
                     ps.requests
                     ps.pygithub
@@ -138,15 +172,18 @@
                 else [ ];
               packages = with pkgs;
                 [ jdk maven test coverage mavenPomQuality javadocQuality reproducibleBuilds ]
-                ++ (if extraCheckPackages then [ gradle pythonEnv z3.java z3.lib extra extraRemote ] else [ ]);
-            };
+                ++ (if extraChecks then [ gradle pythonEnv z3.java z3.lib extra extraRemote ] else [ ])
+                ++ (if release then [ semver jreleaser ] else [ ]);
+            }
+          ;
         in
         rec {
           default = jdk20;
-          jdk20 = mkShell false 20;
-          jdk17 = mkShell false 17;
-          jdk11 = mkShell false 11;
-          extraChecks = mkShell true 11;
+          jdk20 = mkShell { javaVersion = 20; };
+          jdk17 = mkShell { javaVersion = 17; };
+          jdk11 = mkShell { javaVersion = 11; };
+          extraChecks = mkShell { extraChecks = true; javaVersion = 11; };
+          jReleaser = mkShell { release = true; javaVersion = 11; };
         });
     };
 }

From aa16f3ede6c13850c105c041fa7822015f6a0cf0 Mon Sep 17 00:00:00 2001
From: I-Al-Istannen <i-al-istannen@users.noreply.github.com>
Date: Sat, 26 Aug 2023 21:47:13 +0200
Subject: [PATCH 07/14] chore: Ache

---
 .github/workflows/beta-release.yml    | 47 +++++++++++++++++++++++++++
 .github/workflows/nightly-release.yml | 47 +++++++++++++++++++++++++++
 chore/release-beta.sh                 | 31 ++++++++++++++++++
 chore/release-nightly.sh              | 15 +++++++++
 4 files changed, 140 insertions(+)
 create mode 100644 .github/workflows/beta-release.yml
 create mode 100644 .github/workflows/nightly-release.yml
 create mode 100644 chore/release-beta.sh
 create mode 100644 chore/release-nightly.sh

diff --git a/.github/workflows/beta-release.yml b/.github/workflows/beta-release.yml
new file mode 100644
index 00000000000..146cdd2bf63
--- /dev/null
+++ b/.github/workflows/beta-release.yml
@@ -0,0 +1,47 @@
+name: Release beta version
+
+on:
+    schedule:
+      - cron: '0 0 * * 0' # Sundays at 00:00 (https://crontab.guru/#0_0_*_*_0)
+
+jobs:
+  snapshot:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@v4
+      - uses: DeterminateSystems/magic-nix-cache-action@v2
+      - name: Check Nixpkgs inputs
+        uses: DeterminateSystems/flake-checker-action@v5
+        with:
+          fail-mode: true
+      - name: Use Maven dependency cache
+        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}
+
+      - name: Make beta release
+        run: nix develop .#jReleaser --command chore/release-beta.sh
+        env:
+          JRELEASER_GITHUB_TOKEN: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
+          JRELEASER_GPG_PASSPHRASE: ${{ secrets.JRELEASER_GPG_PASSPHRASE }}
+          JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.JRELEASER_GPG_PUBLIC_KEY }}
+          JRELEASER_GPG_SECRET_KEY: ${{ secrets.JRELEASER_GPG_SECRET_KEY }}
+          JRELEASER_NEXUS2_MAVEN_CENTRAL_USERNAME: ${{ secrets.JRELEASER_NEXUS2_MAVEN_CENTRAL_USERNAME }}
+          JRELEASER_NEXUS2_MAVEN_CENTRAL_PASSWORD: ${{ secrets.JRELEASER_NEXUS2_MAVEN_CENTRAL_PASSWORD }}
+
+      # Log failures
+      - name: JReleaser release output
+        if: always()
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3
+        with:
+          name: jreleaser-release
+          path: |
+            out/jreleaser/trace.log
+            out/jreleaser/output.properties
diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml
new file mode 100644
index 00000000000..e3f5d3a473a
--- /dev/null
+++ b/.github/workflows/nightly-release.yml
@@ -0,0 +1,47 @@
+name: Release nightly version
+
+on:
+    schedule:
+      - cron: '0 0 * * *' # Every day at 00:00 UTC (https://crontab.guru/#0_0_*_*_*)
+
+jobs:
+  nightly:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@v4
+      - uses: DeterminateSystems/magic-nix-cache-action@v2
+      - name: Check Nixpkgs inputs
+        uses: DeterminateSystems/flake-checker-action@v5
+        with:
+          fail-mode: true
+      - name: Use Maven dependency cache
+        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}
+
+      - name: Make beta release
+        run: nix develop .#jReleaser --command chore/release-nightly.sh
+        env:
+          JRELEASER_GITHUB_TOKEN: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
+          JRELEASER_GPG_PASSPHRASE: ${{ secrets.JRELEASER_GPG_PASSPHRASE }}
+          JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.JRELEASER_GPG_PUBLIC_KEY }}
+          JRELEASER_GPG_SECRET_KEY: ${{ secrets.JRELEASER_GPG_SECRET_KEY }}
+          JRELEASER_NEXUS2_MAVEN_CENTRAL_USERNAME: ${{ secrets.JRELEASER_NEXUS2_MAVEN_CENTRAL_USERNAME }}
+          JRELEASER_NEXUS2_MAVEN_CENTRAL_PASSWORD: ${{ secrets.JRELEASER_NEXUS2_MAVEN_CENTRAL_PASSWORD }}
+
+      # Log failures
+      - name: JReleaser release output
+        if: always()
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3
+        with:
+          name: jreleaser-release
+          path: |
+            out/jreleaser/trace.log
+            out/jreleaser/output.properties
diff --git a/chore/release-beta.sh b/chore/release-beta.sh
new file mode 100644
index 00000000000..a73d13e6109
--- /dev/null
+++ b/chore/release-beta.sh
@@ -0,0 +1,31 @@
+CURRENT_VERSION_WITH_SNAPSHOT="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)"
+
+if [[ ! $CURRENT_VERSION_WITH_SNAPSHOT =~ .*-SNAPSHOT ]]; then
+  echo "Not a snapshot version, skipping"
+  exit 78
+fi
+
+# Compute next beta number
+echo "::group::Computing next beta number"
+LAST_BETA_NUMBER="$(curl -L "http://search.maven.org/solrsearch/select?q=a:spoon-core+g:fr.inria.gforge.spoon&rows=40&wt=json&core=gav" | jq -r ".response.docs | map(.v) | map((match(\"$CURRENT_VERSION_NO_SNAPSHOT-beta-(.*)\") | .captures[0].string) // \"0\") | .[0]")"
+echo "LAST_BETA_NUMBER $LAST_BETA_NUMBER"
+
+NEW_BETA_NUMBER=$((LAST_BETA_NUMBER + 1))
+echo "NEW_BETA_NUMBER $NEW_BETA_NUMBER"
+NEXT_VERSION="$CURRENT_VERSION_NO_SNAPSHOT-beta-$NEW_BETA_NUMBER"
+echo "::endgroup::"
+
+echo "::group::Setting release version"
+mvn -f spoon-pom --no-transfer-progress --batch-mode versions:set -DnewVersion="$NEXT_VERSION" -DprocessAllModules
+mvn --no-transfer-progress --batch-mode versions:set -DnewVersion="$NEXT_VERSION" -DprocessAllModules
+mvn -f spoon-javadoc --no-transfer-progress --batch-mode versions:set -DnewVersion="$NEXT_VERSION" -DprocessAllModules
+echo "::endgroup::"
+
+echo "::group::Staging release"
+mvn -f spoon-pom --no-transfer-progress --batch-mode -Pjreleaser clean deploy -DaltDeploymentRepository=local::default::file:./target/staging-deploy
+mvn --no-transfer-progress --batch-mode -Pjreleaser deploy:deploy-file -Dfile="./spoon-pom/pom.xml" -DpomFile="./spoon-pom/pom.xml" -Durl="file://$(mvn help:evaluate -D"expression=project.basedir" -q -DforceStdout)/target/staging-deploy"
+echo "::endgroup::"
+
+echo "::group::Running jreleaser"
+JRELEASER_PROJECT_VERSION="$NEXT_VERSION" jreleaser-cli deploy
+echo "::endgroup::"
diff --git a/chore/release-nightly.sh b/chore/release-nightly.sh
new file mode 100644
index 00000000000..d4e5598ff93
--- /dev/null
+++ b/chore/release-nightly.sh
@@ -0,0 +1,15 @@
+CURRENT_VERSION_WITH_SNAPSHOT="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)"
+
+if [[ ! $CURRENT_VERSION_WITH_SNAPSHOT =~ .*-SNAPSHOT ]]; then
+  echo "Not a snapshot version, skipping"
+  exit 78
+fi
+
+echo "::group::Staging release"
+mvn -f spoon-pom --no-transfer-progress --batch-mode -Pjreleaser clean deploy -DaltDeploymentRepository=local::default::file:./target/staging-deploy
+mvn --no-transfer-progress --batch-mode -Pjreleaser deploy:deploy-file -Dfile="./spoon-pom/pom.xml" -DpomFile="./spoon-pom/pom.xml" -Durl="file://$(mvn help:evaluate -D"expression=project.basedir" -q -DforceStdout)/target/staging-deploy"
+echo "::endgroup::"
+
+echo "::group::Running jreleaser"
+JRELEASER_PROJECT_VERSION="$NEXT_VERSION" jreleaser-cli deploy
+echo "::endgroup::"

From 9181c4bd02770e18bf5e1c34703264824d637254 Mon Sep 17 00:00:00 2001
From: I-Al-Istannen <i-al-istannen@users.noreply.github.com>
Date: Sat, 26 Aug 2023 22:13:40 +0200
Subject: [PATCH 08/14] chore: Bewail

---
 .github/workflows/beta-release.yml    | 47 ---------------------------
 .github/workflows/jreleaser.yml       | 16 +++------
 .github/workflows/nightly-release.yml | 47 ---------------------------
 .github/workflows/release-beta.yml    | 12 +++++++
 .github/workflows/release-manual.yml  | 21 ++++++++++++
 .github/workflows/release-nightly.yml | 12 +++++++
 flake.nix                             |  2 +-
 7 files changed, 51 insertions(+), 106 deletions(-)
 delete mode 100644 .github/workflows/beta-release.yml
 delete mode 100644 .github/workflows/nightly-release.yml
 create mode 100644 .github/workflows/release-beta.yml
 create mode 100644 .github/workflows/release-manual.yml
 create mode 100644 .github/workflows/release-nightly.yml

diff --git a/.github/workflows/beta-release.yml b/.github/workflows/beta-release.yml
deleted file mode 100644
index 146cdd2bf63..00000000000
--- a/.github/workflows/beta-release.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-name: Release beta version
-
-on:
-    schedule:
-      - cron: '0 0 * * 0' # Sundays at 00:00 (https://crontab.guru/#0_0_*_*_0)
-
-jobs:
-  snapshot:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
-      - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v4
-      - uses: DeterminateSystems/magic-nix-cache-action@v2
-      - name: Check Nixpkgs inputs
-        uses: DeterminateSystems/flake-checker-action@v5
-        with:
-          fail-mode: true
-      - name: Use Maven dependency cache
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}
-
-      - name: Make beta release
-        run: nix develop .#jReleaser --command chore/release-beta.sh
-        env:
-          JRELEASER_GITHUB_TOKEN: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
-          JRELEASER_GPG_PASSPHRASE: ${{ secrets.JRELEASER_GPG_PASSPHRASE }}
-          JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.JRELEASER_GPG_PUBLIC_KEY }}
-          JRELEASER_GPG_SECRET_KEY: ${{ secrets.JRELEASER_GPG_SECRET_KEY }}
-          JRELEASER_NEXUS2_MAVEN_CENTRAL_USERNAME: ${{ secrets.JRELEASER_NEXUS2_MAVEN_CENTRAL_USERNAME }}
-          JRELEASER_NEXUS2_MAVEN_CENTRAL_PASSWORD: ${{ secrets.JRELEASER_NEXUS2_MAVEN_CENTRAL_PASSWORD }}
-
-      # Log failures
-      - name: JReleaser release output
-        if: always()
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3
-        with:
-          name: jreleaser-release
-          path: |
-            out/jreleaser/trace.log
-            out/jreleaser/output.properties
diff --git a/.github/workflows/jreleaser.yml b/.github/workflows/jreleaser.yml
index 25571c98bb1..5b86b4788d9 100644
--- a/.github/workflows/jreleaser.yml
+++ b/.github/workflows/jreleaser.yml
@@ -1,20 +1,14 @@
 name: Release
 
 on:
-  workflow_dispatch:
+  workflow_call:
     inputs:
-      version:
-        description: 'Next release version'
+      release-script-to-run:
         required: true
-        default: 'patch'
-        type: choice
-        options:
-          - major
-          - minor
-          - patch
+        type: string
 
 jobs:
-  release:
+  jreleaser:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -40,7 +34,7 @@ jobs:
           key: ${{ runner.os }}
 
       - name: Do release
-        run: nix develop .#jReleaser --command chore/release.sh ${{ github.event.inputs.version }}
+        run: nix develop .#jReleaser --command ${{ inputs.release-script-to-run }}
         env:
           JRELEASER_GITHUB_TOKEN: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
           JRELEASER_GPG_PASSPHRASE: ${{ secrets.JRELEASER_GPG_PASSPHRASE }}
diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml
deleted file mode 100644
index e3f5d3a473a..00000000000
--- a/.github/workflows/nightly-release.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-name: Release nightly version
-
-on:
-    schedule:
-      - cron: '0 0 * * *' # Every day at 00:00 UTC (https://crontab.guru/#0_0_*_*_*)
-
-jobs:
-  nightly:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
-      - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v4
-      - uses: DeterminateSystems/magic-nix-cache-action@v2
-      - name: Check Nixpkgs inputs
-        uses: DeterminateSystems/flake-checker-action@v5
-        with:
-          fail-mode: true
-      - name: Use Maven dependency cache
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}
-
-      - name: Make beta release
-        run: nix develop .#jReleaser --command chore/release-nightly.sh
-        env:
-          JRELEASER_GITHUB_TOKEN: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
-          JRELEASER_GPG_PASSPHRASE: ${{ secrets.JRELEASER_GPG_PASSPHRASE }}
-          JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.JRELEASER_GPG_PUBLIC_KEY }}
-          JRELEASER_GPG_SECRET_KEY: ${{ secrets.JRELEASER_GPG_SECRET_KEY }}
-          JRELEASER_NEXUS2_MAVEN_CENTRAL_USERNAME: ${{ secrets.JRELEASER_NEXUS2_MAVEN_CENTRAL_USERNAME }}
-          JRELEASER_NEXUS2_MAVEN_CENTRAL_PASSWORD: ${{ secrets.JRELEASER_NEXUS2_MAVEN_CENTRAL_PASSWORD }}
-
-      # Log failures
-      - name: JReleaser release output
-        if: always()
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3
-        with:
-          name: jreleaser-release
-          path: |
-            out/jreleaser/trace.log
-            out/jreleaser/output.properties
diff --git a/.github/workflows/release-beta.yml b/.github/workflows/release-beta.yml
new file mode 100644
index 00000000000..8da3bbfedff
--- /dev/null
+++ b/.github/workflows/release-beta.yml
@@ -0,0 +1,12 @@
+name: Release beta version
+
+on:
+    schedule:
+      - cron: '0 0 * * 0' # Sundays at 00:00 (https://crontab.guru/#0_0_*_*_0)
+
+jobs:
+  snapshot:
+    uses: ./.github/workflows/jreleaser.yml
+    with:
+      release-script-to-run: chore/release-beta.sh
+    secrets: inherit
diff --git a/.github/workflows/release-manual.yml b/.github/workflows/release-manual.yml
new file mode 100644
index 00000000000..f81fddd119a
--- /dev/null
+++ b/.github/workflows/release-manual.yml
@@ -0,0 +1,21 @@
+name: Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Next release version'
+        required: true
+        default: 'patch'
+        type: choice
+        options:
+          - major
+          - minor
+          - patch
+
+jobs:
+  release:
+    uses: ./.github/workflows/jreleaser.yml
+    with:
+      release-script-to-run: chore/release.sh ${{ github.event.inputs.version }}
+    secrets: inherit
diff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml
new file mode 100644
index 00000000000..9b1f5e07b6c
--- /dev/null
+++ b/.github/workflows/release-nightly.yml
@@ -0,0 +1,12 @@
+name: Release nightly version
+
+on:
+    schedule:
+      - cron: '0 0 * * *' # Every day at 00:00 UTC (https://crontab.guru/#0_0_*_*_*)
+
+jobs:
+  nightly:
+    uses: ./.github/workflows/jreleaser.yml
+    with:
+      release-script-to-run: chore/release-nightly.sh
+    secrets: inherit
diff --git a/flake.nix b/flake.nix
index 2b26cfee9ad..10e17a451ec 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,5 @@
 {
-  description = "A small flake building maven projects";
+  description = "Spoon is a metaprogramming library to analyze and transform Java source code. 🥄 is made with ❤️, 🍻 and ✨. It parses source files to build a well-designed AST with powerful analysis and transformation API.";
 
   # Nixpkgs / NixOS version to use.
   inputs = {

From 04be667b55f7a966ab539cbdfc19a7f951ff11c5 Mon Sep 17 00:00:00 2001
From: I-Al-Istannen <i-al-istannen@users.noreply.github.com>
Date: Sun, 27 Aug 2023 15:13:47 +0200
Subject: [PATCH 09/14] chore: Repent

---
 .github/workflows/tests.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ec6056e33a9..713757edd92 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -53,6 +53,29 @@ jobs:
         run: nix develop .#jdk${{ matrix.java }} --command true
       - name: Test
         run: nix develop .#jdk${{ matrix.java }} --command test
+
+  test-windows:
+    runs-on: windows-latest
+    name: Tests with Java 17 on windows-latest
+    steps:
+      - name: Disable Git's autocrlf
+        run: git config --global core.autocrlf false
+      - name: git checkout
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'maven'
+
+      - name: Test
+        run: |
+          cp chore/logback.xml src/test/resources/
+          mvn -f spoon-pom test
+          cat testResults.spoon
+
   coverage:
     runs-on: ubuntu-latest
     name: Test with coverage

From c0fddc0cdb023cc52b76e702b704c9ec889986cf Mon Sep 17 00:00:00 2001
From: I-Al-Istannen <i-al-istannen@users.noreply.github.com>
Date: Sun, 27 Aug 2023 18:28:12 +0200
Subject: [PATCH 10/14] chore: Deplore

Factor out common setup into its own reused workflow
---
 .github/actions/setup-tests/action.yml | 29 ++++++++
 .github/workflows/jreleaser.yml        | 18 +----
 .github/workflows/tests.yml            | 97 ++++++--------------------
 3 files changed, 54 insertions(+), 90 deletions(-)
 create mode 100644 .github/actions/setup-tests/action.yml

diff --git a/.github/actions/setup-tests/action.yml b/.github/actions/setup-tests/action.yml
new file mode 100644
index 00000000000..eb70045ae0b
--- /dev/null
+++ b/.github/actions/setup-tests/action.yml
@@ -0,0 +1,29 @@
+name: Setup test environment
+
+runs:
+  using: "composite"
+  steps:
+    - name: Set git user
+      shell: bash
+      run: |
+        git config --global user.name "GitHub Actions Bot"
+        git config --global user.email "<>"
+    - name: Install Nix
+      uses: DeterminateSystems/nix-installer-action@65d7c888b2778e8cf30a07a88422ccb23499bfb8 # v4
+    - uses: DeterminateSystems/magic-nix-cache-action@8a218f9e264e9c3803c9a1ee1c30d8e4ab55be63 # v2
+    - name: Check Nixpkgs inputs
+      uses: DeterminateSystems/flake-checker-action@4b90f9fc724969ff153fe1803460917c84fe00a3 # v5
+      with:
+        fail-mode: true
+    - name: Use Maven dependency cache
+      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+      with:
+        path: ~/.m2/repository
+        # We use a unique key and restore from the base one, to ensure that
+        # the cache is updated every time, even if a cache hit was observed.
+        # See
+        # https://github.com/actions/cache/blob/main/tips-and-workarounds.md#update-a-cache
+        # for more information.
+        key: ${{ runner.os }}-maven-${{ github.run_id }}
+        restore-keys: |
+          ${{ runner.os }}-maven
diff --git a/.github/workflows/jreleaser.yml b/.github/workflows/jreleaser.yml
index 5b86b4788d9..66d59fc43ce 100644
--- a/.github/workflows/jreleaser.yml
+++ b/.github/workflows/jreleaser.yml
@@ -16,22 +16,8 @@ jobs:
         with:
           fetch-depth: 0
           token: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
-      - name: Set git user
-        run: |
-          git config --global user.name "GitHub Actions Bot"
-          git config --global user.email "<>"
-      - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v4
-      - uses: DeterminateSystems/magic-nix-cache-action@v2
-      - name: Check Nixpkgs inputs
-        uses: DeterminateSystems/flake-checker-action@v5
-        with:
-          fail-mode: true
-      - name: Use Maven dependency cache
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}
+      - name: Setup env
+        uses: ./.github/actions/setup-tests
 
       - name: Do release
         run: nix develop .#jReleaser --command ${{ inputs.release-script-to-run }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 713757edd92..d7ae86196c6 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -14,7 +14,7 @@ on:
       - master
       - chore/flakey-flakey-rise-and-shine
   schedule:
-  - cron: "0 0 * * *"
+    - cron: "0 0 * * *"
 
 env:
   MAVEN_OPTS: >-
@@ -23,31 +23,20 @@ env:
     -Daether.connector.requestTimeout=300000
 
 jobs:
-  build:
+  test-linux:
     runs-on: ${{ matrix.os }}
+    name: Tests with Java ${{ matrix.java }} on ${{ matrix.os }}
     strategy:
       matrix:
         java: [11, 17, 20]
         os: [ubuntu-latest]
-
-    name: Tests with Java ${{ matrix.java }} on ${{ matrix.os }}
     steps:
-      - name: git checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - name: Checkout
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
         with:
           fetch-depth: 0
-      - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v4
-      - uses: DeterminateSystems/magic-nix-cache-action@v2
-      - name: Check Nixpkgs inputs
-        uses: DeterminateSystems/flake-checker-action@v5
-        with:
-          fail-mode: true
-      - name: Use Maven dependency cache
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven
+      - name: Setup env
+        uses: ./.github/actions/setup-tests
 
       - name: Time nix setup
         run: nix develop .#jdk${{ matrix.java }} --command true
@@ -80,22 +69,12 @@ jobs:
     runs-on: ubuntu-latest
     name: Test with coverage
     steps:
-      - name: git checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - name: Checkout
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
         with:
           fetch-depth: 0
-      - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v4
-      - uses: DeterminateSystems/magic-nix-cache-action@v2
-      - name: Check Nixpkgs inputs
-        uses: DeterminateSystems/flake-checker-action@v5
-        with:
-          fail-mode: true
-      - name: Use Maven dependency cache
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven
+      - name: Setup env
+        uses: ./.github/actions/setup-tests
 
       - name: Time nix setup
         run: nix develop --command true
@@ -109,22 +88,12 @@ jobs:
     runs-on: ubuntu-latest
     name: Extra checks
     steps:
-      - name: git checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - name: Checkout
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
         with:
           fetch-depth: 0
-      - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v4
-      - uses: DeterminateSystems/magic-nix-cache-action@v2
-      - name: Check Nixpkgs inputs
-        uses: DeterminateSystems/flake-checker-action@v5
-        with:
-          fail-mode: true
-      - name: Use Maven dependency cache
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven
+      - name: Setup env
+        uses: ./.github/actions/setup-tests
 
       - name: Time nix setup
         run: nix develop .#extraChecks --command true
@@ -140,22 +109,12 @@ jobs:
     runs-on: ubuntu-latest
     name: reproducible-builds
     steps:
-      - name: git checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - name: Checkout
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
         with:
           fetch-depth: 0
-      - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v4
-      - uses: DeterminateSystems/magic-nix-cache-action@v2
-      - name: Check Nixpkgs inputs
-        uses: DeterminateSystems/flake-checker-action@v5
-        with:
-          fail-mode: true
-      - name: Use Maven dependency cache
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven
+      - name: Setup env
+        uses: ./.github/actions/setup-tests
 
       - name: Time nix setup
         run: nix develop --command true
@@ -165,22 +124,12 @@ jobs:
   maven-central-requirements:
     runs-on: ubuntu-latest
     steps:
-      - name: git checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - name: Checkout
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
         with:
           fetch-depth: 0
-      - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v4
-      - uses: DeterminateSystems/magic-nix-cache-action@v2
-      - name: Check Nixpkgs inputs
-        uses: DeterminateSystems/flake-checker-action@v5
-        with:
-          fail-mode: true
-      - name: Use Maven dependency cache
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven
+      - name: Setup env
+        uses: ./.github/actions/setup-tests
 
       - name: Time nix setup
         run: nix develop --command true

From 0dbed0c1cec47b3ddacd9618efec818e77b36799 Mon Sep 17 00:00:00 2001
From: I-Al-Istannen <i-al-istannen@users.noreply.github.com>
Date: Sun, 27 Aug 2023 19:23:49 +0200
Subject: [PATCH 11/14] chore: Sorrow

---
 .github/workflows/update-flake.yml | 30 ++++++++++++++++++++++++++++++
 jreleaser.yml                      |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 .github/workflows/update-flake.yml

diff --git a/.github/workflows/update-flake.yml b/.github/workflows/update-flake.yml
new file mode 100644
index 00000000000..28ce324a115
--- /dev/null
+++ b/.github/workflows/update-flake.yml
@@ -0,0 +1,30 @@
+name: Update flake.lock
+on:
+  workflow_dispatch: # allows manual triggering
+  schedule:
+    - cron: '0 0 * * 0' # runs weekly on Sunday at 00:00
+
+jobs:
+  lockfile:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
+        with:
+          fetch-depth: 0
+      - name: Setup env
+        uses: ./.github/actions/setup-tests
+
+      - name: Update flake.lock
+        uses: DeterminateSystems/update-flake-lock@da2fd6f2563fe3e4f2af8be73b864088564e263d # v20
+        id: update-flake
+        with:
+          pr-title: "Update flake.lock"
+          pr-labels: |
+            chore
+          token: ${{ secrets.GH_PAT_NIX }}
+
+      - name: Enable Pull Request Automerge
+        run: gh pr merge --merge --auto "${{ steps.update-flake.outputs.pull-request-number }}"
+        env:
+          GH_TOKEN: ${{ secrets.GH_PAT_NIX }}
diff --git a/jreleaser.yml b/jreleaser.yml
index 94f0cd823f2..d15436cdc45 100644
--- a/jreleaser.yml
+++ b/jreleaser.yml
@@ -43,6 +43,7 @@ deploy:
         # Spoon is hosted on the legacy sonatype instance, see
         # https://central.sonatype.org/publish/publish-guide/#releasing-to-central
         url: https://oss.sonatype.org/service/local
+        snapshotUrl: https://oss.sonatype.org/content/repositories/snapshots
         closeRepository: true
         releaseRepository: true
         stagingRepositories:

From fecf6be1fb1758d2bd83a07b8ed4030594d2c162 Mon Sep 17 00:00:00 2001
From: I-Al-Istannen <i-al-istannen@users.noreply.github.com>
Date: Mon, 28 Aug 2023 20:51:14 +0200
Subject: [PATCH 12/14] Merge with squash

---
 .github/workflows/update-flake.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-flake.yml b/.github/workflows/update-flake.yml
index 28ce324a115..64c6dc7e5e5 100644
--- a/.github/workflows/update-flake.yml
+++ b/.github/workflows/update-flake.yml
@@ -19,12 +19,12 @@ jobs:
         uses: DeterminateSystems/update-flake-lock@da2fd6f2563fe3e4f2af8be73b864088564e263d # v20
         id: update-flake
         with:
-          pr-title: "Update flake.lock"
+          pr-title: "chore(deps): Update flake.lock"
           pr-labels: |
             chore
           token: ${{ secrets.GH_PAT_NIX }}
 
       - name: Enable Pull Request Automerge
-        run: gh pr merge --merge --auto "${{ steps.update-flake.outputs.pull-request-number }}"
+        run: 'gh pr merge --auto --squash -t "chore(deps): Update flake.lock" ${{ steps.update-flake.outputs.pull-request-number }}'
         env:
           GH_TOKEN: ${{ secrets.GH_PAT_NIX }}

From c7716a4db81b34fcc11690e1af2d8343c8807127 Mon Sep 17 00:00:00 2001
From: I-Al-Istannen <i-al-istannen@users.noreply.github.com>
Date: Mon, 28 Aug 2023 23:02:14 +0200
Subject: [PATCH 13/14] Add 21-ea JDK to blessed linux 64 bit system

---
 flake.nix | 358 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 187 insertions(+), 171 deletions(-)

diff --git a/flake.nix b/flake.nix
index 10e17a451ec..85c57e42245 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,180 +10,196 @@
     let
       # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'.
       forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed;
+      mkShell = system: { release ? false, extraChecks ? false, javaVersion }:
+        let
+          pkgs = import nixpkgs {
+            inherit system;
+            overlays = [
+              (final: prev:
+                let
+                  base = rec {
+                    jdk = if javaVersion < 21 then prev."jdk${toString javaVersion}" else jdk21-ea;
+                    maven = prev.maven.override { inherit jdk; };
+                  };
+                  extra = with base; {
+                    gradle = prev.gradle.override { java = jdk; };
+                    z3 = prev.z3.override { inherit jdk; javaBindings = true; };
+                  };
+                in
+                (if extraChecks then base // extra else base))
+            ];
+          };
+          jdk21-ea = pkgs.stdenv.mkDerivation rec {
+            name = "jdk21-oracle";
+            version = "21+35";
+            src = builtins.fetchTarball {
+              url = "https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/openjdk-21_linux-x64_bin.tar.gz";
+              sha256 = "sha256:0g3vf0kcpciixfv1kvgbk685h6cfn1s0cx2di4rhl3r7xlal217w";
+            };
+            installPhase = ''
+              cd ..
+              mv $sourceRoot $out
+            '';
+          };
+          semver = pkgs.buildGoModule rec {
+            name = "semver";
+            version = "2.1.0";
+
+            vendorHash = "sha256-HKqZbgP7vqDJMaHUbSqfSOnBYwzOtIr9o2v/T9S+uNg=";
+            subPackages = [ "cmd/semver" ];
+
+            src = pkgs.fetchFromGitHub {
+              owner = "ffurrer2";
+              repo = "semver";
+              rev = "v${version}";
+              sha256 = "sha256-i/XPA2Hr2puJFKupIeBUE/yFPJxSeVsDWcz1OepxIcU=";
+            };
+          };
+          jreleaser = pkgs.stdenv.mkDerivation rec {
+            pname = "jreleaser-cli";
+            version = "1.7.0";
+
+            src = pkgs.fetchurl {
+              url = "https://github.com/jreleaser/jreleaser/releases/download/v${version}/jreleaser-tool-provider-${version}.jar";
+              sha256 = "sha256-gr1IWisuep00xyoZWKXtHymWkQjbDhlk6+UC16bKXu0=";
+            };
+
+            nativeBuildInputs = with pkgs; [ makeWrapper ];
+
+            dontUnpack = true;
+
+            installPhase = ''
+              mkdir -p $out/share/java/ $out/bin/
+              cp $src $out/share/java/${pname}.jar
+              makeWrapper ${pkgs.jdk}/bin/java $out/bin/${pname} \
+                --add-flags "-jar $out/share/java/${pname}.jar"
+            '';
+          };
+        in
+        pkgs.mkShell rec {
+          test = pkgs.writeScriptBin "test" ''
+            set -eu
+            # Use silent log config
+            cp chore/logback.xml src/test/resources/
+            mvn -f spoon-pom -B test-compile
+
+            # this is a hack to download the final test dependencies required to actually run the tests
+            timeout 20 mvn -f spoon-pom -B test || echo "Done fetching dependencies"
+
+            # Execute tests
+            mvn -f spoon-pom test
+
+            # print test results in log
+            cat testResults.spoon
+          '';
+          coverage = pkgs.writeScriptBin "coverage" ''
+            set -eu
+            # Use silent log config
+            cp chore/logback.xml src/test/resources/
+            mvn -f spoon-pom -B test-compile
+            mvn -f spoon-pom -Pcoveralls test jacoco:report coveralls:report -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER --fail-never
+          '';
+          extra = pkgs.writeScriptBin "extra" (if !extraChecks then "exit 2" else ''
+            set -eu
+            # Use silent log config
+            cp chore/logback.xml src/test/resources/
+            # Verify and Site Maven goals
+            mvn verify license:check site -DskipTests -DadditionalJOption=-Xdoclint:syntax,-missing -Dscan
+            # Install spoon-pom
+            pushd spoon-pom || exit 1
+            mvn install -DskipTests
+            popd || exit 1
+
+            # Checkstyle in src/tests
+            mvn -q checkstyle:checkstyle -Pcheckstyle-test
+            # Check documentation links
+            python3 ./chore/check-links-in-doc.py
+            # Analyze dependencies through DepClean in spoon-core
+            mvn -q depclean:depclean
+
+            pushd spoon-decompiler || exit 1
+            mvn -q versions:use-latest-versions -DallowSnapshots=true -Dincludes=fr.inria.gforge.spoon
+            mvn -q versions:update-parent -DallowSnapshots=true
+            git diff
+            mvn -q test
+            mvn -q checkstyle:checkstyle license:check
+            mvn -q depclean:depclean
+            popd || exit 1
+
+            pushd spoon-control-flow || exit 1
+            mvn -q versions:use-latest-versions -DallowSnapshots=true -Dincludes=fr.inria.gforge.spoon
+            mvn -q versions:update-parent -DallowSnapshots=true
+            git diff
+            mvn -q test
+            mvn -q checkstyle:checkstyle license:check
+            popd || exit 1
+
+            # Requires z3
+            pushd spoon-dataflow || exit 1
+            env LD_LIBRARY_PATH="${pkgs.z3.lib}/lib:${pkgs.z3.java}/lib" ./gradlew build
+            popd || exit 1
+
+            pushd spoon-visualisation || exit 1
+            mvn -q versions:use-latest-versions -DallowSnapshots=true -Dincludes=fr.inria.gforge.spoon
+            mvn -q versions:update-parent -DallowSnapshots=true
+            git diff
+            mvn -q test
+            mvn -q depclean:depclean
+            popd || exit 1
+
+            pushd spoon-smpl || exit 1
+            mvn -q versions:use-latest-versions -DallowSnapshots=true -Dincludes=fr.inria.gforge.spoon
+            mvn -q versions:update-parent -DallowSnapshots=true
+            git diff
+            mvn -q -Djava.src.version=11 test
+            mvn -q checkstyle:checkstyle license:check
+            mvn -q depclean:depclean
+            popd || exit 1
+          '');
+          extraRemote = pkgs.writeScriptBin "extra-remote" ''
+            curl https://raw.githubusercontent.com/SpoonLabs/spoon-ci-external/master/spoon-pull-request.sh | bash
+          '';
+          mavenPomQuality = pkgs.writeScriptBin "maven-pom-quality" ''
+            # we dont enforce that the version must be non snapshot as this is not possible for SNAPSHOT versions in our workflow.
+            mvn -f spoon-pom org.kordamp.maven:pomchecker-maven-plugin:1.9.0:check-maven-central -D"checker.release=false"
+          '';
+          reproducibleBuilds = pkgs.writeScriptBin "reproducible-builds" ''
+            chore/check-reproducible-builds.sh
+          '';
+          javadocQuality = pkgs.writeScriptBin "javadoc-quality" ''
+            ./chore/check-javadoc-regressions.py COMPARE_WITH_MASTER
+          '';
+          pythonEnv =
+            if extraChecks then
+              with pkgs; python311.withPackages (ps: [
+                ps.requests
+                ps.pygithub
+                ps.commonmark
+              ])
+            else [ ];
+          packages = with pkgs;
+            [ jdk maven test coverage mavenPomQuality javadocQuality reproducibleBuilds ]
+            ++ (if extraChecks then [ gradle pythonEnv z3.java z3.lib extra extraRemote ] else [ ])
+            ++ (if release then [ semver jreleaser ] else [ ]);
+        };
     in
     {
-      # Provide some binary packages for selected system types.
-      devShells = forAllSystems (system:
+      devShells =
         let
-          mkShell = { release ? false, extraChecks ? false, javaVersion }:
-            let
-              pkgs = import nixpkgs {
-                inherit system;
-                overlays = [
-                  (final: prev:
-                    let
-                      base = rec {
-                        jdk = prev."jdk${toString javaVersion}";
-                        maven = prev.maven.override { inherit jdk; };
-                      };
-                      extra = with base; {
-                        gradle = prev.gradle.override { java = jdk; };
-                        z3 = prev.z3.override { inherit jdk; javaBindings = true; };
-                      };
-                    in
-                    (if extraChecks then base // extra else base))
-                ];
-              };
-              semver = pkgs.buildGoModule rec {
-                name = "semver";
-                version = "2.1.0";
-
-                vendorHash = "sha256-HKqZbgP7vqDJMaHUbSqfSOnBYwzOtIr9o2v/T9S+uNg=";
-                subPackages = [ "cmd/semver" ];
-
-                src = pkgs.fetchFromGitHub {
-                  owner = "ffurrer2";
-                  repo = "semver";
-                  rev = "v${version}";
-                  sha256 = "sha256-i/XPA2Hr2puJFKupIeBUE/yFPJxSeVsDWcz1OepxIcU=";
-                };
-              };
-              jreleaser = pkgs.stdenv.mkDerivation rec {
-                pname = "jreleaser-cli";
-                version = "1.7.0";
-
-                src = pkgs.fetchurl {
-                  url = "https://github.com/jreleaser/jreleaser/releases/download/v${version}/jreleaser-tool-provider-${version}.jar";
-                  sha256 = "sha256-gr1IWisuep00xyoZWKXtHymWkQjbDhlk6+UC16bKXu0=";
-                };
-
-                nativeBuildInputs = with pkgs; [ makeWrapper ];
-
-                dontUnpack = true;
-
-                installPhase = ''
-                  mkdir -p $out/share/java/ $out/bin/
-                  cp $src $out/share/java/${pname}.jar
-                  makeWrapper ${pkgs.jdk}/bin/java $out/bin/${pname} \
-                    --add-flags "-jar $out/share/java/${pname}.jar"
-                '';
-              };
-            in
-            pkgs.mkShell rec {
-              test = pkgs.writeScriptBin "test" ''
-                set -eu
-                # Use silent log config
-                cp chore/logback.xml src/test/resources/
-                mvn -f spoon-pom -B test-compile
-
-                # this is a hack to download the final test dependencies required to actually run the tests
-                timeout 20 mvn -f spoon-pom -B test || echo "Done fetching dependencies"
-
-                # Execute tests
-                mvn -f spoon-pom test
-
-                # print test results in log
-                cat testResults.spoon
-              '';
-              coverage = pkgs.writeScriptBin "coverage" ''
-                set -eu
-                # Use silent log config
-                cp chore/logback.xml src/test/resources/
-                mvn -f spoon-pom -B test-compile
-                mvn -f spoon-pom -Pcoveralls test jacoco:report coveralls:report -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER --fail-never
-              '';
-              extra = pkgs.writeScriptBin "extra" (if !extraChecks then "exit 2" else ''
-                set -eu
-                # Use silent log config
-                cp chore/logback.xml src/test/resources/
-                # Verify and Site Maven goals
-                mvn verify license:check site -DskipTests -DadditionalJOption=-Xdoclint:syntax,-missing -Dscan
-                # Install spoon-pom
-                pushd spoon-pom || exit 1
-                mvn install -DskipTests
-                popd || exit 1
-
-                # Checkstyle in src/tests
-                mvn -q checkstyle:checkstyle -Pcheckstyle-test
-                # Check documentation links
-                python3 ./chore/check-links-in-doc.py
-                # Analyze dependencies through DepClean in spoon-core
-                mvn -q depclean:depclean
-
-                pushd spoon-decompiler || exit 1
-                mvn -q versions:use-latest-versions -DallowSnapshots=true -Dincludes=fr.inria.gforge.spoon
-                mvn -q versions:update-parent -DallowSnapshots=true
-                git diff
-                mvn -q test
-                mvn -q checkstyle:checkstyle license:check
-                mvn -q depclean:depclean
-                popd || exit 1
-
-                pushd spoon-control-flow || exit 1
-                mvn -q versions:use-latest-versions -DallowSnapshots=true -Dincludes=fr.inria.gforge.spoon
-                mvn -q versions:update-parent -DallowSnapshots=true
-                git diff
-                mvn -q test
-                mvn -q checkstyle:checkstyle license:check
-                popd || exit 1
-
-                # Requires z3
-                pushd spoon-dataflow || exit 1
-                env LD_LIBRARY_PATH="${pkgs.z3.lib}/lib:${pkgs.z3.java}/lib" ./gradlew build
-                popd || exit 1
-
-                pushd spoon-visualisation || exit 1
-                mvn -q versions:use-latest-versions -DallowSnapshots=true -Dincludes=fr.inria.gforge.spoon
-                mvn -q versions:update-parent -DallowSnapshots=true
-                git diff
-                mvn -q test
-                mvn -q depclean:depclean
-                popd || exit 1
-
-                pushd spoon-smpl || exit 1
-                mvn -q versions:use-latest-versions -DallowSnapshots=true -Dincludes=fr.inria.gforge.spoon
-                mvn -q versions:update-parent -DallowSnapshots=true
-                git diff
-                mvn -q -Djava.src.version=11 test
-                mvn -q checkstyle:checkstyle license:check
-                mvn -q depclean:depclean
-                popd || exit 1
-              '');
-              extraRemote = pkgs.writeScriptBin "extra-remote" ''
-                curl https://raw.githubusercontent.com/SpoonLabs/spoon-ci-external/master/spoon-pull-request.sh | bash
-              '';
-              mavenPomQuality = pkgs.writeScriptBin "maven-pom-quality" ''
-                # we dont enforce that the version must be non snapshot as this is not possible for SNAPSHOT versions in our workflow.
-                mvn -f spoon-pom org.kordamp.maven:pomchecker-maven-plugin:1.9.0:check-maven-central -D"checker.release=false"
-              '';
-              reproducibleBuilds = pkgs.writeScriptBin "reproducible-builds" ''
-                chore/check-reproducible-builds.sh
-              '';
-              javadocQuality = pkgs.writeScriptBin "javadoc-quality" ''
-                ./chore/check-javadoc-regressions.py COMPARE_WITH_MASTER
-              '';
-              pythonEnv =
-                if extraChecks then
-                  with pkgs; python311.withPackages (ps: [
-                    ps.requests
-                    ps.pygithub
-                    ps.commonmark
-                  ])
-                else [ ];
-              packages = with pkgs;
-                [ jdk maven test coverage mavenPomQuality javadocQuality reproducibleBuilds ]
-                ++ (if extraChecks then [ gradle pythonEnv z3.java z3.lib extra extraRemote ] else [ ])
-                ++ (if release then [ semver jreleaser ] else [ ]);
-            }
-          ;
+          # We have additional options (currently EA jdks) on 64 bit linux systems
+          blessedSystem = "x86_64-linux";
+          blessed = { jdk21-ea = mkShell blessedSystem { javaVersion = 21; }; };
+          common = forAllSystems
+            (system:
+              rec {
+                default = jdk20;
+                jdk20 = mkShell system { javaVersion = 20; };
+                jdk17 = mkShell system { javaVersion = 17; };
+                jdk11 = mkShell system { javaVersion = 11; };
+                extraChecks = mkShell system { extraChecks = true; javaVersion = 11; };
+                jReleaser = mkShell system { release = true; javaVersion = 11; };
+              });
         in
-        rec {
-          default = jdk20;
-          jdk20 = mkShell { javaVersion = 20; };
-          jdk17 = mkShell { javaVersion = 17; };
-          jdk11 = mkShell { javaVersion = 11; };
-          extraChecks = mkShell { extraChecks = true; javaVersion = 11; };
-          jReleaser = mkShell { release = true; javaVersion = 11; };
-        });
+        common // { "${blessedSystem}" = common."${blessedSystem}" // blessed; };
     };
 }

From 959e6e7460c7d4321d3855c3ae431340e149b3ed Mon Sep 17 00:00:00 2001
From: I-Al-Istannen <i-al-istannen@users.noreply.github.com>
Date: Mon, 28 Aug 2023 23:03:15 +0200
Subject: [PATCH 14/14] Test with java 21-ea

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d7ae86196c6..17e576524af 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -28,7 +28,7 @@ jobs:
     name: Tests with Java ${{ matrix.java }} on ${{ matrix.os }}
     strategy:
       matrix:
-        java: [11, 17, 20]
+        java: [11, 17, 20, 21-ea]
         os: [ubuntu-latest]
     steps:
       - name: Checkout