From 626c482ab8121e15630596b454770ce7f53dfb21 Mon Sep 17 00:00:00 2001
From: Rodin Aarssen <rodin.aarssen@swat.engineering>
Date: Wed, 10 Sep 2025 09:23:09 +0200
Subject: [PATCH 1/5] No longer using Require-Libraries in RASCAL.MF

---
 bird-core/META-INF/RASCAL.MF | 1 -
 bird-ide/META-INF/RASCAL.MF  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/bird-core/META-INF/RASCAL.MF b/bird-core/META-INF/RASCAL.MF
index 82cd6a5..15416ff 100644
--- a/bird-core/META-INF/RASCAL.MF
+++ b/bird-core/META-INF/RASCAL.MF
@@ -1,5 +1,4 @@
 Manifest-Version: 0.0.1
 Project-Name: bird-core
 Source: src/main/rascal
-Require-Libraries: |lib://rascal-lsp|, |lib://typepal|
 
diff --git a/bird-ide/META-INF/RASCAL.MF b/bird-ide/META-INF/RASCAL.MF
index ee8852a..f67ed2d 100644
--- a/bird-ide/META-INF/RASCAL.MF
+++ b/bird-ide/META-INF/RASCAL.MF
@@ -3,4 +3,3 @@ Project-Name: bird-ide
 Source: src/main/rascal
 Main-Module: lang::bird::LanguageServer
 Main-Function: birdLanguageContributor
-Require-Libraries: |lib://bird-core|, |lib://typepal|, |lib://rascal-lsp|

From ab2e706d750a015d0abe237baaec6960d0a1b428 Mon Sep 17 00:00:00 2001
From: Rodin Aarssen <rodin.aarssen@swat.engineering>
Date: Wed, 10 Sep 2025 09:23:27 +0200
Subject: [PATCH 2/5] Bumped all dependencies

---
 pom.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2f0b312..d50cc35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,12 +27,12 @@
           <dependency>
             <groupId>org.rascalmpl</groupId>
             <artifactId>rascal</artifactId>
-            <version>0.40.17</version>
+            <version>0.41.0-RC59</version>
           </dependency>
           <dependency>
             <groupId>org.rascalmpl</groupId>
             <artifactId>rascal-lsp</artifactId>
-            <version>2.21.2</version>
+            <version>2.22.0-RC2</version>
             <exclusions> <!-- we exclude dependencies we don't really need, or maybe want to have our own -->
               <exclusion>
                 <groupId>org.rascalmpl</groupId>
@@ -47,7 +47,7 @@
           <dependency>
             <groupId>org.rascalmpl</groupId>
             <artifactId>typepal</artifactId>
-            <version>0.15.1</version>
+            <version>0.15.2-RC3</version>
           </dependency>
           <dependency>
             <groupId>junit</groupId>
@@ -63,7 +63,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.6.1</version>
                 <executions>
                     <execution>
                       <id>enforce-maven</id>
@@ -87,7 +87,7 @@
               <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.8.1</version>
               </plugin>
               <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -96,7 +96,7 @@
               </plugin>
              <plugin>
                   <artifactId>maven-compiler-plugin</artifactId>
-                  <version>3.13.0</version>
+                  <version>3.14.0</version>
                   <configuration>
                       <release>11</release>
                   </configuration>
@@ -104,7 +104,7 @@
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-surefire-plugin</artifactId>
-              <version>3.5.0</version>
+              <version>3.5.3</version>
               <configuration>
                   <argLine>
                       -ea
@@ -120,7 +120,7 @@
               <plugin>
                 <groupId>org.rascalmpl</groupId>
                 <artifactId>rascal-maven-plugin</artifactId>
-                <version>0.28.11</version>
+                <version>0.30.0-RC29</version>
                 <configuration>
                   <bin>${project.build.outputDirectory}</bin>
                   <srcs>

From 60277a5b21d63b4858bb58c8e8706cc9ae16613e Mon Sep 17 00:00:00 2001
From: Rodin Aarssen <rodin.aarssen@swat.engineering>
Date: Wed, 10 Sep 2025 09:23:38 +0200
Subject: [PATCH 3/5] bird-ide now depends on typepal

---
 bird-ide/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bird-ide/pom.xml b/bird-ide/pom.xml
index 410526c..05e5139 100644
--- a/bird-ide/pom.xml
+++ b/bird-ide/pom.xml
@@ -22,6 +22,10 @@
       <artifactId>bird-core</artifactId>
       <version>${bird.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.rascalmpl</groupId>
+      <artifactId>typepal</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <resources>

From 3b498c7b70c5e9d92153721f2049623e0691c2f7 Mon Sep 17 00:00:00 2001
From: Rodin Aarssen <rodin.aarssen@swat.engineering>
Date: Wed, 10 Sep 2025 09:24:09 +0200
Subject: [PATCH 4/5] The LanguageServer now uses a better PathConfig and no
 longer depends on mvn package to work

---
 bird-ide/src/main/rascal/lang/bird/LanguageServer.rsc | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/bird-ide/src/main/rascal/lang/bird/LanguageServer.rsc b/bird-ide/src/main/rascal/lang/bird/LanguageServer.rsc
index 9a13a1d..dcdd574 100644
--- a/bird-ide/src/main/rascal/lang/bird/LanguageServer.rsc
+++ b/bird-ide/src/main/rascal/lang/bird/LanguageServer.rsc
@@ -158,17 +158,13 @@ default value birdExecutor(value v) {
     throw  "Missing case for <v>";
 }
 
-
-list[loc] libs = [
-    |jar+project://bird-core/target/lib/typepal.jar!/src|
-];
-
 void main() {
     registerLanguage(
         language(
-            pathConfig(srcs=[|project://bird-core/src/main/rascal|, |project://bird-ide/src/main/rascal|, *libs]),
+            getProjectPathConfig(|project://bird-ide|, mode=interpreter())[messages=[]],
             "Bird",
             {"bird"},
             "lang::bird::LanguageServer",
             "birdLanguageContributor"));
 }
+

From 8294829cf880e1a54b44da70e0352c9f3a1f47da Mon Sep 17 00:00:00 2001
From: Rodin Aarssen <rodin.aarssen@swat.engineering>
Date: Wed, 10 Sep 2025 09:24:47 +0200
Subject: [PATCH 5/5] Changed visualization after upstream signature changes

---
 bird-ide/src/main/rascal/lang/bird/LanguageServer.rsc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bird-ide/src/main/rascal/lang/bird/LanguageServer.rsc b/bird-ide/src/main/rascal/lang/bird/LanguageServer.rsc
index dcdd574..d02ae7d 100644
--- a/bird-ide/src/main/rascal/lang/bird/LanguageServer.rsc
+++ b/bird-ide/src/main/rascal/lang/bird/LanguageServer.rsc
@@ -115,7 +115,7 @@ lrel[loc, Command] birdLenses(start[Program] input) {
 
 value birdExecutor(visualizeDependencies(loc decl, str name)) {
     gg = buildGrammarGraph(decl);
-    showInteractiveContent(graph(gg, \layout=defaultDagreLayout()), viewColumn=2, title="<name> Grammar");
+    showInteractiveContent(graph(gg, cfg=cytoGraphConfig(\layout=defaultDagreLayout())), viewColumn=2, title="<name> Grammar");
     return ("result": true);
 }