From 199ecf1f4658b2ef039a74133ea8f9c0441d628f Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 17 Apr 2017 23:01:49 -0700 Subject: [PATCH] IDEA and Kobalt updates. --- .gitignore | 4 ++- .idea/vcs.xml | 6 +++++ example/example.iml | 17 ++++++++++++ .../kobalt/wrapper/kobalt-wrapper.properties | 2 +- kobalt/src/Build.kt | 26 +------------------ 5 files changed, 28 insertions(+), 27 deletions(-) create mode 100644 .idea/vcs.xml create mode 100644 example/example.iml diff --git a/.gitignore b/.gitignore index 8775852..f9a4d9d 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,7 @@ /dist /gen /gradle.properties -/libs +/lib /local.properties /out /proguard-project.txt @@ -25,5 +25,7 @@ /target /test-output ehthumbs.db +example/version.properties kobaltBuild +libs Thumbs.db \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/example/example.iml b/example/example.iml new file mode 100644 index 0000000..3902560 --- /dev/null +++ b/example/example.iml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/example/kobalt/wrapper/kobalt-wrapper.properties b/example/kobalt/wrapper/kobalt-wrapper.properties index aa4491a..2f7d9ed 100644 --- a/example/kobalt/wrapper/kobalt-wrapper.properties +++ b/example/kobalt/wrapper/kobalt-wrapper.properties @@ -1 +1 @@ -kobalt.version=1.0.67 +kobalt.version=1.0.68 \ No newline at end of file diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index cbaab6e..5a30a3a 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -1,12 +1,11 @@ -import com.beust.kobalt.plugin.application.application import com.beust.kobalt.plugin.packaging.assemble import com.beust.kobalt.profile import com.beust.kobalt.project -//import net.thauvin.erik.kobalt.plugin.propertyfile.* val semver = "0.1.0" + val dev by profile() val kobaltDependency = if (dev) "kobalt" else "kobalt-plugin-api" @@ -31,27 +30,4 @@ val p = project { mavenJars {} } - - application { - mainClass = "com.example.MainKt" - } -} - -val example = project(p) { - directory = "example" - name = "example" - version = "0.1.0" - - assemble { - jar { - } - } - - application { - mainClass = "com.example.MainKt" - } - -// propertyFile { -// file = "version.properties" -// } } \ No newline at end of file