erik/semver-example-kotlin
erik/semver-example-kotlin
1
0
Fork 0
Code Issues Pull requests Releases Activity

Kobalt dependencies updates.

Browse source
This commit is contained in:
Erik C. Thauvin 2017-11-06 12:43:28 -08:00
parent 8aad6f137f
commit 9031ebe5eb
8 changed files with 44 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.idea/kobalt.xml generated
View file

@ -6,7 +6,7 @@
<option name="autoDownloadKobalt" value="true" /> <option name="autoDownloadKobalt" value="true" />
<option name="downloadSources" value="false" /> <option name="downloadSources" value="false" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="kobaltHome" value="$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.83" /> <option name="kobaltHome" value="$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.90" />
<option name="modules"> <option name="modules">
<set> <set>
<option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$" />

7
.idea/kotlinc.xml generated Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Kotlin2JsCompilerArguments">
<option name="sourceMapEmbedSources" />
<option name="sourceMapPrefix" />
</component>
</project>

1
.idea/modules/example-kotlin.iml generated
View file

@ -5,6 +5,7 @@
<content url="file://$MODULE_DIR$/../.."> <content url="file://$MODULE_DIR$/../..">
<excludeFolder url="file://$MODULE_DIR$/../../.gradle" /> <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
<excludeFolder url="file://$MODULE_DIR$/../../build" /> <excludeFolder url="file://$MODULE_DIR$/../../build" />
<excludeFolder url="file://$MODULE_DIR$/../../out" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />

16
.idea/modules/example-kotlin_main.iml generated
View file

@ -5,27 +5,27 @@
<configuration version="2" platform="JVM 1.6" useProjectSettings="false"> <configuration version="2" platform="JVM 1.6" useProjectSettings="false">
<compilerSettings /> <compilerSettings />
<compilerArguments> <compilerArguments>
<option name="destination" value="$MODULE_DIR$/../../build/kotlin-classes/main" />
<option name="noStdlib" value="true" /> <option name="noStdlib" value="true" />
<option name="noReflect" value="true" /> <option name="noReflect" value="true" />
<option name="moduleName" value="example-kotlin_main" /> <option name="moduleName" value="example-kotlin" />
<option name="jvmTarget" value="1.6" />
<option name="addCompilerBuiltIns" value="true" /> <option name="addCompilerBuiltIns" value="true" />
<option name="loadBuiltInsFromDependencies" value="true" /> <option name="loadBuiltInsFromDependencies" value="true" />
<option name="languageVersion" value="1.1" /> <option name="languageVersion" value="1.1" />
<option name="apiVersion" value="1.1" /> <option name="apiVersion" value="1.1" />
<option name="pluginOptions">
<array />
</option>
<option name="pluginClasspaths"> <option name="pluginClasspaths">
<array /> <array />
</option> </option>
<option name="coroutinesWarn" value="true" /> <option name="coroutinesWarn" value="true" />
<option name="pluginOptions">
<array />
</option>
</compilerArguments> </compilerArguments>
</configuration> </configuration>
</facet> </facet>
</component> </component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/../../build/classes/main" /> <output url="file://$MODULE_DIR$/../../out/production/classes" />
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$/../../src/main"> <content url="file://$MODULE_DIR$/../../src/main">
<sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
@ -34,9 +34,9 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1.1" level="project" /> <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1.51" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: net.thauvin.erik:semver:0.9.7" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spullara.mustache.java:compiler:0.9.4" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spullara.mustache.java:compiler:0.9.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: net.thauvin.erik:semver:1.0.1" level="project" />
<orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" /> <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
</component> </component>
</module> </module>

14
.idea/modules/example-kotlin_test.iml generated
View file

