diff --git a/.idea/modules.xml b/.idea/modules.xml
index 75b2526..4bdf5a1 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,8 +3,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/ap-examples-java.iml" filepath="$PROJECT_DIR$/.idea/modules/ap-examples-java.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/ap-examples-java_main.iml" filepath="$PROJECT_DIR$/.idea/modules/ap-examples-java_main.iml" group="ap-examples-java" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/ap-examples-java_test.iml" filepath="$PROJECT_DIR$/.idea/modules/ap-examples-java_test.iml" group="ap-examples-java" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/ap-examples-kotlin.iml" filepath="$PROJECT_DIR$/.idea/modules/ap-examples-kotlin.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/ap-examples-kotlin_main.iml" filepath="$PROJECT_DIR$/.idea/modules/ap-examples-kotlin_main.iml" group="ap-examples-kotlin" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/ap-examples-kotlin_test.iml" filepath="$PROJECT_DIR$/.idea/modules/ap-examples-kotlin_test.iml" group="ap-examples-kotlin" />
diff --git a/.idea/modules/ap-examples-java.iml b/.idea/modules/ap-examples-java.iml
index 3561fcb..4667d8e 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="2.1.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="1.2.4-beta+20180713155232" 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
deleted file mode 100644
index 4ba373d..0000000
--- a/.idea/modules/ap-examples-java_main.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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="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 />
-    <content url="file://$MODULE_DIR$/../../examples/annotation-processor/java/src/main">
-      <sourceFolder url="file://$MODULE_DIR$/../../examples/annotation-processor/java/src/main/java" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: net.thauvin.erik:semver:1.1.0-beta" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spullara.mustache.java:compiler:0.9.5" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/ap-examples-java_test.iml b/.idea/modules/ap-examples-java_test.iml
deleted file mode 100644
index da3e2a2..0000000
--- a/.idea/modules/ap-examples-java_test.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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="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 />
-    <content url="file://$MODULE_DIR$/../../examples/annotation-processor/java/src/test" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="ap-examples-java_main" />
-  </component>
-  <component name="TestModuleProperties" production-module="ap-examples-java_main" />
-</module>
\ No newline at end of file
diff --git a/.idea/modules/ap-examples-kotlin.iml b/.idea/modules/ap-examples-kotlin.iml
index 891698d..33067fd 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="2.1.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="1.2.4-beta+20180713155232" 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 8f0d29f..4558e87 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="2.1.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="1.2.4-beta+20180713155232" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
@@ -19,6 +19,7 @@
           <option name="pluginClasspaths">
             <array />
           </option>
+          <option name="coroutinesState" value="warn" />
         </compilerArguments>
       </configuration>
     </facet>
diff --git a/.idea/modules/ap-examples-kotlin_test.iml b/.idea/modules/ap-examples-kotlin_test.iml
index dd47cb2..2e17efb 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="2.1.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="1.2.4-beta+20180713155232" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
@@ -19,6 +19,7 @@
           <option name="pluginClasspaths">
             <array />
           </option>
+          <option name="coroutinesState" value="warn" />
         </compilerArguments>
       </configuration>
     </facet>
diff --git a/.idea/modules/examples-java.iml b/.idea/modules/examples-java.iml
index 0c5fd0c..6260c53 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="2.1.2" 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="1.2.4-beta+20180713155232" 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 1e29561..64bd9c4 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="2.1.2" 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="1.2.4-beta+20180713155232" 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 4071a5c..01be4f7 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="2.1.2" 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="1.2.4-beta+20180713155232" 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 />
diff --git a/.idea/modules/examples-kotlin.iml b/.idea/modules/examples-kotlin.iml
index 045b466..a1db27c 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="2.1.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="1.2.4-beta+20180713155232" 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 1981825..cf49b10 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="2.1.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="1.2.4-beta+20180713155232" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
@@ -19,6 +19,7 @@
           <option name="pluginClasspaths">
             <array />
           </option>
+          <option name="coroutinesState" value="warn" />
         </compilerArguments>
       </configuration>
     </facet>
