diff --git a/.idea/modules/ap-examples-java.iml b/.idea/modules/ap-examples-java.iml
index c41588b..3561fcb 100644
--- a/.idea/modules/ap-examples-java.iml
+++ b/.idea/modules/ap-examples-java.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="ap-examples-java" external.linked.project.path="$MODULE_DIR$/../../examples/annotation-processor/java" external.root.project.path="$MODULE_DIR$/../../examples/annotation-processor/java" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="1.2.2" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="ap-examples-java" external.linked.project.path="$MODULE_DIR$/../../examples/annotation-processor/java" external.root.project.path="$MODULE_DIR$/../../examples/annotation-processor/java" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="2.1.2" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../examples/annotation-processor/java">
diff --git a/.idea/modules/ap-examples-java_main.iml b/.idea/modules/ap-examples-java_main.iml
index 14eabfe..4ba373d 100644
--- a/.idea/modules/ap-examples-java_main.iml
+++ b/.idea/modules/ap-examples-java_main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="ap-examples-java:main" external.linked.project.path="$MODULE_DIR$/../../examples/annotation-processor/java" external.root.project.path="$MODULE_DIR$/../../examples/annotation-processor/java" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="1.2.2" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="ap-examples-java:main" external.linked.project.path="$MODULE_DIR$/../../examples/annotation-processor/java" external.root.project.path="$MODULE_DIR$/../../examples/annotation-processor/java" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="2.1.2" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/../../examples/annotation-processor/java/out/production/classes" />
     <exclude-output />
diff --git a/.idea/modules/ap-examples-java_test.iml b/.idea/modules/ap-examples-java_test.iml
index f2e40c7..da3e2a2 100644
--- a/.idea/modules/ap-examples-java_test.iml
+++ b/.idea/modules/ap-examples-java_test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="ap-examples-java:test" external.linked.project.path="$MODULE_DIR$/../../examples/annotation-processor/java" external.root.project.path="$MODULE_DIR$/../../examples/annotation-processor/java" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="1.2.2" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="ap-examples-java:test" external.linked.project.path="$MODULE_DIR$/../../examples/annotation-processor/java" external.root.project.path="$MODULE_DIR$/../../examples/annotation-processor/java" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="2.1.2" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output-test url="file://$MODULE_DIR$/../../examples/annotation-processor/java/out/test/classes" />
     <exclude-output />
diff --git a/.idea/modules/ap-examples-kotlin.iml b/.idea/modules/ap-examples-kotlin.iml
index d0bbff3..891698d 100644
--- a/.idea/modules/ap-examples-kotlin.iml
+++ b/.idea/modules/ap-examples-kotlin.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="ap-examples-kotlin" external.linked.project.path="$MODULE_DIR$/../../examples/annotation-processor/kotlin" external.root.project.path="$MODULE_DIR$/../../examples/annotation-processor/kotlin" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="1.2.2" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="ap-examples-kotlin" external.linked.project.path="$MODULE_DIR$/../../examples/annotation-processor/kotlin" external.root.project.path="$MODULE_DIR$/../../examples/annotation-processor/kotlin" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="2.1.2" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../examples/annotation-processor/kotlin">
diff --git a/.idea/modules/ap-examples-kotlin_main.iml b/.idea/modules/ap-examples-kotlin_main.iml
index d3bab85..8f0d29f 100644
--- a/.idea/modules/ap-examples-kotlin_main.iml
+++ b/.idea/modules/ap-examples-kotlin_main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="ap-examples-kotlin:main" external.linked.project.path="$MODULE_DIR$/../../examples/annotation-processor/kotlin" external.root.project.path="$MODULE_DIR$/../../examples/annotation-processor/kotlin" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="1.2.2" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="ap-examples-kotlin:main" external.linked.project.path="$MODULE_DIR$/../../examples/annotation-processor/kotlin" external.root.project.path="$MODULE_DIR$/../../examples/annotation-processor/kotlin" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="2.1.2" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
diff --git a/.idea/modules/ap-examples-kotlin_test.iml b/.idea/modules/ap-examples-kotlin_test.iml
index a1af87c..dd47cb2 100644
--- a/.idea/modules/ap-examples-kotlin_test.iml
+++ b/.idea/modules/ap-examples-kotlin_test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="ap-examples-kotlin:test" external.linked.project.path="$MODULE_DIR$/../../examples/annotation-processor/kotlin" external.root.project.path="$MODULE_DIR$/../../examples/annotation-processor/kotlin" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="1.2.2" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="ap-examples-kotlin:test" external.linked.project.path="$MODULE_DIR$/../../examples/annotation-processor/kotlin" external.root.project.path="$MODULE_DIR$/../../examples/annotation-processor/kotlin" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="2.1.2" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
diff --git a/.idea/modules/examples-java.iml b/.idea/modules/examples-java.iml
index ca09e15..0c5fd0c 100644
--- a/.idea/modules/examples-java.iml
+++ b/.idea/modules/examples-java.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="examples-java" external.linked.project.path="$MODULE_DIR$/../../examples/java" external.root.project.path="$MODULE_DIR$/../../examples/java" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="1.1.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="examples-java" external.linked.project.path="$MODULE_DIR$/../../examples/java" external.root.project.path="$MODULE_DIR$/../../examples/java" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="2.1.2" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../examples/java">
diff --git a/.idea/modules/examples-java_main.iml b/.idea/modules/examples-java_main.iml
index 2f21da8..1e29561 100644
--- a/.idea/modules/examples-java_main.iml
+++ b/.idea/modules/examples-java_main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="examples-java:main" external.linked.project.path="$MODULE_DIR$/../../examples/java" external.root.project.path="$MODULE_DIR$/../../examples/java" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="1.1.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="examples-java:main" external.linked.project.path="$MODULE_DIR$/../../examples/java" external.root.project.path="$MODULE_DIR$/../../examples/java" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="2.1.2" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/../../examples/java/out/production/classes" />
     <exclude-output />
