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

Fix circular dependencies #8

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix circular dependencies #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5c5302
Remove dependency on scijava-common test jar
hanslovsky Apr 10, 2021
035ced4
Exclude org.jetbrains.kotlin:kotlin-script-runtime from shaded jar
hanslovsky Apr 10, 2021
14f81b5
Include kotlin-scripting-jsr223 in shaded jar
hanslovsky Apr 11, 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
22 changes: 12 additions & 10 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Wisconsin-Madison.</license.copyrightOwners>

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

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

Expand All @@ -118,7 +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>
<optional>${shaded-jars.optional}</optional>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
Expand All @@ -129,6 +129,7 @@ Wisconsin-Madison.</license.copyrightOwners>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-scripting-jsr223</artifactId>
<version>${kotlin.version}</version>
<optional>${shaded-jars.optional}</optional>
</dependency>

<!-- Test dependencies -->
Expand All @@ -137,12 +138,6 @@ Wisconsin-Madison.</license.copyrightOwners>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>scijava-common</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies>

<profiles>
Expand All @@ -156,7 +151,7 @@ Wisconsin-Madison.</license.copyrightOwners>
</property>
</activation>
<properties>
<kotlin-compiler-embeddable.optional>true</kotlin-compiler-embeddable.optional>
<shaded-jars.optional>true</shaded-jars.optional>
<scijava.ignoreOptionalDependencies>true</scijava.ignoreOptionalDependencies>
</properties>
<build>
Expand All @@ -176,9 +171,16 @@ Wisconsin-Madison.</license.copyrightOwners>
<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>
<include>org.jetbrains.kotlin:kotlin-script-runtime</include>
<include>org.jetbrains.kotlin:kotlin-scripting-jsr223</include>
<include>org.jetbrains.kotlin:kotlin-scripting-common</include>
<include>org.jetbrains.kotlinx:kotlinx-coroutines-core</include>
<include>org.jetbrains.kotlin:kotlin-scripting-jvm</include>
<include>org.jetbrains.kotlin:kotlin-scripting-jvm-host</include>
<include>org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable</include>
<include>org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable</include>
</includes>
</artifactSet>
<relocations>
Expand Down
14 changes: 11 additions & 3 deletions src/test/kotlin/org/scijava/plugins/scripting/kotlin/KotlinTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,26 +33,27 @@ import org.junit.Assert
import org.junit.BeforeClass
import org.junit.Test
import org.scijava.Context
import org.scijava.script.AbstractScriptLanguageTest
import org.scijava.script.ScriptLanguage
import org.scijava.script.ScriptService
import java.io.IOException
import java.util.concurrent.ExecutionException
import javax.script.ScriptContext
import javax.script.ScriptEngine
import javax.script.ScriptEngineManager
import javax.script.ScriptException
import kotlin.math.E


/**
* Kotlin unit tests.
*
* @author Curtis Rueden
* @author Philipp Hanslovsky
*/
class KotlinTest : AbstractScriptLanguageTest() {
class KotlinTest {

@Test
fun testDiscovery() = assertDiscovered(KotlinScriptLanguage::class.java)
fun testDiscovery() = KotlinScriptLanguage::class.java.assertDiscovered()

@Test
@Throws(InterruptedException::class, ExecutionException::class, IOException::class, ScriptException::class)
Expand Down Expand Up @@ -90,4 +91,11 @@ class KotlinTest : AbstractScriptLanguageTest() {
private lateinit var _engine: ScriptEngine
val engine get() = _engine
}
}

fun Class<out ScriptLanguage?>.assertDiscovered() {
ScriptEngineManager()
.engineFactories
.firstOrNull { isInstance(it) }
?: Assert.fail("$name not discovered by JSR-223 framework")
}