diff --git a/.idea/modules/examples-kotlin_test.iml b/.idea/modules/examples-kotlin_test.iml
index 48f8fae..ce9500d 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="2.1.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="1.2.4-beta+20180713155232" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
@@ -11,7 +11,7 @@
           <option name="moduleName" value="examples-kotlin" />
           <option name="addCompilerBuiltIns" value="true" />
           <option name="loadBuiltInsFromDependencies" value="true" />
-          <option name="languageVersion" value="1.2" />
+          <option name="languageVersion" value="1.3" />
           <option name="apiVersion" value="1.2" />
           <option name="pluginOptions">
             <array />
@@ -19,6 +19,7 @@
           <option name="pluginClasspaths">
             <array />
           </option>
+          <option name="coroutinesState" value="warn" />
         </compilerArguments>
       </configuration>
     </facet>
diff --git a/.idea/modules/semver.iml b/.idea/modules/semver.iml
index fac4bc2..efffbeb 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.7-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.8-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 10fd523..e1f8dfb 100644
--- a/.idea/modules/semver_main.iml
+++ b/.idea/modules/semver_main.iml
@@ -1,9 +1,11 @@
 <?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.7-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.8-beta" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.8" useProjectSettings="false">
-        <compilerSettings />
+        <compilerSettings>
+          <option name="additionalArguments" value="-java-parameters -Xjsr305=strict -XXLanguage:+NewInference -XXLanguage:+SamConversionForKotlinFunctions" />
+        </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/main" />
           <option name="noStdlib" value="true" />
@@ -24,6 +26,7 @@
               <option value="$KOTLIN_BUNDLED$/lib/sam-with-receiver-compiler-plugin.jar" />
             </array>
           </option>
+          <option name="coroutinesState" value="warn" />
         </compilerArguments>
       </configuration>
     </facet>
@@ -39,52 +42,7 @@
     <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-reflect-1.2.41.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/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!/" />
+          <root url="jar://C:/gradle/lib/gradle-kotlin-dsl-1.0-rc-6.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
@@ -95,7 +53,43 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://C:/gradle/lib/gradle-installation-beacon-4.8.1.jar!/" />
+          <root url="jar://C:/gradle/lib/kotlin-stdlib-jdk8-1.2.61.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/kotlin-stdlib-jdk7-1.2.61.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/kotlin-stdlib-common-1.2.61.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/kotlin-reflect-1.2.61.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/gradle-installation-beacon-4.10.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
@@ -106,29 +100,7 @@
     <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/gradle-kotlin-dsl-tooling-models-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!/" />
+          <root url="jar://$USER_HOME$/.gradle/caches/4.10.2/generated-gradle-jars/gradle-kotlin-dsl-extensions-1.0-rc-6-4.10.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -137,7 +109,16 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/caches/4.8.1/generated-gradle-jars/gradle-api-4.8.1.jar!/" />
+          <root url="jar://C:/gradle/lib/groovy-all-2.4.15.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.gradle/caches/4.10.2/generated-gradle-jars/gradle-api-4.10.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
@@ -157,6 +138,7 @@
           <root url="file://C:/gradle/src/core-api" />
           <root url="file://C:/gradle/src/dependency-management" />
           <root url="file://C:/gradle/src/diagnostics" />
+          <root url="file://C:/gradle/src/docs" />
           <root url="file://C:/gradle/src/ear" />
           <root url="file://C:/gradle/src/ide" />
           <root url="file://C:/gradle/src/ide-native" />
@@ -208,6 +190,7 @@
           <root url="file://C:/gradle/src/testing-native" />
           <root url="file://C:/gradle/src/tooling-api" />
           <root url="file://C:/gradle/src/tooling-api-builders" />
+          <root url="file://C:/gradle/src/tooling-native" />
           <root url="file://C:/gradle/src/version-control" />
           <root url="file://C:/gradle/src/workers" />
           <root url="file://C:/gradle/src/wrapper" />