diff --git a/.idea/modules/examples-java_test.iml b/.idea/modules/examples-java_test.iml
index 69be80a..4071a5c 100644
--- a/.idea/modules/examples-java_test.iml
+++ b/.idea/modules/examples-java_test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="examples-java:test" external.linked.project.path="$MODULE_DIR$/../../examples/java" external.root.project.path="$MODULE_DIR$/../../examples/java" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="1.1.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="examples-java:test" external.linked.project.path="$MODULE_DIR$/../../examples/java" external.root.project.path="$MODULE_DIR$/../../examples/java" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="2.1.2" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output-test url="file://$MODULE_DIR$/../../examples/java/out/test/classes" />
     <exclude-output />
@@ -11,8 +11,8 @@
     <orderEntry type="module" module-name="examples-java_main" />
     <orderEntry type="library" name="Gradle: org.junit.jupiter:junit-jupiter-api:5.2.0" level="project" />
     <orderEntry type="library" name="Gradle: org.junit.platform:junit-platform-commons:1.2.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Gradle: org.junit.jupiter:junit-jupiter-engine:5.2.0" level="project" />
     <orderEntry type="library" name="Gradle: org.apiguardian:apiguardian-api:1.0.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Gradle: org.junit.jupiter:junit-jupiter-engine:5.2.0" level="project" />
     <orderEntry type="library" name="Gradle: org.opentest4j:opentest4j:1.1.0" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: org.junit.platform:junit-platform-engine:1.2.0" level="project" />
   </component>
