Skip to content

Commit 5a5d5d0

Browse files
committed
Prepare for 1.0.0 release & remove deprecated dependency handlers
1 parent c203b26 commit 5a5d5d0

File tree

3 files changed

+5
-29
lines changed

3 files changed

+5
-29
lines changed

android-junit5/src/main/groovy/de/mannodermaus/gradle/plugins/android_junit5/AndroidJUnitPlatformExtension.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import org.junit.platform.gradle.plugin.JUnitPlatformExtension
99
*/
1010
class AndroidJUnitPlatformExtension extends JUnitPlatformExtension {
1111

12-
private static final String PLATFORM_VERSION = "1.0.0-RC3"
12+
private static final String PLATFORM_VERSION = "1.0.0"
1313

1414
AndroidJUnitPlatformExtension(Project project) {
1515
super(project)
@@ -19,10 +19,10 @@ class AndroidJUnitPlatformExtension extends JUnitPlatformExtension {
1919
/**
2020
* The version of JUnit Jupiter to use.
2121
*/
22-
String jupiterVersion = "5.0.0-RC3"
22+
String jupiterVersion = "5.0.0"
2323

2424
/**
2525
* The version of JUnit Vintage Engine to use.
2626
*/
27-
String vintageVersion = "4.12.0-RC3"
27+
String vintageVersion = "4.12.0"
2828
}

android-junit5/src/main/groovy/de/mannodermaus/gradle/plugins/android_junit5/AndroidJUnitPlatformPlugin.groovy

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,6 @@ class AndroidJUnitPlatformPlugin implements Plugin<Project> {
2121
static final String LOG_TAG = "[android-junit5]"
2222

2323
static final String EXTENSION_NAME = "junitPlatform"
24-
25-
private static String dependencyDeprecationWarning(oldName, newName) {
26-
return "AGPBI: {" +
27-
'"kind":"warning",' +
28-
'"text":' + "\"$LOG_TAG The $oldName() dependency handler is deprecated " +
29-
"and will be removed in a future release. Use $newName() instead!\"," +
30-
'"sources":[{},{}]' +
31-
'}'
32-
}
33-
34-
private static final String JUNITJUPITER_DEPENDENCY_WARNING = dependencyDeprecationWarning("junitJupiter", "junit5")
35-
private static final String JUNITPARAMS_DEPENDENCY_WARNING = dependencyDeprecationWarning("junitParams", "junit5Params")
36-
3724
/**
3825
* This method doesn't call through to super.apply().
3926
* This is intentional, and prevents clashing between our Android-specific extension
@@ -104,17 +91,6 @@ class AndroidJUnitPlatformPlugin implements Plugin<Project> {
10491
return project.dependencies.create("org.junit.jupiter:junit-jupiter-params:${jupiterVersion}")
10592
}
10693

107-
// Add deprecated dependency handlers
108-
project.dependencies.ext.junitJupiter = {
109-
project.logger.warn(JUNITJUPITER_DEPENDENCY_WARNING)
110-
return project.dependencies.ext.junit5()
111-
}
112-
113-
project.dependencies.ext.junitParams = {
114-
project.logger.warn(JUNITPARAMS_DEPENDENCY_WARNING)
115-
return project.dependencies.ext.junit5Params()
116-
}
117-
11894
project.afterEvaluate {
11995
configure(project)
12096
}

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ android.injected.build.model.only.versioned = 3
55

66
# Artifact configuration (common)
77
GROUP_ID = de.mannodermaus.gradle.plugins
8-
VERSION_NAME = 1.0.0-RC3-rev1
8+
VERSION_NAME = 1.0.0-SNAPSHOT
99
VCS_URL = https://github.com/aurae/android-junit5
1010

1111
# Artifact configuration (plugin)
@@ -25,7 +25,7 @@ BINTRAY_PLUGIN_VERSION = 1.7.3
2525
SHADOW_PLUGIN_VERSION = 2.0.1
2626

2727
# Dependency versions
28-
JUNIT_PLATFORM_VERSION = 1.0.0-RC3
28+
JUNIT_PLATFORM_VERSION = 1.0.0
2929

3030
JUNIT4_VERSION = 4.12
3131
SPOCK_VERSION = 1.0-groovy-2.4

0 commit comments

Comments
 (0)