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

Started to add kobalt example.

Browse source
This commit is contained in:
Erik C. Thauvin 2016-07-06 17:37:33 -07:00
parent 4c7f42f381
commit ae4e775e6e
15 changed files with 188 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

12
.idea/modules/example.iml generated Normal file
View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="example" external.linked.project.path="$MODULE_DIR$/../../example" external.root.project.path="$MODULE_DIR$/../../example" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="3.1.39-beta" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$/../../example">
<excludeFolder url="file://$MODULE_DIR$/../../example/.gradle" />
<excludeFolder url="file://$MODULE_DIR$/../../example/build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

15
.idea/modules/example_annotationProcessor.iml generated Normal file
View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="example:annotationProcessor" external.linked.project.path="$MODULE_DIR$/../../example" external.root.project.path="$MODULE_DIR$/../../example" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="3.1.39-beta" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/../../example/build/classes/annotationProcessor" />
<exclude-output />
<content url="file://$MODULE_DIR$/../../example/src/annotationProcessor">
<sourceFolder url="file://$MODULE_DIR$/../../example/src/annotationProcessor/resources" type="java-resource" />
</content>
<content url="file://$MODULE_DIR$/../../example/src/generated">
<sourceFolder url="file://$MODULE_DIR$/../../example/src/generated/java" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

17
.idea/modules/example_main.iml generated Normal file
View file

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="example:main" external.linked.project.path="$MODULE_DIR$/../../example" external.root.project.path="$MODULE_DIR$/../../example" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="3.1.39-beta" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/../../example/build/classes/main" />
<exclude-output />
<content url="file://$MODULE_DIR$/../../example/src/main">
<sourceFolder url="file://$MODULE_DIR$/../../example/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../../example/src/main/resources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.apache.velocity:velocity:1.7" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: net.thauvin.erik:semver:0.9.5-beta" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: commons-lang:commons-lang:2.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Gradle: commons-collections:commons-collections:3.2.1" level="project" />
</component>
</module>

15
.idea/modules/example_test.iml generated Normal file
View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="example:test" external.linked.project.path="$MODULE_DIR$/../../example" external.root.project.path="$MODULE_DIR$/../../example" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="3.1.39-beta" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
<output-test url="file://$MODULE_DIR$/../../example/build/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$/../../example/src/test">
<sourceFolder url="file://$MODULE_DIR$/../../example/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/../../example/src/test/resources" type="java-test-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="example_main" />
</component>
<component name="TestModuleProperties" production-module="example_main" />
</module>

7
.idea/modules/semver_test.iml generated
View file

@ -9,10 +9,15 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Gradle: org.testng:testng:6.9.12" level="project" />
<orderEntry type="module" module-name="semver_main" />
<orderEntry type="library" name="Gradle: org.apache.velocity:velocity:1.7" level="project" />
<orderEntry type="library" name="Gradle: org.testng:testng:6.9.12" level="project" />
<orderEntry type="library" name="Gradle: commons-collections:commons-collections:3.2.1" level="project" />
<orderEntry type="library" name="Gradle: commons-lang:commons-lang:2.4" level="project" />
<orderEntry type="library" name="Gradle: org.beanshell:bsh:2.0b4" level="project" />
<orderEntry type="library" name="Gradle: com.beust:jcommander:1.48" level="project" />
<orderEntry type="library" name="Gradle: org.apache.ant:ant:1.7.0" level="project" />
<orderEntry type="library" name="Gradle: org.apache.ant:ant-launcher:1.7.0" level="project" />
</component>
<component name="TestModuleProperties" production-module="semver_main" />
</module>

3
example/.gitignore vendored
View file

@ -7,6 +7,7 @@
.DS_Store
.classpath
.gradle
.kobalt
.nb-gradle
.project
.settings
@ -15,6 +16,7 @@
/deploy
/dist
/gen
/gradle.properties
/local.properties
/out
/proguard-project.txt
@ -22,3 +24,4 @@
/test-output
Thumbs.db
ehthumbs.db
kobaltBuild

2
example/build.gradle
View file