diff --git a/.idea/modules/examples-kotlin.iml b/.idea/modules/examples-kotlin.iml
index 2f01fe8..045b466 100644
--- a/.idea/modules/examples-kotlin.iml
+++ b/.idea/modules/examples-kotlin.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="examples-kotlin" external.linked.project.path="$MODULE_DIR$/../../examples/kotlin" external.root.project.path="$MODULE_DIR$/../../examples/kotlin" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="1.2.2" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="examples-kotlin" external.linked.project.path="$MODULE_DIR$/../../examples/kotlin" external.root.project.path="$MODULE_DIR$/../../examples/kotlin" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="2.1.2" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../examples/kotlin">
diff --git a/.idea/modules/examples-kotlin_main.iml b/.idea/modules/examples-kotlin_main.iml
index a18926c..1981825 100644
--- a/.idea/modules/examples-kotlin_main.iml
+++ b/.idea/modules/examples-kotlin_main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="examples-kotlin:main" external.linked.project.path="$MODULE_DIR$/../../examples/kotlin" external.root.project.path="$MODULE_DIR$/../../examples/kotlin" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="1.2.2" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="examples-kotlin:main" external.linked.project.path="$MODULE_DIR$/../../examples/kotlin" external.root.project.path="$MODULE_DIR$/../../examples/kotlin" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="2.1.2" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
diff --git a/.idea/modules/examples-kotlin_test.iml b/.idea/modules/examples-kotlin_test.iml
index b8e7496..48f8fae 100644
--- a/.idea/modules/examples-kotlin_test.iml
+++ b/.idea/modules/examples-kotlin_test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="examples-kotlin:test" external.linked.project.path="$MODULE_DIR$/../../examples/kotlin" external.root.project.path="$MODULE_DIR$/../../examples/kotlin" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="1.2.2" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="examples-kotlin:test" external.linked.project.path="$MODULE_DIR$/../../examples/kotlin" external.root.project.path="$MODULE_DIR$/../../examples/kotlin" external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="2.1.2" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
diff --git a/.idea/modules/semver.iml b/.idea/modules/semver.iml
index 47bac36..fac4bc2 100644
--- a/.idea/modules/semver.iml
+++ b/.idea/modules/semver.iml
@@ -1,5 +1,5 @@
 <?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="net.thauvin.erik.gradle" external.system.module.version="0.9.6-beta" 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="GRADLE" external.system.module.group="net.thauvin.erik.gradle" external.system.module.version="0.9.7-beta" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
diff --git a/.idea/modules/semver_main.iml b/.idea/modules/semver_main.iml
index fd192fe..10fd523 100644
--- a/.idea/modules/semver_main.iml
+++ b/.idea/modules/semver_main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="semver:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="net.thauvin.erik.gradle" external.system.module.type="sourceSet" external.system.module.version="0.9.6-beta" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="semver:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="net.thauvin.erik.gradle" external.system.module.type="sourceSet" external.system.module.version="0.9.7-beta" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.8" useProjectSettings="false">
@@ -39,16 +39,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/caches/4.8.1/generated-gradle-jars/gradle-kotlin-dsl-extensions-0.17.5-4.8.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/gradle/lib/kotlin-stdlib-jdk7-1.2.41.jar!/" />
+          <root url="jar://C:/gradle/lib/kotlin-stdlib-1.2.41.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -63,6 +54,44 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/kotlin-stdlib-jdk7-1.2.41.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/groovy-all-2.4.12.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/kotlin-stdlib-jdk8-1.2.41.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/gradle-kotlin-dsl-0.17.5.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://C:/gradle/src" />
+        </SOURCES>
+      </library>
+    </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -77,10 +106,12 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://C:/gradle/lib/groovy-all-2.4.12.jar!/" />
+          <root url="jar://C:/gradle/lib/gradle-kotlin-dsl-provider-spi-0.17.5.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES />
+        <SOURCES>
+          <root url="file://C:/gradle/src" />
+        </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
@@ -97,12 +128,10 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://C:/gradle/lib/gradle-kotlin-dsl-0.17.5.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/caches/4.8.1/generated-gradle-jars/gradle-kotlin-dsl-extensions-0.17.5-4.8.1.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES>
-          <root url="file://C:/gradle/src" />
-        </SOURCES>
+        <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library">
@@ -185,35 +214,6 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/gradle/lib/gradle-kotlin-dsl-provider-spi-0.17.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://C:/gradle/src" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/gradle/lib/kotlin-stdlib-1.2.41.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/gradle/lib/kotlin-stdlib-jdk8-1.2.41.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -223,7 +223,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
     <orderEntry type="module-library" scope="PROVIDED">
       <library>
         <CLASSES>
@@ -236,14 +235,12 @@
     <orderEntry type="module-library" scope="PROVIDED">
       <library>
         <CLASSES>
-          <root url="jar://C:/gradle/lib/kotlin-stdlib-jdk8-1.2.41.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/caches/4.8.1/generated-gradle-jars/gradle-kotlin-dsl-extensions-0.17.5-4.8.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.2.41" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.2.41" level="project" />
     <orderEntry type="module-library" scope="PROVIDED">
       <library>
         <CLASSES>
