Prepare for 1.0.0 release & remove deprecated dependency handlers

mannodermaus · Sep 10, 2017 · 5a5d5d0 · 5a5d5d0
1 parent c203b26
commit 5a5d5d0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 29 deletions.
diff --git a/...groovy/de/mannodermaus/gradle/plugins/android_junit5/AndroidJUnitPlatformExtension.groovy b/...groovy/de/mannodermaus/gradle/plugins/android_junit5/AndroidJUnitPlatformExtension.groovy
@@ -9,7 +9,7 @@ import org.junit.platform.gradle.plugin.JUnitPlatformExtension
  */
 class AndroidJUnitPlatformExtension extends JUnitPlatformExtension {
 
-    private static final String PLATFORM_VERSION = "1.0.0-RC3"
+    private static final String PLATFORM_VERSION = "1.0.0"
 
     AndroidJUnitPlatformExtension(Project project) {
         super(project)
@@ -19,10 +19,10 @@ class AndroidJUnitPlatformExtension extends JUnitPlatformExtension {
     /**
      * The version of JUnit Jupiter to use.
      */
-    String jupiterVersion = "5.0.0-RC3"
+    String jupiterVersion = "5.0.0"
 
     /**
      * The version of JUnit Vintage Engine to use.
      */
-    String vintageVersion = "4.12.0-RC3"
+    String vintageVersion = "4.12.0"
 }
diff --git a/...in/groovy/de/mannodermaus/gradle/plugins/android_junit5/AndroidJUnitPlatformPlugin.groovy b/...in/groovy/de/mannodermaus/gradle/plugins/android_junit5/AndroidJUnitPlatformPlugin.groovy
@@ -21,19 +21,6 @@ class AndroidJUnitPlatformPlugin implements Plugin<Project> {
     static final String LOG_TAG = "[android-junit5]"
 
     static final String EXTENSION_NAME = "junitPlatform"
-
-    private static String dependencyDeprecationWarning(oldName, newName) {
-        return "AGPBI: {" +
-                '"kind":"warning",' +
-                '"text":' + "\"$LOG_TAG The $oldName() dependency handler is deprecated " +
-                "and will be removed in a future release. Use $newName() instead!\"," +
-                '"sources":[{},{}]' +
-                '}'
-    }
-
-    private static final String JUNITJUPITER_DEPENDENCY_WARNING = dependencyDeprecationWarning("junitJupiter", "junit5")
-    private static final String JUNITPARAMS_DEPENDENCY_WARNING = dependencyDeprecationWarning("junitParams", "junit5Params")
-
     /**
      * This method doesn't call through to super.apply().
      * This is intentional, and prevents clashing between our Android-specific extension
@@ -104,17 +91,6 @@ class AndroidJUnitPlatformPlugin implements Plugin<Project> {
             return project.dependencies.create("org.junit.jupiter:junit-jupiter-params:${jupiterVersion}")
         }
 
-        // Add deprecated dependency handlers
-        project.dependencies.ext.junitJupiter = {
-            project.logger.warn(JUNITJUPITER_DEPENDENCY_WARNING)
-            return project.dependencies.ext.junit5()
-        }
-
-        project.dependencies.ext.junitParams = {
-            project.logger.warn(JUNITPARAMS_DEPENDENCY_WARNING)
-            return project.dependencies.ext.junit5Params()
-        }
-
         project.afterEvaluate {
             configure(project)
         }

diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ android.injected.build.model.only.versioned = 3
 
 # Artifact configuration (common)
 GROUP_ID                                    = de.mannodermaus.gradle.plugins
-VERSION_NAME                                = 1.0.0-RC3-rev1
+VERSION_NAME                                = 1.0.0-SNAPSHOT
 VCS_URL                                     = https://github.com/aurae/android-junit5
 
 # Artifact configuration (plugin)
@@ -25,7 +25,7 @@ BINTRAY_PLUGIN_VERSION                      = 1.7.3
 SHADOW_PLUGIN_VERSION                       = 2.0.1
 
 # Dependency versions
-JUNIT_PLATFORM_VERSION                      = 1.0.0-RC3
+JUNIT_PLATFORM_VERSION                      = 1.0.0
 
 JUNIT4_VERSION                              = 4.12
 SPOCK_VERSION                               = 1.0-groovy-2.4