diff --git a/.idea/kobalt.xml b/.idea/kobalt.xml index 834a200..f7f8f81 100644 --- a/.idea/kobalt.xml +++ b/.idea/kobalt.xml @@ -6,7 +6,7 @@ - + diff --git a/.idea/modules.xml b/.idea/modules.xml index ad2960d..5f459f3 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,7 +3,6 @@ - diff --git a/example/example.iml b/example/example.iml deleted file mode 100644 index 3902560..0000000 --- a/example/example.iml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/example/kobalt/src/Build.kt b/example/kobalt/src/Build.kt index 89bed99..ce46144 100644 --- a/example/kobalt/src/Build.kt +++ b/example/kobalt/src/Build.kt @@ -7,7 +7,8 @@ import net.thauvin.erik.kobalt.plugin.propertyfile.* // ./kobaltw propertyFile 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 { @@ -33,12 +34,20 @@ val p = project { } propertyFile { + // parameters 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.minor", value = "0") entry(key = "version.patch", value = "1", default = "-1", type = Types.INT, operation = Operations.ADD) 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") + + // Set date to now, then add a month entry(key = "date.nextMonth", value = "now", type = Types.DATE) entry(key = "date.nextMonth", value = "0", type = Types.DATE, unit = Units.MONTH, operation = Operations.ADD) diff --git a/example/kobalt/wrapper/kobalt-wrapper.properties b/example/kobalt/wrapper/kobalt-wrapper.properties index 2f7d9ed..5430a86 100644 --- a/example/kobalt/wrapper/kobalt-wrapper.properties +++ b/example/kobalt/wrapper/kobalt-wrapper.properties @@ -1 +1 @@ -kobalt.version=1.0.68 \ No newline at end of file +kobalt.version=1.0.69 \ No newline at end of file diff --git a/kobalt-property-file.iml b/kobalt-property-file.iml index 8b46963..f2a4dad 100644 --- a/kobalt-property-file.iml +++ b/kobalt-property-file.iml @@ -12,15 +12,6 @@ - - - - - - - - - @@ -31,576 +22,18 @@ - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -616,9 +49,576 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kobalt/Build.kt.iml b/kobalt/Build.kt.iml index 2d42ea5..2e165fb 100644 --- a/kobalt/Build.kt.iml +++ b/kobalt/Build.kt.iml @@ -10,15 +10,24 @@ - + - + - + + + + + + + + + + \ No newline at end of file diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index 5a30a3a..e31f98a 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -1,10 +1,15 @@ - +import com.beust.kobalt.* import com.beust.kobalt.plugin.packaging.assemble -import com.beust.kobalt.profile -import com.beust.kobalt.project +import com.beust.kobalt.plugin.publish.autoGitTag +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 kobaltDependency = if (dev) "kobalt" else "kobalt-plugin-api" @@ -15,6 +20,25 @@ val p = project { artifactId = name 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 { compile("com.beust:$kobaltDependency:") } @@ -30,4 +54,20 @@ val p = project { mavenJars {} } + + autoGitTag { + enabled = true + message = "Version $version" + } + + bintray { + publish = true + description = "Release version $version" + vcsTag = version + } + + versionEye { + org = "Thauvin" + team = "Owners" + } } \ No newline at end of file diff --git a/kobalt/wrapper/kobalt-wrapper.properties b/kobalt/wrapper/kobalt-wrapper.properties index 2f7d9ed..5430a86 100644 --- a/kobalt/wrapper/kobalt-wrapper.properties +++ b/kobalt/wrapper/kobalt-wrapper.properties @@ -1 +1 @@ -kobalt.version=1.0.68 \ No newline at end of file +kobalt.version=1.0.69 \ No newline at end of file