@@ -253,6 +250,17 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library" scope="PROVIDED">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/kotlin-stdlib-jdk8-1.2.41.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.41" level="project" />
     <orderEntry type="module-library" scope="PROVIDED">
       <library>
         <CLASSES>
@@ -272,15 +280,8 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" scope="PROVIDED">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/gradle/lib/gradle-kotlin-dsl-0.17.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.2.41" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.2.41" level="project" />
     <orderEntry type="module-library" scope="PROVIDED">
       <library>
         <CLASSES>
@@ -290,7 +291,15 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.41" level="project" />
+    <orderEntry type="module-library" scope="PROVIDED">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/gradle-kotlin-dsl-0.17.5.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -300,14 +309,5 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library" scope="PROVIDED">
-      <library>
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/caches/4.8.1/generated-gradle-jars/gradle-kotlin-dsl-extensions-0.17.5-4.8.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/semver_test.iml b/.idea/modules/semver_test.iml
index 118de71..8504f70 100644
--- a/.idea/modules/semver_test.iml
+++ b/.idea/modules/semver_test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="semver:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="net.thauvin.erik.gradle" external.system.module.type="sourceSet" external.system.module.version="0.9.6-beta" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="semver:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="net.thauvin.erik.gradle" external.system.module.type="sourceSet" external.system.module.version="0.9.7-beta" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.8" useProjectSettings="false">
@@ -36,64 +36,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/gradle/lib/kotlin-stdlib-1.2.41.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/caches/4.8.1/generated-gradle-jars/gradle-kotlin-dsl-extensions-0.17.5-4.8.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/gradle/lib/kotlin-stdlib-jdk7-1.2.41.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/gradle/lib/kotlin-stdlib-jdk8-1.2.41.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/gradle/lib/gradle-kotlin-dsl-0.17.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://C:/gradle/src" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/gradle/lib/gradle-kotlin-dsl-provider-spi-0.17.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://C:/gradle/src" />
-        </SOURCES>
-      </library>
-    </orderEntry>
+    <orderEntry type="module" module-name="semver_main" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -116,6 +59,24 @@
         </SOURCES>
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.gradle/caches/4.8.1/generated-gradle-jars/gradle-test-kit-4.8.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/kotlin-stdlib-jdk7-1.2.41.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -196,24 +157,6 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/gradle/lib/kotlin-reflect-1.2.41.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/caches/4.8.1/generated-gradle-jars/gradle-test-kit-4.8.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -223,7 +166,64 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module" module-name="semver_main" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/gradle-kotlin-dsl-provider-spi-0.17.5.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://C:/gradle/src" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/kotlin-stdlib-jdk8-1.2.41.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/kotlin-stdlib-1.2.41.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/gradle-kotlin-dsl-0.17.5.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://C:/gradle/src" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.gradle/caches/4.8.1/generated-gradle-jars/gradle-kotlin-dsl-extensions-0.17.5-4.8.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/kotlin-reflect-1.2.41.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
diff --git a/build.gradle.kts b/build.gradle.kts
index 850c0da..9681233 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
     id("io.gitlab.arturbosch.detekt") version "1.0.0.RC7"
 }
 
-version = "0.9.6-beta"
+version = "0.9.7-beta"
 group = "net.thauvin.erik.gradle"
 
 var github = "https://github.com/ethauvin/semver-gradle"
diff --git a/examples/annotation-processor/java/build.gradle b/examples/annotation-processor/java/build.gradle
index 754b50a..5658c07 100644
--- a/examples/annotation-processor/java/build.gradle
+++ b/examples/annotation-processor/java/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id 'application'
-    id "net.thauvin.erik.gradle.semver" version "0.9.6-beta"
+    id "net.thauvin.erik.gradle.semver" version "0.9.7-beta"
 }
 
 // ./gradlew
@@ -13,7 +13,7 @@ mainClassName = 'com.example.Example'
 
 defaultTasks 'run'
 
-compileJava.options.annotationProcessorGeneratedSourcesDirectory = file("${projectDir}/src/generated")
+compileJava.options.annotationProcessorGeneratedSourcesDirectory = file("${projectDir}/src/generated/java")
 
 def semverProcessor = "net.thauvin.erik:semver:1.1.0-beta"
 
