1.0 release prep.

This commit is contained in:
Erik C. Thauvin 2017-05-04 19:56:50 -07:00
parent 06328f155d
commit aaffb710f1
9 changed files with 72 additions and 37 deletions

2
.idea/kobalt.xml generated
View file

@ -5,7 +5,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-1.0.83" /> <option name="kobaltHome" value="$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.84" />
<option name="modules"> <option name="modules">
<set> <set>
<option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$" />

View file

@ -9,6 +9,7 @@ defaultTasks 'run'
def isRelease = 'release' in gradle.startParameter.taskNames def isRelease = 'release' in gradle.startParameter.taskNames
def deployDir = 'deploy' def deployDir = 'deploy'
def processorJar = 'net.thauvin.erik:semver:1.0.0'
// Get version from properties file. Increment patch if specified. // Get version from properties file. Increment patch if specified.
def getVersion(isIncrement = false) { def getVersion(isIncrement = false) {
@ -45,13 +46,13 @@ repositories {
} }
dependencies { dependencies {
compileOnly 'net.thauvin.erik:semver:+' compileOnly processorJar
} }
annotationProcessor { annotationProcessor {
// Update version, increment on release. // Update version, increment on release.
project.version = getVersion(isRelease) project.version = getVersion(isRelease)
library 'net.thauvin.erik:semver:+' library processorJar
processor 'net.thauvin.erik.semver.VersionProcessor' processor 'net.thauvin.erik.semver.VersionProcessor'
// sourcesDir 'src/generated/java' // sourcesDir 'src/generated/java'
} }

View file

@ -1,15 +1,15 @@
import com.beust.kobalt.* import com.beust.kobalt.*
import com.beust.kobalt.plugin.application.application import com.beust.kobalt.plugin.application.*
import com.beust.kobalt.plugin.apt.apt import com.beust.kobalt.plugin.apt.*
import com.beust.kobalt.plugin.publish.*
import com.beust.kobalt.plugin.packaging.* import com.beust.kobalt.plugin.packaging.*
import com.beust.kobalt.project
import java.io.FileInputStream import java.io.FileInputStream
import java.util.* import java.util.*
// .kobaltw run // .kobaltw run
val bs = buildScript { val bs = buildScript {
//repos(file("K:/maven/repository/"), localMaven()) repos(localMaven())
} }
fun StringBuilder.prepend(s: String): StringBuilder { fun StringBuilder.prepend(s: String): StringBuilder {
@ -41,7 +41,7 @@ val example = project {
version = versionFor() version = versionFor()
val mainClassName = "net.thauvin.erik.semver.example.Example" val mainClassName = "net.thauvin.erik.semver.example.Example"
val processorJar = "net.thauvin.erik:semver:" val processorJar = "net.thauvin.erik:semver:1.0.0"
dependencies { dependencies {
apt(processorJar) apt(processorJar)

View file

@ -1 +1 @@
kobalt.version=1.0.83 kobalt.version=1.0.85

View file

@ -17,7 +17,7 @@ public final class GeneratedVersion {
public final static String BUILDMETA_PREFIX = "+"; public final static String BUILDMETA_PREFIX = "+";
public final static String PROJECT = "Example"; public final static String PROJECT = "Example";
public final static Date BUILDDATE = new Date(1493251035937L); public final static Date BUILDDATE = new Date(1493952813608L);
public final static int MAJOR = 2; public final static int MAJOR = 2;
public final static int MINOR = 17; public final static int MINOR = 17;
public final static int PATCH = 52; public final static int PATCH = 52;

View file

@ -9,26 +9,6 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library name="Kobalt: kobalt-maven-local-0.5.3.jar">
<CLASSES>
<root url="jar://$USER_HOME$/.kobalt/cache/net/thauvin/erik/kobalt-maven-local/0.5.3/kobalt-maven-local-0.5.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="Kobalt: com.beust.kobalt:kobalt:jar:1.0.83">
<CLASSES>
<root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.83/kobalt/wrapper/kobalt-1.0.83.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.83/kobalt/wrapper/kobalt-1.0.83-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: kobalt-versioneye-0.4.5.jar"> <library name="Kobalt: kobalt-versioneye-0.4.5.jar">
<CLASSES> <CLASSES>
@ -38,6 +18,17 @@
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module-library">
<library name="Kobalt: com.beust.kobalt:kobalt:jar:1.0.84">
<CLASSES>
<root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.84/kobalt/wrapper/kobalt-1.0.84.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.kobalt/wrapper/dist/kobalt-1.0.84/kobalt/wrapper/kobalt-1.0.84-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Kobalt: kobalt-exec-0.7.0.jar"> <library name="Kobalt: kobalt-exec-0.7.0.jar">
<CLASSES> <CLASSES>

View file

@ -1,5 +1,5 @@
import com.beust.kobalt.buildScript import com.beust.kobalt.buildScript
import com.beust.kobalt.file import com.beust.kobalt.localMaven
import com.beust.kobalt.plugin.java.javadoc import com.beust.kobalt.plugin.java.javadoc
import com.beust.kobalt.plugin.packaging.assemble import com.beust.kobalt.plugin.packaging.assemble
import com.beust.kobalt.plugin.packaging.install import com.beust.kobalt.plugin.packaging.install
@ -17,9 +17,8 @@ import java.io.FileInputStream
import java.util.* import java.util.*
val bs = buildScript { val bs = buildScript {
repos(file("K:/maven/repository")) repos(localMaven())
plugins("net.thauvin.erik:kobalt-maven-local:", plugins("net.thauvin.erik:kobalt-exec:",
"net.thauvin.erik:kobalt-exec:",
"net.thauvin.erik:kobalt-versioneye:") "net.thauvin.erik:kobalt-versioneye:")
} }
@ -99,8 +98,10 @@ val semver = project {
} }
bintray { bintray {
name = "SemVer"
publish = true publish = true
description = "Release version $version" description = "Release version $version"
issueTrackerUrl = "https://github.com/ethauvin/semver/issues"
vcsTag = version vcsTag = version
sign = true sign = true
} }

View file

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

View file

@ -1,13 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="semver" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.9.7" type="JAVA_MODULE" version="4"> <module external.linked.project.id="semver" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="KOBALT" external.system.module.group="" external.system.module.version="0.9.7" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true"> <component name="NewModuleRootManager">
<output url="file://$MODULE_DIR$/kobaltBuild/classes" />
<output-test url="file://$MODULE_DIR$/kobaltBuild/test-classes" />
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<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$/kobaltBuild" /> <excludeFolder url="file://$MODULE_DIR$/kobaltBuild" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library name="Kobalt: com.github.spullara.mustache.java:compiler:jar:0.9.4">
<CLASSES>
<root url="jar://$USER_HOME$/.kobalt/cache/com/github/spullara/mustache/java/compiler/0.9.4/compiler-0.9.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="Kobalt: org.yaml:snakeyaml:jar:1.17">
<CLASSES>
<root url="jar://$USER_HOME$/.kobalt/cache/org/yaml/snakeyaml/1.17/snakeyaml-1.17.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="Kobalt: com.beust:jcommander:jar:1.64">
<CLASSES>
<root url="jar://$USER_HOME$/.kobalt/cache/com/beust/jcommander/1.64/jcommander-1.64.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="Kobalt: org.testng:testng:jar:6.11">
<CLASSES>
<root url="jar://$USER_HOME$/.kobalt/cache/org/testng/testng/6.11/testng-6.11.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component> </component>
</module> </module>