adds kontlin support

palasjir · Dec 27, 2017 · c2454d0 · c2454d0
1 parent 77b4d2c
commit c2454d0
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 .idea/
 .gradle/
 build/
+out/
 
 *.iws
 *.ipr

diff --git a/build.gradle b/build.gradle
@@ -1,26 +1,43 @@
-apply plugin: 'idea'
-apply plugin: 'java'
-apply plugin: 'application'
-
 buildscript {
+    ext.kotlin_version = '1.2.10'
+    ext.jogl = '2.3.2'
 
     repositories {
         mavenCentral()
     }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
 }
 
+apply plugin: 'idea'
+apply plugin: 'java'
+apply plugin: 'kotlin'
+apply plugin: 'application'
+
 repositories {
     mavenCentral()
     maven { url 'https://jitpack.io' }
 }
 
 dependencies {
-    def jogl = '2.3.2'
-
     compile "org.apache.commons:commons-math3:3.2"
     compile "com.github.jroyalty:jglm:master-SNAPSHOT"
     compile "org.jogamp.gluegen:gluegen-rt-main:$jogl"
     compile "org.jogamp.jogl:jogl-all-main:$jogl"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
+}
+
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 }
 
-mainClassName = 'palasjir.viewer.Main'
+mainClassName = 'palasjir.MainKt'
diff --git a/src/main/java/palasjir/viewer/utils/Utils.java b/src/main/java/palasjir/viewer/utils/Utils.java
@@ -1,7 +1,5 @@
 package palasjir.viewer.utils;
 
-import com.hackoeur.jglm.Mat3;
-import com.hackoeur.jglm.Mat4;
 import com.jogamp.opengl.GL;
 import com.jogamp.opengl.GL3;
 

diff --git a/src/main/kotlin/palasjir/Main.kt b/src/main/kotlin/palasjir/Main.kt
@@ -0,0 +1,5 @@
+package palasjir
+
+fun main(args: Array<String>) {
+    println("Hello world!")
+}
-Original file line number
+Diff line change
@@ -1,6 +1,7 @@
     .idea/
     .gradle/
     build/
+    out/
     *.iws
     *.ipr
@@ Expand Down @@