From 8e7901110d97c0c8f5e3603d4cad3a747ed7ca99 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 16 Sep 2022 23:11:43 -0700
Subject: [PATCH 1/8] Removed PyDev and Kotlin plugin dependencies from Epoch

---
 org.lflang.rca/lflang.product   | 1 -
 org.lflang/META-INF/MANIFEST.MF | 1 -
 2 files changed, 2 deletions(-)

diff --git a/org.lflang.rca/lflang.product b/org.lflang.rca/lflang.product
index b2ffa65e7b..520fb3ce38 100644
--- a/org.lflang.rca/lflang.product
+++ b/org.lflang.rca/lflang.product
@@ -98,7 +98,6 @@ OF SUCH DAMAGE.
       <feature id="org.eclipse.xtext.runtime"/>
       <feature id="org.eclipse.jdt"/>
       <feature id="org.eclipse.cdt"/>
-      <feature id="org.python.pydev.feature"/>
       <feature id="org.eclipse.wildwebdeveloper.feature"/>
       <feature id="de.cau.cs.kieler.klighd.view.feature"/>
       <feature id="de.cau.cs.kieler.klighd.freehep.feature"/>
diff --git a/org.lflang/META-INF/MANIFEST.MF b/org.lflang/META-INF/MANIFEST.MF
index f0b29afaa5..6d714b9e76 100644
--- a/org.lflang/META-INF/MANIFEST.MF
+++ b/org.lflang/META-INF/MANIFEST.MF
@@ -16,7 +16,6 @@ Require-Bundle: org.eclipse.xtext,
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
  com.google.guava,
  org.apache.commons.cli;bundle-version="1.4",
- org.jetbrains.kotlin.bundled-compiler;resolution:=optional,
  org.eclipse.lsp4j;bundle-version="0.14.0",
  com.fasterxml.jackson.core.jackson-core,
  com.fasterxml.jackson.core.jackson-annotations,

From b1c64c29793bb1c41415b0e7958a929f83a86cad Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Mon, 19 Sep 2022 17:03:32 -0700
Subject: [PATCH 2/8] Attempt to include kotlin-stdlib

---
 org.lflang/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/org.lflang/pom.xml b/org.lflang/pom.xml
index 3600735847..d265aa962f 100644
--- a/org.lflang/pom.xml
+++ b/org.lflang/pom.xml
@@ -45,6 +45,11 @@
                     <cleanupDaemonThreads>false</cleanupDaemonThreads> <!-- see https://bugs.eclipse.org/bugs/show_bug.cgi?id=475098#c3 -->
                 </configuration>
                 <dependencies>
+                    <dependency>
+                        <groupId>org.jetbrains.kotlin</groupId>
+                        <artifactId>kotlin-stdlib</artifactId>
+                        <version>${kotlinVersion}</version>
+                    </dependency>
                     <!-- https://mvnrepository.com/artifact/commons-cli/commons-cli -->
                     <dependency>
                         <groupId>commons-cli</groupId>

From f9f8d65b2409be15f153e9deee0c1989f78e28f1 Mon Sep 17 00:00:00 2001
From: Alexander Schulz-Rosengarten <als@informatik.uni-kiel.de>
Date: Fri, 30 Sep 2022 11:19:06 +0200
Subject: [PATCH 3/8] Switched to own provider plugin for Kotlin dependencies

---
 oomph/LinguaFranca.setup                                   | 4 ++++
 org.lflang.lds/category.xml                                | 1 -
 org.lflang.sdk/feature.xml                                 | 1 -
 org.lflang.targetplatform/org.lflang.targetplatform.target | 4 ++--
 org.lflang/META-INF/MANIFEST.MF                            | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/oomph/LinguaFranca.setup b/oomph/LinguaFranca.setup
index ef668b3277..427e5a6d41 100644
--- a/oomph/LinguaFranca.setup
+++ b/oomph/LinguaFranca.setup
@@ -346,6 +346,8 @@
             name="com.fasterxml.jackson.core.jackson-annotations"/>
         <requirement
             name="com.fasterxml.jackson.core.jackson-databind"/>
+        <requirement
+            name="org.lflang.epoch.external.dependencies"/>
         <repositoryList
             name="DefaultRepositories">
           <repository
@@ -364,6 +366,8 @@
               url="https://download.eclipse.org/wildwebdeveloper/releases/0.13.0/"/>
           <repository
               url="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/"/>
+          <repository
+              url="https://a-sr.github.io/epoch-external-dependencies/"/>
         </repositoryList>
       </targlet>
     </setupTask>
diff --git a/org.lflang.lds/category.xml b/org.lflang.lds/category.xml
index c9c8810a2a..296073d71a 100644
--- a/org.lflang.lds/category.xml
+++ b/org.lflang.lds/category.xml
@@ -4,5 +4,4 @@
     <bundle id="org.lflang"/>
     <bundle id="org.lflang.ide"/>
     <bundle id="org.lflang.diagram"/>
-    <bundle id="org.jetbrains.kotlin.bundled-compiler"/>
 </site>
diff --git a/org.lflang.sdk/feature.xml b/org.lflang.sdk/feature.xml
index 5aaccb7b0d..018e708605 100644
--- a/org.lflang.sdk/feature.xml
+++ b/org.lflang.sdk/feature.xml
@@ -6,7 +6,6 @@
 
    <requires>
       <import feature="org.eclipse.xtext.runtime" version="2.8.0" match="greaterOrEqual"/>
-      <import plugin="org.jetbrains.kotlin.bundled-compiler"/>
    </requires>
 
    <plugin
diff --git a/org.lflang.targetplatform/org.lflang.targetplatform.target b/org.lflang.targetplatform/org.lflang.targetplatform.target
index 9e9cbcb290..6721990f2a 100644
--- a/org.lflang.targetplatform/org.lflang.targetplatform.target
+++ b/org.lflang.targetplatform/org.lflang.targetplatform.target
@@ -46,8 +46,8 @@
       <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
-      <unit id="org.jetbrains.kotlin.feature.feature.group" version="0.0.0"/>
-      <repository location="https://download.jetbrains.com/kotlin/eclipse-plugin/last/"/>
+      <unit id="org.lflang.epoch.external.dependencies" version="0.0.0"/>
+      <repository location="https://a-sr.github.io/epoch-external-dependencies/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="org.eclipse.contribution.weaving.feature.group" version="0.0.0"/>
diff --git a/org.lflang/META-INF/MANIFEST.MF b/org.lflang/META-INF/MANIFEST.MF
index f0b29afaa5..2cfc41eb09 100644
--- a/org.lflang/META-INF/MANIFEST.MF
+++ b/org.lflang/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.xtext,
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
  com.google.guava,
  org.apache.commons.cli;bundle-version="1.4",
- org.jetbrains.kotlin.bundled-compiler;resolution:=optional,
+ org.lflang.epoch.external.dependencies,
  org.eclipse.lsp4j;bundle-version="0.14.0",
  com.fasterxml.jackson.core.jackson-core,
  com.fasterxml.jackson.core.jackson-annotations,

From 4e903e70fd627482fec275e8ed3979dece306e12 Mon Sep 17 00:00:00 2001
From: Alexander Schulz-Rosengarten <als@informatik.uni-kiel.de>
Date: Fri, 30 Sep 2022 11:33:04 +0200
Subject: [PATCH 4/8] Switched to lowercase function to test Kotlin 1.5 feature

---
 org.lflang/src/org/lflang/generator/rust/RustGenerator.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.lflang/src/org/lflang/generator/rust/RustGenerator.kt b/org.lflang/src/org/lflang/generator/rust/RustGenerator.kt
