Skip to content
Snippets Groups Projects
Commit faa51d31 authored by Jari-Matti Mäkelä's avatar Jari-Matti Mäkelä :speech_balloon:
Browse files

Move Kotlin definitions to another branch to workaround Eclipse issues

parent a6340106
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
build.gradle.kts
+ 0
− 4
View file @ faa51d31
......@@ -3,7 +3,6 @@ version = "2.0.1"
plugins {
java
kotlin("jvm") version "1.6.10"
// https://github.com/openjfx/javafx-gradle-plugin/releases
id("org.openjfx.javafxplugin") version "0.0.10"
// https://github.com/beryx/badass-jlink-plugin
......@@ -42,7 +41,6 @@ repositories {
dependencies {
implementation("fi.utu.tech", "hotreload", "2.0.1")
implementation("org.jetbrains.kotlin", "kotlin-stdlib-jdk8", "1.6.10")
testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.8.2")
testImplementation("org.junit.jupiter", "junit-jupiter-engine", "5.8.2")
testImplementation("org.junit.jupiter", "junit-jupiter-params", "5.8.2")
......@@ -78,7 +76,5 @@ jlink {
name = "launch"
}
// https://github.com/beryx/badass-jlink-plugin/issues/165
forceMerge("kotlin")
imageZip.set(project.file("${project.buildDir}/image-zip/template-javafx-image.zip"))
}
pom.xml
+ 9
− 56
View file @ faa51d31
......@@ -26,7 +26,6 @@
<!-- Version numbers for various modules -->
<jdk.version>11</jdk.version>
<kotlin.version>1.6.10</kotlin.version>
<jqwik.version>1.6.2</jqwik.version>
<junit.version>5.8.2</junit.version>
<junitplatform.version>1.8.2</junitplatform.version>
......@@ -84,23 +83,6 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>
<!--
<dependency>
<groupId>org.junit.jupiter</groupId>
......@@ -378,27 +360,27 @@
<tag>
<name>toDo</name>
<placement>a</placement>
<head>To&nbsp;do:</head>
<head>To do:</head>
</tag>
<tag>
<name>classInvariant</name>
<placement>t</placement>
<head>Class&nbsp;invariant:</head>
<head>Class invariant:</head>
</tag>
<tag>
<name>classInvariantProtected</name>
<placement>t</placement>
<head>Protected&nbsp;class&nbsp;invariant:</head>
<head>Protected class invariant:</head>
</tag>
<tag>
<name>classInvariantPrivate</name>
<placement>t</placement>
<head>Private&nbsp;class&nbsp;invariant:</head>
<head>Private class invariant:</head>
</tag>
<tag>
<name>abstractionFunction</name>
<placement>t</placement>
<head>Abstraction&nbsp;function:</head>
<head>Abstraction function:</head>
</tag>
<tag>
<name>pre</name>
......@@ -413,22 +395,22 @@
<tag>
<name>postProtected</name>
<placement>cm</placement>
<head>Protected&nbsp;postcondition:</head>
<head>Protected postcondition:</head>
</tag>
<tag>
<name>postPrivate</name>
<placement>cm</placement>
<head>Private&nbsp;postcondition:</head>
<head>Private postcondition:</head>
</tag>
<tag>
<name>time</name>
<placement>cmf</placement>
<head>Time&nbsp;complexity:</head>
<head>Time complexity:</head>
</tag>
<tag>
<name>space</name>
<placement>cmf</placement>
<head>Space&nbsp;complexity:</head>
<head>Space complexity:</head>
</tag>
<tag>
<name>correspondence</name>
......@@ -477,35 +459,6 @@
<version>3.0.0-M5</version>
</plugin>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
<phase>process-sources</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>test-compile</goal>
</goals>
</execution>
</executions>
<configuration
><!--
<args>
<arg>-Xuse-ir</arg>
</args> -->
<jvmTarget>${jdk.version}</jvmTarget>
</configuration>
</plugin>
</plugins>
<extensions>
<!-- Enables the use of SSH for deployments -->
......
......
src/main/java/module-info.java
+ 0
− 2
View file @ faa51d31
......@@ -3,8 +3,6 @@
module fi.utu.tech.gui.javafx {
// requires java.desktop;
requires kotlin.stdlib;
requires kotlin.stdlib.jdk8;
requires transitive javafx.base;
requires transitive javafx.fxml;
requires transitive javafx.controls;
......
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment