diff --git a/.idea/kobalt.xml b/.idea/kobalt.xml index d83e315..7f1760d 100644 --- a/.idea/kobalt.xml +++ b/.idea/kobalt.xml @@ -6,7 +6,7 @@ - + diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..5806fb3 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/modules/example-kotlin.iml b/.idea/modules/example-kotlin.iml index 0c42eb0..0628f62 100644 --- a/.idea/modules/example-kotlin.iml +++ b/.idea/modules/example-kotlin.iml @@ -5,6 +5,7 @@ + diff --git a/.idea/modules/example-kotlin_main.iml b/.idea/modules/example-kotlin_main.iml index 6807d7c..3975b75 100644 --- a/.idea/modules/example-kotlin_main.iml +++ b/.idea/modules/example-kotlin_main.iml @@ -5,27 +5,27 @@ + - - + + + + - - - - + @@ -34,9 +34,9 @@ - - + + \ No newline at end of file diff --git a/.idea/modules/example-kotlin_test.iml b/.idea/modules/example-kotlin_test.iml index b358c0d..3d56d48 100644 --- a/.idea/modules/example-kotlin_test.iml +++ b/.idea/modules/example-kotlin_test.iml @@ -5,27 +5,27 @@ + - - + + + + - - - - + @@ -35,7 +35,7 @@ - + diff --git a/kobalt/Build.kt.iml b/kobalt/Build.kt.iml index 7cf6bc1..c700f28 100644 --- a/kobalt/Build.kt.iml +++ b/kobalt/Build.kt.iml @@ -10,13 +10,13 @@ - + - + - + diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index 9ad09b6..a241cd6 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -1,8 +1,12 @@ -import com.beust.kobalt.* -import com.beust.kobalt.plugin.apt.* -import com.beust.kobalt.plugin.packaging.* -import com.beust.kobalt.plugin.application.* -import com.beust.kobalt.plugin.kotlin.* + +import com.beust.kobalt.buildScript +import com.beust.kobalt.localMaven +import com.beust.kobalt.plugin.application.application +import com.beust.kobalt.plugin.apt.apt +import com.beust.kobalt.plugin.apt.kapt +import com.beust.kobalt.plugin.java.javaCompiler +import com.beust.kobalt.plugin.packaging.assemble +import com.beust.kobalt.project // ./kobaltw run runJava @@ -10,8 +14,8 @@ val bs = buildScript { repos(localMaven()) } -val kotlin_version = "1.1.2" -val processorJar = "net.thauvin.erik:semver:1.0.0" +val kotlin_version = "1.1.51" +val processorJar = "net.thauvin.erik:semver:1.0.1" // ./kobalt run runJava @@ -29,14 +33,17 @@ val p = project { dependencies { apt(processorJar) compileOnly(processorJar) - compileOnly("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version", - "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version") + compileOnly("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version") } dependenciesTest { // compile("org.testng:testng:6.11") } + javaCompiler { + args("-source", "1.8", "-target", "1.8") + } + assemble { jar { } diff --git a/kobalt/wrapper/kobalt-wrapper.properties b/kobalt/wrapper/kobalt-wrapper.properties index cdcb2d1..21b1f73 100644 --- a/kobalt/wrapper/kobalt-wrapper.properties +++ b/kobalt/wrapper/kobalt-wrapper.properties @@ -1 +1 @@ -kobalt.version=1.0.86 \ No newline at end of file +kobalt.version=1.0.90 \ No newline at end of file