Updated to Milestone M4 (#5)

* Updated Gradle wrapper to 3.5 * Prepare M4 versions
mannodermaus · May 3, 2017 · a168d73 · a168d73
1 parent 848c8de
commit a168d73
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ buildscript {
     }
     dependencies {
         // 2. Add the plugin as a classpath dependency
-        classpath "de.mannodermaus.gradle.plugins:android-junit5:1.0.0-M3"
+        classpath "de.mannodermaus.gradle.plugins:android-junit5:1.0.0-M4"
     }
 }
 
@@ -22,6 +22,9 @@ apply plugin: "de.mannodermaus.android-junit5"
 dependencies {
     // 4. Add the testCompile dependencies on JUnit Jupiter
     testCompile junitJupiter()
+
+    // 5. (Optional) Add the testCompile dependency on the JUnit Vintage Engine
+    testCompile junitVintage()
 }
 ```
 
@@ -36,8 +39,10 @@ However, there are some additional properties that you can apply:
 
 ```groovy
 junitPlatform {
-    // The JUnit Jupiter dependency version to use; "5.+" by default
-    jupiterVersion "5.0.0-M3"
+    // The JUnit Jupiter dependency version to use; "5.0.0-M4" by default
+    jupiterVersion "5.0.0-M4"
+    // The JUnit Vintage Engine dependency version to use; "4.12.0-M4" by default
+    vintageVersion "4.12.0-M4"
 }
 ```
 

diff --git a/...-junit5/src/main/groovy/de/mannodermaus/gradle/anj5/AndroidJUnit5PlatformExtension.groovy b/...-junit5/src/main/groovy/de/mannodermaus/gradle/anj5/AndroidJUnit5PlatformExtension.groovy
@@ -16,14 +16,14 @@ class AndroidJUnit5PlatformExtension extends JUnitPlatformExtension {
     /**
      * The version of JUnit Jupiter to use.
      *
-     * Defaults to {@code '5.+'}.
+     * Defaults to {@code '5.0.0-M4'}.
      */
-    String jupiterVersion = '5.+'
+    String jupiterVersion = '5.0.0-M4'
 
     /**
      * The version of JUnit Vintage Engine to use.
      *
-     * Defaults to {@code '4.12.+}.
+     * Defaults to {@code '4.12.0-M4'}.
      */
-    String vintageVersion = '4.12.+'
+    String vintageVersion = '4.12.0-M4'
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 # Artifact configuration
 GROUP_ID=de.mannodermaus.gradle.plugins
 ARTIFACT_ID=android-junit5
-VERSION_NAME=1.0.0-M3
+VERSION_NAME=1.0.0-M4
 DESCRIPTION=Unit Testing with JUnit 5 for Android.
 VCS_URL=https://github.com/aurae/android-junit5
 
@@ -10,6 +10,6 @@ ANDROID_PLUGIN_VERSION=2.3.0
 BINTRAY_PLUGIN_VERSION=1.3.1
 
 # Dependency versions
-JUNIT_PLATFORM_VERSION=1.0.0-M3
+JUNIT_PLATFORM_VERSION=1.0.0-M4
 SPOCK_VERSION=1.0-groovy-2.4
 JUNIT4_VERSION=4.12
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Feb 21 12:14:36 CET 2017
+#Wed May 03 18:52:32 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip