Reintroduced optional dependency to kotlin plugin to circumvent error in

eclipse
lf-lang · Dec 10, 2021 · 4d8ddf7 · 4d8ddf7
1 parent 048544d
commit 4d8ddf7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/org.lflang.lds/category.xml b/org.lflang.lds/category.xml
@@ -4,4 +4,5 @@
     <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.lds/pom.xml b/org.lflang.lds/pom.xml
@@ -57,7 +57,6 @@
           <arguments>
             <argument>${python.script}</argument>
             <argument>--noswt</argument>
-            <argument>--ignore-conflicts</argument>
             <argument>${update.site.jars}</argument>
             <argument>${executableName}</argument>
             <argument>${mainClass}</argument>

diff --git a/org.lflang.lds/uberjar.py b/org.lflang.lds/uberjar.py
@@ -34,7 +34,18 @@
 from os.path import isfile, isdir, join, abspath, relpath, dirname, basename
 
 IGNORED_JARS = [
-    'org.apache.ant*'
+    'org.apache.ant*',
+    # The following libraries are part of the org.jetbrains.kotlin.bundled-compiler plugin but are not required at runtime.
+    'kotlin-compiler.jar',
+    'intellij-core-analysis.jar',
+    'kotlin-plugin-parts.jar',
+    'kotlin-script-runtime.jar',
+    'kotlin-scripting-compiler.jar',
+    'ide-dependencies.jar',
+    'kotlin-scripting-compiler-impl.jar',
+    'kotlin-scripting-common.jar',
+    'kotlin-scripting-jvm.jar',
+    'ide-common.jar'
 ]
 IGNORE_NESTED_JARS = [
 ]
@@ -71,6 +82,7 @@
     'META-INF/NOTICE.txt',
     'META-INF/NOTICE',
     'META-INF/p2.inf',
+    'META-INF/versions/*/module-info.class',
     'OSGI-INF/l10n/bundle.properties',
     'docs/*',
     '*readme.txt',
@@ -173,7 +185,7 @@ def extract(args, extracted, merged, klighd):
     jars = sorted(os.listdir(args.source))
     processed_jars = [] # Tuples of plugin name and jar
     for jar in jars:
-        if not jar.endswith('.jar'):
+        if not jar.endswith('.jar') or any(fnmatch(jar, ign) for ign in IGNORED_JARS):
             print('Skipping file:', jar)
             continue
         elif klighd and any(fnmatch(jar, ign) for ign in KLIGHD_JARS_BLACKLIST) and not any(fnmatch(jar, req) for req in KLIGHD_JARS_WHITELIST):

diff --git a/org.lflang/META-INF/MANIFEST.MF b/org.lflang/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.xtext,
  com.google.guava,
  org.eclipse.xtend.lib.macro,
  org.apache.commons.cli;bundle-version="1.4",
- org.jetbrains.kotlin.bundled-compiler,
+ org.jetbrains.kotlin.bundled-compiler;resolution:=optional,
  org.eclipse.lsp4j;bundle-version="0.10.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.lflang,