@@ -217,84 +200,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$USER_HOME$/.gradle/caches/4.8.1/generated-gradle-jars/gradle-api-4.8.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" scope="PROVIDED">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/gradle/lib/kotlin-stdlib-jdk7-1.2.41.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <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>
-    <orderEntry type="module-library" scope="PROVIDED">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/gradle/lib/kotlin-reflect-1.2.41.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <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>
-          <root url="jar://C:/gradle/lib/gradle-kotlin-dsl-provider-spi-0.17.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.41" level="project" />
-    <orderEntry type="module-library" scope="PROVIDED">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/gradle/lib/gradle-kotlin-dsl-tooling-models-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>
-          <root url="jar://C:/gradle/lib/kotlin-stdlib-1.2.41.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" scope="PROVIDED">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/gradle/lib/gradle-kotlin-dsl-0.17.5.jar!/" />
+          <root url="jar://C:/gradle/lib/kotlin-stdlib-1.2.61.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -303,7 +209,104 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://C:/gradle/lib/gradle-installation-beacon-4.8.1.jar!/" />
+          <root url="jar://C:/gradle/lib/gradle-kotlin-dsl-tooling-models-1.0-rc-6.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.10.2/generated-gradle-jars/gradle-api-4.10.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.61" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.2.61" level="project" />
+    <orderEntry type="module-library" scope="PROVIDED">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/gradle-kotlin-dsl-1.0-rc-6.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.61" level="project" />
+    <orderEntry type="module-library" scope="PROVIDED">
+      <library>
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.gradle/caches/4.10.2/generated-gradle-jars/gradle-kotlin-dsl-extensions-1.0-rc-6-4.10.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/gradle-installation-beacon-4.10.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.2.61" level="project" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/gradle-kotlin-dsl-tooling-models-1.0-rc-6.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/kotlin-reflect-1.2.61.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/kotlin-stdlib-1.2.61.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/kotlin-stdlib-common-1.2.61.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/kotlin-stdlib-jdk7-1.2.61.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/kotlin-stdlib-jdk8-1.2.61.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/.idea/modules/semver_test.iml b/.idea/modules/semver_test.iml
index 8504f70..8bcc70a 100644
--- a/.idea/modules/semver_test.iml
+++ b/.idea/modules/semver_test.iml
@@ -1,9 +1,11 @@
 <?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.7-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.8-beta" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.8" useProjectSettings="false">
-        <compilerSettings />
+        <compilerSettings>
+          <option name="additionalArguments" value="-java-parameters -Xjsr305=strict -XXLanguage:+NewInference -XXLanguage:+SamConversionForKotlinFunctions" />
+        </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/test" />
           <option name="noStdlib" value="true" />
@@ -24,6 +26,7 @@
               <option value="$KOTLIN_BUNDLED$/lib/sam-with-receiver-compiler-plugin.jar" />
             </array>
           </option>
+          <option name="coroutinesState" value="warn" />
         </compilerArguments>
       </configuration>
     </facet>
@@ -40,47 +43,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://C:/gradle/lib/gradle-installation-beacon-4.8.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://C:/gradle/src/installation-beacon" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/gradle/lib/gradle-kotlin-dsl-tooling-models-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-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>
-          <root url="jar://$USER_HOME$/.gradle/caches/4.8.1/generated-gradle-jars/gradle-api-4.8.1.jar!/" />
+          <root url="jar://$USER_HOME$/.gradle/caches/4.10.2/generated-gradle-jars/gradle-api-4.10.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
@@ -100,6 +63,7 @@
           <root url="file://C:/gradle/src/core-api" />
           <root url="file://C:/gradle/src/dependency-management" />
           <root url="file://C:/gradle/src/diagnostics" />
+          <root url="file://C:/gradle/src/docs" />
           <root url="file://C:/gradle/src/ear" />
           <root url="file://C:/gradle/src/ide" />
           <root url="file://C:/gradle/src/ide-native" />
@@ -151,6 +115,7 @@
           <root url="file://C:/gradle/src/testing-native" />
           <root url="file://C:/gradle/src/tooling-api" />
           <root url="file://C:/gradle/src/tooling-api-builders" />
+          <root url="file://C:/gradle/src/tooling-native" />
           <root url="file://C:/gradle/src/version-control" />
           <root url="file://C:/gradle/src/workers" />
           <root url="file://C:/gradle/src/wrapper" />
@@ -160,16 +125,7 @@
     <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/gradle-kotlin-dsl-provider-spi-0.17.5.jar!/" />
