Use kotlin OSGI bundle directly

We can't control the version of the bundled-compiler bundle from kotlin-eclipse
lf-lang · Jun 4, 2021 · 4c0f025 · 4c0f025
1 parent cbd34ac
commit 4c0f025
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
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.osgi-bundle;bundle-version="1.5.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.lflang,
  org.lflang.generator,

diff --git a/pom.xml b/pom.xml
@@ -204,12 +204,14 @@
                 <artifactId>target-platform-configuration</artifactId>
                 <version>${tycho-version}</version>
                 <configuration>
-                    <!-- <pomDependencies>consider</pomDependencies> -->
+                    <!-- See https://www.eclipse.org/tycho/sitedocs/target-platform-configuration/target-platform-configuration-mojo.html#pomDependencies   -->
+                    <!-- This puts the kotlin osgi bundle into the target platform. -->
+                    <pomDependencies>consider</pomDependencies>
                     <target>
                         <artifact>
                             <groupId>org.lflang</groupId>
                             <artifactId>org.lflang.targetplatform</artifactId>
-                            <version>0.1.0-SNAPSHOT</version>
+                            <version>${project.version}</version>
                         </artifact>
                     </target>     
                     <environments>