index d42eb9a3b6..5e93fc92d3 100644
--- a/org.lflang/src/org/lflang/generator/rust/RustGenerator.kt
+++ b/org.lflang/src/org/lflang/generator/rust/RustGenerator.kt
@@ -135,7 +135,7 @@ class RustGenerator(
 
         if (cargoReturnCode == 0) {
             // We still have to copy the compiled binary to the destination folder.
-            val isWindows = System.getProperty("os.name").toLowerCase().contains("win")
+            val isWindows = System.getProperty("os.name").lowercase().contains("win")
             val localizedExecName = if (isWindows) {
                 "$executableName.exe"
             } else {

From 303f883aa8f3daea7ae2581585ed290992f735ad Mon Sep 17 00:00:00 2001
From: Alexander Schulz-Rosengarten <als@informatik.uni-kiel.de>
Date: Fri, 30 Sep 2022 11:41:03 +0200
Subject: [PATCH 5/8] Added archiving of products for testing purposes

---
 .github/workflows/build.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6158844feb..b2dcabf0e2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,6 +37,15 @@ jobs:
       - name: Build and package epoch
         run: mvn package || mvn -U package
         shell: bash
+      - name: Archive Products
+        uses: actions/upload-artifact@v2
+        with:
+          name: LF Products
+          retention-days: 1
+          path: |
+            org.lflang.rca/target/products/*.tar.gz
+            org.lflang.rca/target/products/*.zip
+            build_upload/*
       - name: Deploy nightly release
         uses: marvinpinto/action-automatic-releases@latest
         with:

From 302987933d387392fd46fc60ee72818332496328 Mon Sep 17 00:00:00 2001
From: Alexander Schulz-Rosengarten <als@informatik.uni-kiel.de>
Date: Fri, 30 Sep 2022 11:56:46 +0200
Subject: [PATCH 6/8] Revert "Added archiving of products for testing purposes"

This reverts commit 303f883aa8f3daea7ae2581585ed290992f735ad.
---
 .github/workflows/build.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b2dcabf0e2..6158844feb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,15 +37,6 @@ jobs:
       - name: Build and package epoch
         run: mvn package || mvn -U package
         shell: bash
-      - name: Archive Products
-        uses: actions/upload-artifact@v2
-        with:
-          name: LF Products
-          retention-days: 1
-          path: |
-            org.lflang.rca/target/products/*.tar.gz
-            org.lflang.rca/target/products/*.zip
-            build_upload/*
       - name: Deploy nightly release
         uses: marvinpinto/action-automatic-releases@latest
         with:

From 989aaba2ac02076bfad22d89a6bbb7156ff1b544 Mon Sep 17 00:00:00 2001
From: Alexander Schulz-Rosengarten <als@informatik.uni-kiel.de>
Date: Fri, 30 Sep 2022 13:35:33 +0200
Subject: [PATCH 7/8] Updated epoch dependency plugin location

---
 oomph/LinguaFranca.setup                                   | 2 +-
 org.lflang.targetplatform/org.lflang.targetplatform.target | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/oomph/LinguaFranca.setup b/oomph/LinguaFranca.setup
index 427e5a6d41..273f01acdd 100644
--- a/oomph/LinguaFranca.setup
+++ b/oomph/LinguaFranca.setup
@@ -367,7 +367,7 @@
           <repository
               url="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/"/>
           <repository
-              url="https://a-sr.github.io/epoch-external-dependencies/"/>
+              url="https://lf-lang.github.io/epoch-external-dependencies/"/>
         </repositoryList>
       </targlet>
     </setupTask>
diff --git a/org.lflang.targetplatform/org.lflang.targetplatform.target b/org.lflang.targetplatform/org.lflang.targetplatform.target
index 6721990f2a..4bb57a1178 100644
--- a/org.lflang.targetplatform/org.lflang.targetplatform.target
+++ b/org.lflang.targetplatform/org.lflang.targetplatform.target
@@ -47,7 +47,7 @@
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="org.lflang.epoch.external.dependencies" version="0.0.0"/>
-      <repository location="https://a-sr.github.io/epoch-external-dependencies/"/>
+      <repository location="https://lf-lang.github.io/epoch-external-dependencies/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="org.eclipse.contribution.weaving.feature.group" version="0.0.0"/>

From 894eb6421ffafe5c881c5d5e791d218ee0f79dc7 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 30 Sep 2022 12:27:32 -0700
Subject: [PATCH 8/8] Revert "Attempt to include kotlin-stdlib"

This reverts commit b1c64c29793bb1c41415b0e7958a929f83a86cad.
---
 org.lflang/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/org.lflang/pom.xml b/org.lflang/pom.xml
index d265aa962f..3600735847 100644
--- a/org.lflang/pom.xml
+++ b/org.lflang/pom.xml
@@ -45,11 +45,6 @@
                     <cleanupDaemonThreads>false</cleanupDaemonThreads> <!-- see https://bugs.eclipse.org/bugs/show_bug.cgi?id=475098#c3 -->
                 </configuration>
                 <dependencies>
-                    <dependency>
-                        <groupId>org.jetbrains.kotlin</groupId>
-                        <artifactId>kotlin-stdlib</artifactId>
-                        <version>${kotlinVersion}</version>
-                    </dependency>
                     <!-- https://mvnrepository.com/artifact/commons-cli/commons-cli -->
                     <dependency>
                         <groupId>commons-cli</groupId>