+          <root url="jar://C:/gradle/lib/gradle-kotlin-dsl-tooling-models-1.0-rc-6.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
@@ -180,7 +136,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://C:/gradle/lib/kotlin-stdlib-jdk8-1.2.41.jar!/" />
+          <root url="jar://C:/gradle/lib/kotlin-reflect-1.2.61.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -189,7 +145,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://C:/gradle/lib/kotlin-stdlib-1.2.41.jar!/" />
+          <root url="jar://C:/gradle/lib/kotlin-stdlib-1.2.61.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -198,7 +154,72 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://C:/gradle/lib/gradle-kotlin-dsl-0.17.5.jar!/" />
+          <root url="jar://C:/gradle/lib/kotlin-stdlib-common-1.2.61.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/groovy-all-2.4.15.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/kotlin-stdlib-jdk7-1.2.61.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/kotlin-stdlib-jdk8-1.2.61.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/gradle-installation-beacon-4.10.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://C:/gradle/src/installation-beacon" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.gradle/caches/4.10.2/generated-gradle-jars/gradle-test-kit-4.10.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$USER_HOME$/.gradle/caches/4.10.2/generated-gradle-jars/gradle-kotlin-dsl-extensions-1.0-rc-6-4.10.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/gradle-kotlin-dsl-1.0-rc-6.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
@@ -209,32 +230,16 @@
     <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!/" />
+          <root url="jar://$USER_HOME$/.gradle/caches/4.10.2/generated-gradle-jars/gradle-api-4.10.2.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>
-          <root url="jar://$USER_HOME$/.gradle/caches/4.8.1/generated-gradle-jars/gradle-api-4.8.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-test:1.2.41" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.spek:spek-api:1.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.61" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.2.61" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-test:1.2.61" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.spek:spek-api:1.2.1" level="project" />
     <orderEntry type="module-library" scope="RUNTIME">
       <library>
         <CLASSES>
@@ -244,55 +249,44 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.2.41" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-test-common:1.2.41" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Gradle: org.jetbrains.spek:spek-junit-platform-engine:1.1.5" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.61" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.2.61" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-test-common:1.2.61" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Gradle: org.jetbrains.spek:spek-junit-platform-engine:1.2.1" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Gradle: org.junit.platform:junit-platform-launcher:1.2.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.2.41" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Gradle: org.junit.platform:junit-platform-engine:1.2.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Gradle: org.junit.platform:junit-platform-commons:1.2.0" level="project" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/gradle-installation-beacon-4.10.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/gradle-kotlin-dsl-1.0-rc-6.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/gradle/lib/gradle-kotlin-dsl-tooling-models-1.0-rc-6.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.2.61" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Gradle: org.junit.platform:junit-platform-launcher:1.3.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Gradle: org.junit.platform:junit-platform-engine:1.3.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Gradle: org.junit.platform:junit-platform-commons:1.3.1" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: org.apiguardian:apiguardian-api:1.0.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Gradle: org.opentest4j:opentest4j:1.1.0" level="project" />
-    <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-jdk7:1.2.41" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.41" level="project" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/gradle/lib/gradle-installation-beacon-4.8.1.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 />
-      </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 />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://C:/gradle/lib/gradle-kotlin-dsl-tooling-models-0.17.5.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
+    <orderEntry type="library" scope="RUNTIME" name="Gradle: org.opentest4j:opentest4j:1.1.1" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="semver_main" />
 </module>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 1dd2159..9e013a1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,10 +4,10 @@ plugins {
     `kotlin-dsl`
     `java-gradle-plugin`
     `maven-publish`
-    id("com.gradle.plugin-publish") version "0.9.10"
+    id("com.gradle.plugin-publish") version "0.10.0"
     id("com.github.ben-manes.versions") version "0.20.0"
-    id("org.jlleitschuh.gradle.ktlint") version "4.1.0"
-    id("io.gitlab.arturbosch.detekt") version "1.0.0.RC7"
+    id("org.jlleitschuh.gradle.ktlint") version "6.2.1"
+    id("io.gitlab.arturbosch.detekt") version "1.0.0.RC9.2"
 }
 
 version = "0.9.8-beta"
@@ -16,7 +16,7 @@ group = "net.thauvin.erik.gradle"
 var github = "https://github.com/ethauvin/semver-gradle"
 var packageName = "net.thauvin.erik.gradle.semver"
 
