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

Added StringNuilder().append() to kobalt build.

Browse source
This commit is contained in:
Erik C. Thauvin 2016-07-07 10:22:11 -07:00
parent a8ca79a1c0
commit b763de695c
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
example/example.ipr
View file

@ -166,7 +166,7 @@
<KobaltProjectSettings> <KobaltProjectSettings>
<option name="autoDownloadKobalt" value="true" /> <option name="autoDownloadKobalt" value="true" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="kobaltHome" value="$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.840" /> <option name="kobaltHome" value="$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.841" />
<option name="modules"> <option name="modules">
<set> <set>
<option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$" />
@ -363,7 +363,7 @@
</library> </library>
<library name="kobalt.jar"> <library name="kobalt.jar">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.840/kobalt/wrapper/kobalt-0.840.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.841/kobalt/wrapper/kobalt-0.841.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
@ -371,6 +371,9 @@
<root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.840/kobalt/wrapper/kobalt-0.840.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.840/kobalt/wrapper/kobalt-0.840.jar!/" />
<root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.840/kobalt/wrapper/kobalt-0.840.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.840/kobalt/wrapper/kobalt-0.840.jar!/" />
<root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.840/kobalt/wrapper/kobalt-0.840.jar!/" /> <root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.840/kobalt/wrapper/kobalt-0.840.jar!/" />
<root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.840/kobalt/wrapper/kobalt-0.840.jar!/" />
<root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.841/kobalt/wrapper/kobalt-0.841.jar!/" />
<root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-0.841/kobalt/wrapper/kobalt-0.841.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</component> </component>

23
example/kobalt/src/Build.kt
View file

@ -5,6 +5,13 @@ import com.beust.kobalt.project
import java.io.FileInputStream import java.io.FileInputStream
import java.util.* import java.util.*
fun StringBuilder.prepend(s: String): StringBuilder {
if (this.length > 0) {
this.insert(0, s)
}
return this
}
val p = project { val p = project {
name = "example" name = "example"
@ -17,21 +24,11 @@ val p = project {
val metaKey = "version.buildmeta" val metaKey = "version.buildmeta"
val preKey = "version.prerelease" val preKey = "version.prerelease"
val p = Properties().apply { val p = Properties().apply { FileInputStream(propsFile).use { fis -> load(fis) } }
FileInputStream(propsFile).use { fis -> load(fis) }
}
val metadata = StringBuilder(p.getProperty(metaKey, ""))
if (metadata.length > 0) {
metadata.insert(0, '-');
}
val prerelease = StringBuilder(p.getProperty(preKey, ""))
if (prerelease.length > 0) {
prerelease.insert(0, '+');
}
return (p.getProperty(majorKey, "1") + "." + p.getProperty(minorKey, "0") + "." + p.getProperty(patchKey, "0") return (p.getProperty(majorKey, "1") + "." + p.getProperty(minorKey, "0") + "." + p.getProperty(patchKey, "0")
+ prerelease + metadata) + StringBuilder(p.getProperty(preKey, "")).prepend("-")
+ StringBuilder(p.getProperty(metaKey, "")).prepend("+"))
} }
version = versionFor() version = versionFor()

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

@ -1 +1 @@
kobalt.version=0.840 kobalt.version=0.841