From e6eb492e540d2e97c9c6fa27493a556342da4272 Mon Sep 17 00:00:00 2001
From: jakobeha <jakobeha@gmail.com>
Date: Sun, 14 Jan 2024 19:29:25 -0500
Subject: [PATCH 1/5] rename artifact to match repo name

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5074c8f03..a723b4754 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.prlprg</groupId>
-    <artifactId>r-jit-server</artifactId>
+    <artifactId>r-compile-server</artifactId>
     <version>0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 

From 2aa812b26b76e4f97f0678518f4462a8a5e2aabe Mon Sep 17 00:00:00 2001
From: jakobeha <jakobeha@gmail.com>
Date: Sun, 14 Jan 2024 19:29:43 -0500
Subject: [PATCH 2/5] remove renjin dependency

---
 pom.xml                             | 15 ---------------
 src/main/java/org/prlprg/bc/Bc.java |  6 ++++--
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index a723b4754..77946aac2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,15 +17,6 @@
         <pmdVersion>7.0.0-rc4</pmdVersion>
     </properties>
 
-    <repositories>
-        <!-- renjin, R VM in Java -->
-        <repository>
-            <id>bedatadriven</id>
-            <name>bedatadriven public repo</name>
-            <url>https://nexus.bedatadriven.com/content/groups/public/</url>
-        </repository>
-    </repositories>
-
     <dependencyManagement>
         <dependencies>
             <!-- JUnit5, unit tests -->
@@ -40,12 +31,6 @@
     </dependencyManagement>
 
     <dependencies>
-        <!-- renjin, R VM in Java -->
-        <dependency>
-            <groupId>org.renjin</groupId>
-            <artifactId>renjin-script-engine</artifactId>
-            <version>RELEASE</version>
-        </dependency>
         <!-- ZeroMQ, socket communication -->
         <dependency>
             <groupId>org.zeromq</groupId>
diff --git a/src/main/java/org/prlprg/bc/Bc.java b/src/main/java/org/prlprg/bc/Bc.java
index 8174cd2fa..ad13b8a6b 100644
--- a/src/main/java/org/prlprg/bc/Bc.java
+++ b/src/main/java/org/prlprg/bc/Bc.java
@@ -1,10 +1,12 @@
 package org.prlprg.bc;
 
 import com.google.common.collect.ImmutableList;
-import org.renjin.sexp.SEXP;
+
+// TODO: Remove stub with Sexp from branch `filip`
+class Sexp {}
 
 /** A complete R bytecode, consisting of a version, array of instructions and associated data, and constants. */
-public record Bc(BcCode code, ImmutableList<SEXP> constants) {
+public record Bc(BcCode code, ImmutableList<Sexp> constants) {
     /**
      * The only version of R bytecodes we support, which is also the latest version.
      * The bytecode's version is denoted by the first integer in its code.

From 64cf23917220f1f86172325f7f94729d06bd4472 Mon Sep 17 00:00:00 2001
From: jakobeha <jakobeha@gmail.com>
Date: Sun, 14 Jan 2024 19:30:01 -0500
Subject: [PATCH 3/5] fix Source XRef warning

---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 77946aac2..8cad18f5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -211,6 +211,12 @@
                         <version>${pmdVersion}</version>
                     </dependency>
                 </dependencies>
+                <!-- This prevents the warning "Unable to locate Source XRef to link to - DISABLED" -->
+                <!-- If we want source-links in the `site` pmd report we need to add jxr instead, -->
+                <!-- but IDEs display their own pmd report which already has source-links -->
+                <configuration>
+                    <linkXRef>false</linkXRef>
+                </configuration>
             </plugin>
             <!-- JUnit5, unit test runner -->
             <plugin>

From b132160bb14bb54316e57cf120d9cdbb5bb811cd Mon Sep 17 00:00:00 2001
From: jakobeha <jakobeha@gmail.com>
Date: Sun, 14 Jan 2024 19:34:32 -0500
Subject: [PATCH 4/5] improve YAML formatter

jackson removes comments which we don't want
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8cad18f5c..fca93b986 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
                             <spaces>true</spaces>
                             <spacesPerTab>2</spacesPerTab>
                         </indent>
-                        <jackson/>
+                        <prettier/>
                     </yaml>
                 </configuration>
             </plugin>

From b9b5e669a62bbf724ea6d79ece7a86ecdbb07755 Mon Sep 17 00:00:00 2001
From: jakobeha <jakobeha@gmail.com>
Date: Sun, 14 Jan 2024 19:34:40 -0500
Subject: [PATCH 5/5] add Github CI

---
 .github/workflows/maven.yml | 53 +++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 .github/workflows/maven.yml

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 000000000..76beb20ae
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,53 @@
+# This workflow will test a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+
+jobs:
+  verify-and-artifact:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
+        with:
+          java-version: "21"
+          distribution: "temurin"
+          cache: maven
+      - name: Run tests and static analyses
+        run: mvn --batch-mode --update-snapshots verify
+      - run: mkdir staging && cp target/*.jar staging
+      - name: Upload snapshot as artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: snapshot
+          path: target/*-SNAPSHOT.jar
+      # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
+      - name: Update dependency graph
+        uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
+
+  verify-macos:
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
+        with:
+          java-version: "21"
+          distribution: "temurin"
+          cache: maven
+      - name: Run tests and static analyses
+        run: mvn --batch-mode --update-snapshots verify