@ -5,27 +5,27 @@
<configuration version="2" platform="JVM 1.6" useProjectSettings="false"> <configuration version="2" platform="JVM 1.6" useProjectSettings="false">
<compilerSettings /> <compilerSettings />
<compilerArguments> <compilerArguments>
<option name="destination" value="$MODULE_DIR$/../../build/kotlin-classes/test" />
<option name="noStdlib" value="true" /> <option name="noStdlib" value="true" />
<option name="noReflect" value="true" /> <option name="noReflect" value="true" />
<option name="moduleName" value="example-kotlin_main" /> <option name="moduleName" value="example-kotlin" />
<option name="jvmTarget" value="1.6" />
<option name="addCompilerBuiltIns" value="true" /> <option name="addCompilerBuiltIns" value="true" />
<option name="loadBuiltInsFromDependencies" value="true" /> <option name="loadBuiltInsFromDependencies" value="true" />
<option name="languageVersion" value="1.1" /> <option name="languageVersion" value="1.1" />
<option name="apiVersion" value="1.1" /> <option name="apiVersion" value="1.1" />
<option name="pluginOptions">
<array />
</option>
<option name="pluginClasspaths"> <option name="pluginClasspaths">
<array /> <array />
</option> </option>
<option name="coroutinesWarn" value="true" /> <option name="coroutinesWarn" value="true" />
<option name="pluginOptions">
<array />
</option>
</compilerArguments> </compilerArguments>
</configuration> </configuration>
</facet> </facet>
</component> </component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output-test url="file://$MODULE_DIR$/../../build/classes/test" /> <output-test url="file://$MODULE_DIR$/../../out/test/classes" />
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$/../../src/test"> <content url="file://$MODULE_DIR$/../../src/test">
<sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
@ -35,7 +35,7 @@
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="example-kotlin_main" /> <orderEntry type="module" module-name="example-kotlin_main" />
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1.1" level="project" /> <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1.51" level="project" />
<orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" /> <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
</component> </component>
<component name="TestModuleProperties" production-module="example-kotlin_main" /> <component name="TestModuleProperties" production-module="example-kotlin_main" />

6
kobalt/Build.kt.iml
View file

@ -10,13 +10,13 @@
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: com.beust.kobalt:kobalt:jar:1.0.83"> <library name="Kobalt: com.beust.kobalt:kobalt:jar:1.0.90">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.83/kobalt/wrapper/kobalt-1.0.83.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.90/kobalt/wrapper/kobalt-1.0.90.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.83/kobalt/wrapper/kobalt-1.0.83-sources.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.90/kobalt/wrapper/kobalt-1.0.90-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</orderEntry> </orderEntry>

25
kobalt/src/Build.kt
View file

@ -1,8 +1,12 @@
import com.beust.kobalt.*
import com.beust.kobalt.plugin.apt.* import com.beust.kobalt.buildScript
import com.beust.kobalt.plugin.packaging.* import com.beust.kobalt.localMaven
import com.beust.kobalt.plugin.application.* import com.beust.kobalt.plugin.application.application
import com.beust.kobalt.plugin.kotlin.* 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 // ./kobaltw run runJava
@ -10,8 +14,8 @@ val bs = buildScript {
repos(localMaven()) repos(localMaven())
} }
val kotlin_version = "1.1.2" val kotlin_version = "1.1.51"
val processorJar = "net.thauvin.erik:semver:1.0.0" val processorJar = "net.thauvin.erik:semver:1.0.1"
// ./kobalt run runJava // ./kobalt run runJava
@ -29,14 +33,17 @@ val p = project {
dependencies { dependencies {
apt(processorJar) apt(processorJar)
compileOnly(processorJar) compileOnly(processorJar)
compileOnly("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version", compileOnly("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version")
"org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version")
} }
dependenciesTest { dependenciesTest {
// compile("org.testng:testng:6.11") // compile("org.testng:testng:6.11")
} }
javaCompiler {
args("-source", "1.8", "-target", "1.8")
}
assemble { assemble {
jar { jar {
} }

2
kobalt/wrapper/kobalt-wrapper.properties
View file

@ -1 +1 @@
kobalt.version=1.0.86 kobalt.version=1.0.90