diff --git a/examples/annotation-processor/java/src/generated/com/example/GeneratedVersion.java b/examples/annotation-processor/java/src/generated/java/com/example/GeneratedVersion.java
similarity index 96%
rename from examples/annotation-processor/java/src/generated/com/example/GeneratedVersion.java
rename to examples/annotation-processor/java/src/generated/java/com/example/GeneratedVersion.java
index c3895b6..24315b7 100644
--- a/examples/annotation-processor/java/src/generated/com/example/GeneratedVersion.java
+++ b/examples/annotation-processor/java/src/generated/java/com/example/GeneratedVersion.java
@@ -16,10 +16,10 @@ public final class GeneratedVersion {
     public final static String BUILDMETA_PREFIX = "+";
 
     public final static String PROJECT = "";
-    public final static Date BUILDDATE = new Date(1531013360196L);
+    public final static Date BUILDDATE = new Date(1531208748879L);
     public final static int MAJOR = 2;
     public final static int MINOR = 1;
-    public final static int PATCH = 1;
+    public final static int PATCH = 2;
     public final static String PRERELEASE = "";
     public final static String BUILDMETA = "";
 
diff --git a/examples/annotation-processor/java/version.properties b/examples/annotation-processor/java/version.properties
index 397e0f5..24cfc56 100644
--- a/examples/annotation-processor/java/version.properties
+++ b/examples/annotation-processor/java/version.properties
@@ -1,7 +1,7 @@
 #Generated by the Semver Plugin for Gradle
-#Sat Jul 07 18:29:19 PDT 2018
-version.prerelease=
+#Fri Jul 13 15:21:02 PDT 2018
 version.buildmeta=
-version.patch=1
 version.major=2
 version.minor=1
+version.patch=2
+version.prerelease=
diff --git a/examples/annotation-processor/kotlin/build.gradle.kts b/examples/annotation-processor/kotlin/build.gradle.kts
index c70b0e0..35d413f 100644
--- a/examples/annotation-processor/kotlin/build.gradle.kts
+++ b/examples/annotation-processor/kotlin/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     kotlin("jvm") version "1.2.50"
     application
     id("org.jetbrains.kotlin.kapt") version "1.2.50"
-    id("net.thauvin.erik.gradle.semver") version "0.9.6-beta"
+    id("net.thauvin.erik.gradle.semver") version "0.9.7-beta"
 }
 
 // ./gradlew
diff --git a/examples/annotation-processor/kotlin/version.properties b/examples/annotation-processor/kotlin/version.properties
index 260c02c..9b2b6f8 100644
--- a/examples/annotation-processor/kotlin/version.properties
+++ b/examples/annotation-processor/kotlin/version.properties
@@ -1,7 +1,7 @@
 #Generated by the Semver Plugin for Gradle
-#Sat Jul 07 18:29:24 PDT 2018
+#Tue Jul 10 00:48:28 PDT 2018
 version.prerelease=
 version.buildmeta=
-version.patch=1
+version.patch=4
 version.major=11
 version.minor=2
diff --git a/examples/java/build.gradle b/examples/java/build.gradle
index 41ac24d..154185d 100644
--- a/examples/java/build.gradle
+++ b/examples/java/build.gradle
@@ -1,13 +1,14 @@
 plugins {
     id 'java'
     id 'application'
-    id "net.thauvin.erik.gradle.semver" version "0.9.6-beta"
+    id "net.thauvin.erik.gradle.semver" version "0.9.7-beta"
 }
 
 // ./gradlew
 // ./gradlew incrementPatch run
 // ./gradlew incrementMinor run
 // ./gradlew incrementMajor run
+// ./gradlew incrementBuildMeta run
 
 mainClassName = 'App'
 
@@ -37,6 +38,13 @@ semver {
 //     buildMetaKey = "meta"
 }
 