-var spekVersion = "1.1.5"
+var spekVersion = "1.2.1"
 
 repositories {
     jcenter()
@@ -38,7 +38,7 @@ dependencies {
         exclude(group = "org.junit.platform")
     }
 
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.2.0") {
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.3.1") {
         because("Needed to run tests IDEs that bundle an older version")
     }
 }
@@ -62,19 +62,17 @@ tasks {
 }
 
 detekt {
-    profile("main", Action {
-        input = "src/main/kotlin"
-        filters = ".*/resources/.*,.*/build/.*"
-        output = "$buildDir/reports/detekt-reports"
-        outputName = "detekt-report"
-        baseline = "detekt-baseline.xml"
-    })
+    input = files("src/main/kotlin")
+    filters = ".*/resources/.*,.*/build/.*"
+    baseline = project.rootDir.resolve("detekt-baseline.xml")
 }
 
 gradlePlugin {
-    (plugins) {
-        project.name {
+    plugins {
+        create(project.name) {
             id = packageName
+            displayName = "SemVer Plugin"
+            description = "Semantic Version Plugin for Gradle"
             implementationClass = "$packageName.SemverPlugin"
         }
     }
@@ -83,16 +81,7 @@ gradlePlugin {
 pluginBundle {
     website = github
     vcsUrl = github
-    description = "Semantic Version Plugin for Gradle"
     tags = listOf("semver", "semantic", "version", "versioning", "auto-increment", "kotlin", "java")
-
-    (plugins) {
-        project.name {
-            id = packageName
-            displayName = project.name
-        }
-    }
-
     mavenCoordinates {
         groupId = project.group.toString()
         artifactId = project.name
diff --git a/detekt-baseline.xml b/detekt-baseline.xml
index 54c1b9d..936c64e 100644
--- a/detekt-baseline.xml
+++ b/detekt-baseline.xml
@@ -7,4 +7,4 @@
     <ID>NestedBlockDepth:SemverPlugin.kt$SemverPlugin$private fun afterEvaluate(project: Project)</ID>
     <ID>NestedBlockDepth:SemverPlugin.kt$SemverPlugin.Companion$fun saveProperties(config: SemverConfig, version: Version)</ID>
   </Whitelist>
-</SmellBaseline>
\ No newline at end of file
+</SmellBaseline>
diff --git a/examples/annotation-processor/java/version.properties b/examples/annotation-processor/java/version.properties
index 24cfc56..44899c6 100644
--- a/examples/annotation-processor/java/version.properties
+++ b/examples/annotation-processor/java/version.properties
@@ -1,5 +1,5 @@
 #Generated by the Semver Plugin for Gradle
-#Fri Jul 13 15:21:02 PDT 2018
+#Wed Oct 31 17:27:38 PDT 2018
 version.buildmeta=
 version.major=2
 version.minor=1
diff --git a/examples/kotlin/version.properties b/examples/kotlin/version.properties
index ebee42b..0a420d2 100644
--- a/examples/kotlin/version.properties
+++ b/examples/kotlin/version.properties
@@ -1,5 +1,5 @@
 #Generated by the Semver Plugin for Gradle
-#Fri Jul 13 15:52:43 PDT 2018
+#Wed Oct 31 17:32:51 PDT 2018
 version.buildmeta=20180713155232
 version.major=1
 version.minor=2
diff --git a/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverPlugin.kt b/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverPlugin.kt
index 987d122..a16c30d 100644
--- a/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverPlugin.kt
+++ b/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverPlugin.kt
@@ -82,11 +82,11 @@ class SemverPlugin : Plugin<Project> {
         }
     }
 
-    override fun apply(project: Project?) {
+    override fun apply(project: Project) {
         if (GradleVersion.current() < GradleVersion.version("4.8.1")) {
             throw GradleException("The $simpleName plugin requires Gradle version 4.8.1 or greater.")
         }
-        project!!.afterEvaluate(this::afterEvaluate)
+        project.afterEvaluate(this::afterEvaluate)
         config = project.extensions.create("semver", SemverConfig::class.java)
 
         project.tasks.apply {