Kobalt 1.0.69 update.
This commit is contained in:
parent
90605dcafc
commit
c71713679f
9 changed files with 642 additions and 602 deletions
2
.idea/kobalt.xml
generated
2
.idea/kobalt.xml
generated
|
@ -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.68" />
|
<option name="kobaltHome" value="$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.69" />
|
||||||
<option name="modules">
|
<option name="modules">
|
||||||
<set>
|
<set>
|
||||||
<option value="$PROJECT_DIR$" />
|
<option value="$PROJECT_DIR$" />
|
||||||
|
|
1
.idea/modules.xml
generated
1
.idea/modules.xml
generated
|
@ -3,7 +3,6 @@
|
||||||
<component name="ProjectModuleManager">
|
<component name="ProjectModuleManager">
|
||||||
<modules>
|
<modules>
|
||||||
<module fileurl="file://$PROJECT_DIR$/kobalt/Build.kt.iml" filepath="$PROJECT_DIR$/kobalt/Build.kt.iml" />
|
<module fileurl="file://$PROJECT_DIR$/kobalt/Build.kt.iml" filepath="$PROJECT_DIR$/kobalt/Build.kt.iml" />
|
||||||
<module fileurl="file://$PROJECT_DIR$/example/example.iml" filepath="$PROJECT_DIR$/example/example.iml" />
|
|
||||||
<module fileurl="file://$PROJECT_DIR$/kobalt-property-file.iml" filepath="$PROJECT_DIR$/kobalt-property-file.iml" />
|
<module fileurl="file://$PROJECT_DIR$/kobalt-property-file.iml" filepath="$PROJECT_DIR$/kobalt-property-file.iml" />
|
||||||
</modules>
|
</modules>
|
||||||
</component>
|
</component>
|
||||||
|
|
|
@ -1,17 +0,0 @@
|
||||||
<?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>
|
|
|
@ -7,7 +7,8 @@ import net.thauvin.erik.kobalt.plugin.propertyfile.*
|
||||||
// ./kobaltw propertyFile
|
// ./kobaltw propertyFile
|
||||||
|
|
||||||
val bs = buildScript {
|
val bs = buildScript {
|
||||||
plugins(file("../libs/kobalt-property-file-0.1.0.jar"))
|
plugins(file("../kobaltBuild/libs/kobalt-property-file-0.9.0.jar"))
|
||||||
|
// plugins("net.thauvin.erik:kobalt-property-file:")
|
||||||
}
|
}
|
||||||
|
|
||||||
val p = project {
|
val p = project {
|
||||||
|
@ -33,12 +34,20 @@ val p = project {
|
||||||
}
|
}
|
||||||
|
|
||||||
propertyFile {
|
propertyFile {
|
||||||
|
// parameters
|
||||||
file = "version.properties"
|
file = "version.properties"
|
||||||
|
comment = "##Generated file - do not modify!"
|
||||||
|
// failOnWarning = true
|
||||||
|
|
||||||
|
// Version properties with patch increment
|
||||||
entry(key = "version.major", value = "1")
|
entry(key = "version.major", value = "1")
|
||||||
entry(key = "version.minor", value = "0")
|
entry(key = "version.minor", value = "0")
|
||||||
entry(key = "version.patch", value = "1", default = "-1", type = Types.INT, operation = Operations.ADD)
|
entry(key = "version.patch", value = "1", default = "-1", type = Types.INT, operation = Operations.ADD)
|
||||||
entry(key = "version.date", value = "now", type = Types.DATE)
|
entry(key = "version.date", value = "now", type = Types.DATE)
|
||||||
|
// ISO8601 date
|
||||||
entry(key = "version.dateISO", value = "now", type = Types.DATE, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSZ")
|
entry(key = "version.dateISO", value = "now", type = Types.DATE, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSZ")
|
||||||
|
|
||||||
|
// Set date to now, then add a month
|
||||||
entry(key = "date.nextMonth", value = "now", type = Types.DATE)
|
entry(key = "date.nextMonth", value = "now", type = Types.DATE)
|
||||||
entry(key = "date.nextMonth", value = "0", type = Types.DATE, unit = Units.MONTH, operation = Operations.ADD)
|
entry(key = "date.nextMonth", value = "0", type = Types.DATE, unit = Units.MONTH, operation = Operations.ADD)
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
kobalt.version=1.0.68
|
kobalt.version=1.0.69
|
File diff suppressed because it is too large
Load diff
|
@ -10,15 +10,24 @@
|
||||||
<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.68">
|
<library name="Kobalt: com.beust.kobalt:kobalt:jar:1.0.69">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.68/kobalt/wrapper/kobalt-1.0.68.jar!/" />
|
<root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.69/kobalt/wrapper/kobalt-1.0.69.jar!/" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
<root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.68/kobalt/wrapper/kobalt-1.0.68-sources.jar!/" />
|
<root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.69/kobalt/wrapper/kobalt-1.0.69-sources.jar!/" />
|
||||||
</SOURCES>
|
</SOURCES>
|
||||||
</library>
|
</library>
|
||||||
</orderEntry>
|
</orderEntry>
|
||||||
|
<orderEntry type="module-library">
|
||||||
|
<library name="Kobalt: kobalt-versioneye-0.4.4.jar">
|
||||||
|
<CLASSES>
|
||||||
|
<root url="jar://$USER_HOME$/.kobalt/cache/net/thauvin/erik/kobalt-versioneye/0.4.4/kobalt-versioneye-0.4.4.jar!/" />
|
||||||
|
</CLASSES>
|
||||||
|
<JAVADOC />
|
||||||
|
<SOURCES />
|
||||||
|
</library>
|
||||||
|
</orderEntry>
|
||||||
</component>
|
</component>
|
||||||
</module>
|
</module>
|
|
@ -1,10 +1,15 @@
|
||||||
|
import com.beust.kobalt.*
|
||||||
import com.beust.kobalt.plugin.packaging.assemble
|
import com.beust.kobalt.plugin.packaging.assemble
|
||||||
import com.beust.kobalt.profile
|
import com.beust.kobalt.plugin.publish.autoGitTag
|
||||||
import com.beust.kobalt.project
|
import com.beust.kobalt.plugin.publish.bintray
|
||||||
|
import net.thauvin.erik.kobalt.plugin.versioneye.versionEye
|
||||||
|
import org.apache.maven.model.*
|
||||||
|
|
||||||
val semver = "0.1.0"
|
val semver = "0.9.0"
|
||||||
|
|
||||||
|
val bs = buildScript {
|
||||||
|
plugins("net.thauvin.erik:kobalt-versioneye:")
|
||||||
|
}
|
||||||
|
|
||||||
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"
|
||||||
|
@ -15,6 +20,25 @@ val p = project {
|
||||||
artifactId = name
|
artifactId = name
|
||||||
version = semver
|
version = semver
|
||||||
|
|
||||||
|
pom = Model().apply {
|
||||||
|
description = "PropertyFile plug-in for the Kobalt build system."
|
||||||
|
url = "https://github.com/ethauvin/kobalt-property-file"
|
||||||
|
licenses = listOf(License().apply {
|
||||||
|
name = "BSD 3-Clause"
|
||||||
|
url = "https://opensource.org/licenses/BSD-3-Clause"
|
||||||
|
})
|
||||||
|
scm = Scm().apply {
|
||||||
|
url = "https://github.com/ethauvin/kobalt-property-file"
|
||||||
|
connection = "https://github.com/ethauvin/kobalt-property-file.git"
|
||||||
|
developerConnection = "git@github.com:ethauvin/kobalt-property-file.git"
|
||||||
|
}
|
||||||
|
developers = listOf(Developer().apply {
|
||||||
|
id = "ethauvin"
|
||||||
|
name = "Erik C. Thauvin"
|
||||||
|
email = "erik@thauvin.net"
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile("com.beust:$kobaltDependency:")
|
compile("com.beust:$kobaltDependency:")
|
||||||
}
|
}
|
||||||
|
@ -30,4 +54,20 @@ val p = project {
|
||||||
|
|
||||||
mavenJars {}
|
mavenJars {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
autoGitTag {
|
||||||
|
enabled = true
|
||||||
|
message = "Version $version"
|
||||||
|
}
|
||||||
|
|
||||||
|
bintray {
|
||||||
|
publish = true
|
||||||
|
description = "Release version $version"
|
||||||
|
vcsTag = version
|
||||||
|
}
|
||||||
|
|
||||||
|
versionEye {
|
||||||
|
org = "Thauvin"
|
||||||
|
team = "Owners"
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -1 +1 @@
|
||||||
kobalt.version=1.0.68
|
kobalt.version=1.0.69
|
Loading…
Add table
Add a link
Reference in a new issue