+incrementBuildMeta {
+    doFirst {
+//        buildMeta = sprintf("%03d", (buildMeta as Integer) + 1)
+        buildMeta = new Date().format("yyyyMMddHHmmss")
+    }
+}
+
 run {
     doFirst {
         println "Version: $version"
diff --git a/examples/java/example.properties b/examples/java/example.properties
index d946882..5438279 100644
--- a/examples/java/example.properties
+++ b/examples/java/example.properties
@@ -1,7 +1,7 @@
 #Generated by the Semver Plugin for Gradle
 #Sun Jul 01 12:21:40 PDT 2018
 example.major=1
-example.release=beta
+example.release=alpha
 example.meta=
 example.minor=1
 example.patch=1
diff --git a/examples/java/version.properties b/examples/java/version.properties
index 00eafb7..c9ca392 100644
--- a/examples/java/version.properties
+++ b/examples/java/version.properties
@@ -1,7 +1,7 @@
 #Generated by the Semver Plugin for Gradle
-#Mon Jul 09 17:13:03 PDT 2018
-version.prerelease=
-version.buildmeta=
-version.patch=5
+#Fri Jul 13 15:27:29 PDT 2018
+version.buildmeta=20180713152249
 version.major=1
 version.minor=1
+version.patch=8
+version.prerelease=alpha
diff --git a/examples/kotlin/build.gradle.kts b/examples/kotlin/build.gradle.kts
index 2b17e7e..e9e68f5 100644
--- a/examples/kotlin/build.gradle.kts
+++ b/examples/kotlin/build.gradle.kts
@@ -1,9 +1,13 @@
 import net.thauvin.erik.gradle.semver.SemverConfig
+import net.thauvin.erik.gradle.semver.SemverIncrementBuildMetaTask
+import java.lang.String.format
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
 
 plugins {
     kotlin("jvm") version "1.2.50"
     application
-    id("net.thauvin.erik.gradle.semver") version "0.9.6-beta"
+    id("net.thauvin.erik.gradle.semver") version "0.9.7-beta"
 }
 
 // ./gradlew
@@ -38,6 +42,13 @@ tasks {
         useTestNG()
     }
 
+    val incrementBuildMeta by getting(SemverIncrementBuildMetaTask::class) {
+        doFirst {
+//            buildMeta = format("%03d", buildMeta.toInt() + 1)
+            buildMeta = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))
+        }
+    }
+
     val run by getting(JavaExec::class) {
         doFirst {
             println("Version: $version")
diff --git a/examples/kotlin/example.properties b/examples/kotlin/example.properties
index 4832c99..252c996 100644
--- a/examples/kotlin/example.properties
+++ b/examples/kotlin/example.properties
@@ -1,7 +1,7 @@
 #Generated by the Semver Plugin for Gradle
 #Sun Jul 01 20:17:52 PDT 2018
 example.major=1
-example.release=
+example.release=beta
 example.meta=
 example.minor=0
 example.patch=0
diff --git a/examples/kotlin/version.properties b/examples/kotlin/version.properties
index cd6ff2b..ebee42b 100644
--- a/examples/kotlin/version.properties
+++ b/examples/kotlin/version.properties
@@ -1,7 +1,7 @@
 #Generated by the Semver Plugin for Gradle
-#Sat Jul 07 18:29:14 PDT 2018
-version.prerelease=
-version.buildmeta=
-version.patch=1
+#Fri Jul 13 15:52:43 PDT 2018
+version.buildmeta=20180713155232
 version.major=1
 version.minor=2
+version.patch=4
+version.prerelease=beta
diff --git a/examples/test/build.gradle b/examples/test/build.gradle
index 8898cd1..bb3705f 100644
--- a/examples/test/build.gradle
+++ b/examples/test/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath "net.thauvin.erik.gradle:semver:0.9.6-beta"
+        classpath "net.thauvin.erik.gradle:semver:0.9.7-beta"
     }
 }
 
@@ -40,6 +40,13 @@ incrementPatch {
     }
 }
 
+incrementBuildMeta {
+    doFirst {
+        //buildMeta = sprintf("%03d", (buildMeta as Integer) + 1)
+        buildMeta = new Date().format("yyyyMMddHHmmss")
+    }
+}
+
 run {
     //dependsOn("incrementPatch")
     doFirst {
@@ -52,4 +59,4 @@ semver {
     properties = "$projectDir/${f.name}"
     keysPrefix = f.name.substring(0, f.name.indexOf(".") + 1)
     buildMetaKey = "meta"
-}
\ No newline at end of file
+}