Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removal of PyDev and Kotlin plugin dependencies from Epoch #1371

Merged
merged 9 commits into from
Oct 1, 2022
Merged

Removal of PyDev and Kotlin plugin dependencies from Epoch #1371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8e79011
Removed PyDev and Kotlin plugin dependencies from Epoch
lhstrh Sep 17, 2022
b1c64c2
Attempt to include kotlin-stdlib
lhstrh Sep 20, 2022
f9f8d65
Switched to own provider plugin for Kotlin dependencies
a-sr Sep 30, 2022
4e903e7
Switched to lowercase function to test Kotlin 1.5 feature
a-sr Sep 30, 2022
303f883
Added archiving of products for testing purposes
a-sr Sep 30, 2022
3029879
Revert "Added archiving of products for testing purposes"
a-sr Sep 30, 2022
989aaba
Updated epoch dependency plugin location
a-sr Sep 30, 2022
894eb64
Revert "Attempt to include kotlin-stdlib"
lhstrh Sep 30, 2022
361af56
Resolved conflict
lhstrh Sep 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions oomph/LinguaFranca.setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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://lf-lang.github.io/epoch-external-dependencies/"/>
</repositoryList>
</targlet>
</setupTask>
Expand Down
1 change: 0 additions & 1 deletion org.lflang.lds/category.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
1 change: 0 additions & 1 deletion org.lflang.rca/lflang.product
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
1 change: 0 additions & 1 deletion org.lflang.sdk/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions org.lflang.targetplatform/org.lflang.targetplatform.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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://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"/>
Expand Down
2 changes: 1 addition & 1 deletion org.lflang/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion org.lflang/src/org/lflang/generator/rust/RustGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down