Skip to content

Commit 9448f64

Browse files
author
Marcel Schnelle
authored
Update to JUnit 5.3.0 (#120)
* Gradle 4.10.2 & dependency updates * Update Kotlin integration with explicit compiler dependency
1 parent 6eb0419 commit 9448f64

File tree

7 files changed

+55
-33
lines changed

7 files changed

+55
-33
lines changed

.idea/runConfigurations/Plugin__Run_Unit_Tests__All_.xml

Lines changed: 25 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/Plugin__Run_Unit_Tests.xml renamed to .idea/runConfigurations/Plugin__Run_Unit_Tests__No_Functional_.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/Sample__Run_Unit_Tests__IDE_.xml

Lines changed: 1 addition & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

android-junit5-tests/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ dependencies {
8686
functionalTest "org.junit.jupiter:junit-jupiter-api:$JUNIT_JUPITER_VERSION"
8787
functionalTest "org.junit.jupiter:junit-jupiter-engine:$JUNIT_JUPITER_VERSION"
8888
functionalTest "org.junit.platform:junit-platform-console:$JUNIT_PLATFORM_VERSION"
89+
functionalTest "org.jetbrains.kotlin:kotlin-compiler-embeddable:$KOTLIN_VERSION"
8990
}
9091

9192
// Resource Writers

android-junit5-tests/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/FunctionalTests.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,12 @@ class FunctionalTests {
404404
test.java.srcDir "src/test/kotlin"
405405
}
406406
}
407+
408+
dependencies {
409+
// Required since Kotlin 1.2.60;
410+
// will fail with "can't find kotlin-compiler-embeddable" if not overwritten
411+
kotlinCompilerClasspath files(${ClasspathSplitter.splitClasspath(testCompileClasspath)})
412+
}
407413
""")
408414
}
409415

gradle.properties

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ GITHUB_REPO = mannodermaus/android-junit5
66
LICENSE_NAME = Apache-2.0
77

88
# Artifact configuration (plugin)
9-
PLUGIN_GROUP_ID = de.mannodermaus.gradle.plugins
10-
PLUGIN_ARTIFACT_ID = android-junit5
11-
PLUGIN_DESCRIPTION = Unit Testing with JUnit 5 for Android.
12-
PLUGIN_VERSION_NAME = 1.2.0.1-SNAPSHOT
13-
PLUGIN_VERSION_NAME_LATEST_STABLE = 1.2.0.0
9+
PLUGIN_GROUP_ID = de.mannodermaus.gradle.plugins
10+
PLUGIN_ARTIFACT_ID = android-junit5
11+
PLUGIN_DESCRIPTION = Unit Testing with JUnit 5 for Android.
12+
PLUGIN_VERSION_NAME = 1.3.0.0-SNAPSHOT
13+
PLUGIN_VERSION_NAME_LATEST_STABLE = 1.2.0.0
1414

1515
# Artifact configuration (instrumentation & runner)
1616
INSTRUMENTATION_GROUP_ID = de.mannodermaus.junit5
@@ -24,16 +24,16 @@ INSTRUMENTATION_MIN_SDK_VERSION = 26
2424
INSTRUMENTATION_RUNNER_MIN_SDK_VERSION = 14
2525

2626
# Dependency versions (plugins)
27-
ANDROID_PLUGIN_VERSION = 3.2.0-beta04
28-
BINTRAY_PLUGIN_VERSION = 1.8.2
27+
ANDROID_PLUGIN_VERSION = 3.2.1
28+
BINTRAY_PLUGIN_VERSION = 1.8.4
2929
SHADOW_PLUGIN_VERSION = 2.0.4
30-
VERSIONS_PLUGIN_VERSION = 0.19.0
31-
ANDROID_MAVEN_PLUGIN_VERSION = 3.6.0
30+
VERSIONS_PLUGIN_VERSION = 0.20.0
31+
ANDROID_MAVEN_PLUGIN_VERSION = 3.6.2
3232
DCENDENTS_MAVEN_PLUGIN_VERSION = 2.1
3333

3434
# Dependency versions (languages)
35-
GROOVY_VERSION = 3.0.0-alpha-2
36-
KOTLIN_VERSION = 1.2.51
35+
GROOVY_VERSION = 3.0.0-alpha-3
36+
KOTLIN_VERSION = 1.2.71
3737

3838
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
3939
# A Note to my forgetful self:
@@ -43,25 +43,25 @@ KOTLIN_VERSION = 1.2.51
4343
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
4444
# Android Environment (common)
4545
COMPILE_SDK_VERSION = android-28
46-
BUILD_TOOLS_VERSION = 27.0.3
46+
BUILD_TOOLS_VERSION = 28.0.3
4747
TARGET_SDK_VERSION = 28
4848
JAVA_MAX_HEAP_SIZE = 3g
4949

5050
# Android Environment (sample)
5151
SAMPLE_MIN_SDK_VERSION = 14
5252

5353
# Dependency versions
54-
STREAMS_BACKPORT_VERSION = 1.2.0
54+
STREAMS_BACKPORT_VERSION = 1.2.1
5555
JAVA_SEMVER_VERSION = 0.9.0
56-
JUNIT_PLATFORM_VERSION = 1.2.0
57-
JUNIT_JUPITER_VERSION = 5.2.0
58-
JUNIT_VINTAGE_VERSION = 5.2.0
56+
JUNIT_PLATFORM_VERSION = 1.3.0
57+
JUNIT_JUPITER_VERSION = 5.3.0
58+
JUNIT_VINTAGE_VERSION = 5.3.0
5959
JUNIT4_VERSION = 4.12
60-
JUNIT_PIONEER_VERSION = 0.1.2
61-
SPEK_VERSION = 1.1.5
60+
JUNIT_PIONEER_VERSION = 0.2.2
61+
SPEK_VERSION = 1.2.1
6262
APACHE_COMMONS_VERSION = 2.6
6363
SUPPORT_TEST_LIBRARY_VERSION = 1.0.2
64-
ASSERTJ_VERSION = 3.8.0
64+
ASSERTJ_VERSION = 3.11.1
6565
ASSERTJ_ANDROID_VERSION = 1.2.0
6666
MOCKITO_VERSION = 2.19.0
6767
ESPRESSO_VERSION = 3.0.1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)