@ -53,6 +53,7 @@ annotationProcessor {
project.version = getVersion(isRelease)
library 'net.thauvin.erik:semver:0.9.5-beta'
processor 'net.thauvin.erik.semver.VersionProcessor'
// sourcesDir 'src/generated/java'
}
compileJava {
@ -81,7 +82,6 @@ task deploy(dependsOn: ['build', 'copyToDeploy']) {
mustRunAfter clean
}
task release(dependsOn: ['deploy', 'wrapper']) << {
group = 'Publishing'
description = 'Releases new version.'

24
example/example.iml
View file

@ -1,24 +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="GRADLE" external.system.module.group="" external.system.module.version="3.1.39-beta" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes/main" />
<output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/generated/java" isTestSource="false" />
<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/annotationProcessor/resources" type="java-resource" />
<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$/build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Gradle: net.thauvin.erik:semver:0.9.5-beta" level="project" />
<orderEntry type="library" name="Gradle: org.apache.velocity:velocity:1.7" level="project" />
<orderEntry type="library" name="Gradle: commons-collections:commons-collections:3.2.1" level="project" />
<orderEntry type="library" name="Gradle: commons-lang:commons-lang:2.4" level="project" />
</component>
</module>

71
example/kobalt/src/Build.kt Normal file
View file

@ -0,0 +1,71 @@
import java.util.Properties
import java.io.FileInputStream
import com.beust.kobalt.*
import com.beust.kobalt.plugin.packaging.*
import com.beust.kobalt.plugin.application.*
import com.beust.kobalt.plugin.java.*
import com.beust.kobalt.plugin.apt.*
val repos = repos()
val p = project {
fun getVersion(isIncremental: Boolean = false): String {
val propsFile = "version.properties"
val majorKey = "version.major"
val minorKey = "version.minor"
val patchKey = "version.patch"
val metaKey = "version.buildmeta"
val preKey = "version.prerelease"
val p = Properties().apply {
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") + prerelease + metadata)
}
name = "example"
version = getVersion()
val mainClassName = "net.thauvin.erik.semver.example.Example"
val processorJar = "net.thauvin.erik:semver:0.9.5-beta"
sourceDirectories {
path("src/main/java")
}
sourceDirectoriesTest {
path("src/test/java")
}
dependencies {
apt(processorJar)
compile(processorJar)
}
dependenciesTest {
}
assemble {
jar {
manifest {
attributes("Main-Class", mainClassName)
}
}
}
application {
mainClass = mainClassName
}
}

BIN
example/kobalt/wrapper/kobalt-wrapper.jar Normal file
View file

Binary file not shown.

1
example/kobalt/wrapper/kobalt-wrapper.properties Normal file
View file

@ -0,0 +1 @@
kobalt.version=0.839

1
example/kobaltw Normal file
View file

@ -0,0 +1 @@
java -jar $(dirname $0)/kobalt/wrapper/kobalt-wrapper.jar $*

BIN
example/libs/example-3.1.39+beta.jar Normal file
View file

Binary file not shown.

2
example/src/generated/java/net/thauvin/erik/semver/example/GeneratedVersion.java
View file

@ -14,7 +14,7 @@ import java.util.Date;
*/
public final class GeneratedVersion {
private final static String buildmeta = "";
private final static Date date = new Date(1466981527892L);
private final static Date date = new Date(1467521680486L);
private final static int major = 3;
private final static int minor = 1;
private final static int patch = 39;

47
semver.ipr
View file

@ -58,6 +58,9 @@
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
<module name="example_annotationProcessor" target="1.8" />
<module name="example_main" target="1.8" />
<module name="example_test" target="1.8" />
<module name="semver_main" target="1.8" />
<module name="semver_test" target="1.8" />
</bytecodeTargetLevel>
@ -313,7 +316,10 @@
</component>
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/example/example.iml" filepath="$PROJECT_DIR$/example/example.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/example.iml" filepath="$PROJECT_DIR$/.idea/modules/example.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/example_annotationProcessor.iml" filepath="$PROJECT_DIR$/.idea/modules/example_annotationProcessor.iml" group="example" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/example_main.iml" filepath="$PROJECT_DIR$/.idea/modules/example_main.iml" group="example" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/example_test.iml" filepath="$PROJECT_DIR$/.idea/modules/example_test.iml" group="example" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/semver.iml" filepath="$PROJECT_DIR$/.idea/modules/semver.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/semver_main.iml" filepath="$PROJECT_DIR$/.idea/modules/semver_main.iml" group="semver" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/semver_test.iml" filepath="$PROJECT_DIR$/.idea/modules/semver_test.iml" group="semver" />
@ -326,6 +332,15 @@
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
<component name="libraryTable">
<library name="Gradle: com.beust:jcommander:1.48">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.48/bfcb96281ea3b59d626704f74bc6d625ff51cbce/jcommander-1.48.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.48/6deefcf90f144dfca29d4950c665a592ba029d42/jcommander-1.48-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: commons-collections:commons-collections:3.2.1">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-collections/commons-collections/3.2.1/761ea405b9b37ced573d2df0d1e3a4e0f9edc668/commons-collections-3.2.1.jar!/" />
@ -353,6 +368,22 @@
<root url="jar://$MAVEN_REPOSITORY$/net/thauvin/erik/semver/0.9.5-beta/semver-0.9.5-beta-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: org.apache.ant:ant-launcher:1.7.0">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.7.0/e7e30789211e074aa70ef3eaea59bd5b22a7fa7a/ant-launcher-1.7.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="Gradle: org.apache.ant:ant:1.7.0">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.7.0/9746af1a485e50cf18dcb232489032a847067066/ant-1.7.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.7.0/58ec0e378f1d33cb72a92ee3a9442909789090db/ant-1.7.0-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: org.apache.velocity:velocity:1.7">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.velocity/velocity/1.7/2ceb567b8f3f21118ecdec129fe1271dbc09aa7a/velocity-1.7.jar!/" />
@ -362,12 +393,22 @@
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.velocity/velocity/1.7/eb11eb70171ed64842b2e5216d5904e21ed162ac/velocity-1.7-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: org.testng:testng:6.9.12">
<library name="Gradle: org.beanshell:bsh:2.0b4">
<CLASSES>
<root url="file://$PROJECT_DIR$/Could not find org.testng:testng:6.9.12." />
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.beanshell/bsh/2.0b4/a05f0a0feefa8d8467ac80e16e7de071489f0d9c/bsh-2.0b4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="Gradle: org.testng:testng:6.9.12">
<CLASSES>
<root url="file://$PROJECT_DIR$/Could not find org.testng:testng:6.9.12." />
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.testng/testng/6.9.12/354eba9b34737190bad0a72dd5671683cfbae24d/testng-6.9.12.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.testng/testng/6.9.12/b8aff7a935f6bc0332cb5dc5fff57a16a7964db6/testng-6.9.12-sources.jar!/" />
</SOURCES>
</library>
</component>
</project>