Skip to content

Fix Java 11 Test Errors #6

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

Merged
ctrueden merged 7 commits into from
Apr 2, 2021
Merged

Fix Java 11 Test Errors #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e852907
Try instantiating engine directly
hanslovsky Mar 14, 2021
9286124
Use default kotlin factory
hanslovsky Mar 14, 2021
02a95fe
Clean-up commented out code in KotlinScriptLanguage
hanslovsky Mar 15, 2021
f4faabf
Remove unused dependency
hanslovsky Mar 15, 2021
fac8ce5
Create shaded jar with kotlin compiler embeddable
hanslovsky Mar 21, 2021
32eb947
Ignore optional dependencies when deploying to scijava.app.dir
hanslovsky Mar 22, 2021
e20b3d5
Use latest release of sicjava maven plugin
hanslovsky Apr 2, 2021
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
/.project
/.settings/
/target/
dependency-reduced-pom.xml
59 changes: 58 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,15 @@ Wisconsin-Madison.</license.copyrightOwners>
<!-- NB: Work around duplicate classes issue in Kotlin dependencies-->
<allowedDuplicateClasses>org/jetbrains/kotlin/daemon/common/*,kotlinx/coroutines/**</allowedDuplicateClasses>
<kotlin.version>1.4.30</kotlin.version>
<!-- NB: Have to disable manifest-only jar ot be able to run tests on command line. -->
<!-- NB: We have to disable manifest-only jar ot be able to run tests on command line. -->
<!-- NB: Tests work in IntelliJ but manifest-only jar seems to mess with it on command line. -->
<!-- NB: cf: mvn surefire:help -Ddetail=true -->
<surefire.useManifestOnlyJar>false</surefire.useManifestOnlyJar>

<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>

<kotlin-compiler-embeddable.optional>false</kotlin-compiler-embeddable.optional>
<scijava-maven-plugin.version>2.1.0</scijava-maven-plugin.version>
</properties>

<repositories>
Expand All @@ -113,6 +118,7 @@ Wisconsin-Madison.</license.copyrightOwners>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-compiler-embeddable</artifactId>
<version>${kotlin.version}</version>
<optional>${kotlin-compiler-embeddable.optional}</optional>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
Expand All @@ -138,4 +144,55 @@ Wisconsin-Madison.</license.copyrightOwners>
<scope>test</scope>
</dependency>
</dependencies>

<profiles>
<profile>
<!-- The JetBrains trove4j fork clashes with the gnu trove4j jar in Fiji.
We need to shade and relocate in this case. -->
<id>shade-trove4j-fork</id>
<activation>
<property>
<name>scijava.app.directory</name>
</property>
</activation>
<properties>
<kotlin-compiler-embeddable.optional>true</kotlin-compiler-embeddable.optional>
<scijava.ignoreOptionalDependencies>true</scijava.ignoreOptionalDependencies>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>${maven-shade-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<artifactSet>
<includes>
<include>org.jetbrains.intellij.deps:trove4j</include>
<include>org.jetbrains.kotlin:kotlin-compiler-embeddable</include>
<include>org.jetbrains.kotlin:kotlin-script-runtime</include>
<include>org.jetbrains.kotlin:kotlin-reflect</include>
<include>org.jetbrains.kotlin:kotlin-daemon-embeddable</include>
</includes>
</artifactSet>
<relocations>
<relocation>
<pattern>gnu.trove</pattern>
<shadedPattern>gnu.trove.shaded</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
5 changes: 2 additions & 3 deletions src/main/kotlin/org/scijava/plugins/scripting/kotlin/KotlinScriptLanguage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import org.scijava.script.AdaptedScriptLanguage
import org.scijava.script.ScriptLanguage
import java.io.Reader
import javax.script.*
import kotlin.script.experimental.jsr223.KotlinJsr223DefaultScriptEngineFactory

/**
* A SciJava [ScriptLanguage] for Kotlin.
Expand All @@ -52,9 +53,7 @@ class KotlinScriptLanguage : AdaptedScriptLanguage(Factory()) {
override fun getExtensions() = listOf("kt", "kts")

class Factory : KotlinJsr223JvmScriptEngineFactoryBase() {
override fun getScriptEngine(): ScriptEngine {
return SynchronizedScriptEngine(ScriptEngineManager().getEngineByExtension("kts"))
}
override fun getScriptEngine() = SynchronizedScriptEngine(KotlinJsr223DefaultScriptEngineFactory().scriptEngine)
}

class SynchronizedScriptEngine(private val delegate: ScriptEngine) : ScriptEngine {
Expand Down