IDEA and Kobalt updates.
This commit is contained in:
parent
e751f5ca7e
commit
199ecf1f46
5 changed files with 28 additions and 27 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
@ -17,7 +17,7 @@
|
||||||
/dist
|
/dist
|
||||||
/gen
|
/gen
|
||||||
/gradle.properties
|
/gradle.properties
|
||||||
/libs
|
/lib
|
||||||
/local.properties
|
/local.properties
|
||||||
/out
|
/out
|
||||||
/proguard-project.txt
|
/proguard-project.txt
|
||||||
|
@ -25,5 +25,7 @@
|
||||||
/target
|
/target
|
||||||
/test-output
|
/test-output
|
||||||
ehthumbs.db
|
ehthumbs.db
|
||||||
|
example/version.properties
|
||||||
kobaltBuild
|
kobaltBuild
|
||||||
|
libs
|
||||||
Thumbs.db
|
Thumbs.db
|
6
.idea/vcs.xml
generated
Normal file
6
.idea/vcs.xml
generated
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="VcsDirectoryMappings">
|
||||||
|
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||||
|
</component>
|
||||||
|
</project>
|
17
example/example.iml
Normal file
17
example/example.iml
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<module external.linked.project.id="example" external.linked.project.path="$MODULE_DIR$/.." external.root.project.path="$MODULE_DIR$/.." external.system.id="KOBALT" type="JAVA_MODULE" version="4">
|
||||||
|
<component name="NewModuleRootManager">
|
||||||
|
<output url="file://$MODULE_DIR$/../kobaltBuild/classes" />
|
||||||
|
<output-test url="file://$MODULE_DIR$/../kobaltBuild/test-classes" />
|
||||||
|
<exclude-output />
|
||||||
|
<content url="file://$MODULE_DIR$">
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/src/main/kotlin" isTestSource="false" />
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/src/test/kotlin" isTestSource="true" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/kobaltBuild" />
|
||||||
|
</content>
|
||||||
|
<orderEntry type="inheritedJdk" />
|
||||||
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
|
<orderEntry type="module" module-name="kobalt-property-file" />
|
||||||
|
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
|
||||||
|
</component>
|
||||||
|
</module>
|
|
@ -1 +1 @@
|
||||||
kobalt.version=1.0.67
|
kobalt.version=1.0.68
|
|
@ -1,12 +1,11 @@
|
||||||
|
|
||||||
import com.beust.kobalt.plugin.application.application
|
|
||||||
import com.beust.kobalt.plugin.packaging.assemble
|
import com.beust.kobalt.plugin.packaging.assemble
|
||||||
import com.beust.kobalt.profile
|
import com.beust.kobalt.profile
|
||||||
import com.beust.kobalt.project
|
import com.beust.kobalt.project
|
||||||
//import net.thauvin.erik.kobalt.plugin.propertyfile.*
|
|
||||||
|
|
||||||
val semver = "0.1.0"
|
val semver = "0.1.0"
|
||||||
|
|
||||||
|
|
||||||
val dev by profile()
|
val dev by profile()
|
||||||
val kobaltDependency = if (dev) "kobalt" else "kobalt-plugin-api"
|
val kobaltDependency = if (dev) "kobalt" else "kobalt-plugin-api"
|
||||||
|
|
||||||
|
@ -31,27 +30,4 @@ val p = project {
|
||||||
|
|
||||||
mavenJars {}
|
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"
|
|
||||||
// }
|
|
||||||
}
|
}
|
Loading…
Add table
Add a link
Reference in a new issue