Updated Gradle dependencies in general.

Prepared release 2.1.0.
Exposed `AndroidJUnitXRunner#getTestDescriptionFromBundle` as `public`.

Author: Piotr Zawadzki

.editorconfig

@@ -0,0 +1,3 @@
+[*.{kt,kts}]
+insert_final_newline=true
+disabled_rules=import-ordering

CHANGELOG.md

@@ -4,13 +4,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [2.1.0]
+### Changed
+- Updated dependencies to Android Test Runner 1.2.0 & Kotlin 1.3.41. Updated other dependencies as well.
+- Exposed `AndroidJUnitXRunner#getTestDescriptionFromBundle` as `public`.
+
 ## [2.0.0]
 ### Changed
-Migrated to AndroidX and Android Test Runner 1.1.0
+- Migrated to AndroidX and Android Test Runner 1.1.0
 
 ## [1.0.0]
 ### Added
-Initial release of the library.
+- Initial release of the library.
 
+[2.1.0]: https://github.com/stepstone-tech/AndroidTestXRunner/compare/2.0.0...2.1.0
 [2.0.0]: https://github.com/stepstone-tech/AndroidTestXRunner/compare/1.0.0...2.0.0
 [1.0.0]: https://github.com/stepstone-tech/AndroidTestXRunner/tree/1.0.0

README.md

@@ -15,7 +15,7 @@ It heavily depends on [Android Test Orchestrator](https://medium.com/stepstone-t
 ### 1. Add a Gradle dependency in your `build.gradle`
 
 ```groovy
-implementation 'com.stepstone.xrunner:xrunner-library:2.0.0'
+implementation 'com.stepstone.xrunner:xrunner-library:2.1.0'
 ```
 
 *NOTE:* not on AndroidX yet? See *Compatibility* section at the bottom.
@@ -46,7 +46,7 @@ android {
 }
     
 dependencies {
-    androidTestUtil 'androidx.test:orchestrator:1.1.0'
+    androidTestUtil 'androidx.test:orchestrator:1.2.0'
 }
 ```
 
@@ -85,5 +85,6 @@ Here are some samples:
 
 | XRunner version                                                          | Test runner version                     |
 |:------------------------------------------------------------------------:|:---------------------------------------:|
+| [2.1.0](https://github.com/stepstone-tech/AndroidTestXRunner/tree/2.1.0) | `androidx.test:runner:1.2.0`            |
 | [2.0.0](https://github.com/stepstone-tech/AndroidTestXRunner/tree/2.0.0) | `androidx.test:runner:1.1.0`            |
 | [1.0.0](https://github.com/stepstone-tech/AndroidTestXRunner/tree/1.0.0) | `com.android.support.test:runner:1.0.2` |

build.gradle

@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.KOTLIN_VERSION = '1.2.71'
-    ext.ANDROID_GRADLE_PLUGIN_VERSION = '3.2.1'
+    ext.KOTLIN_VERSION = '1.3.41'
+    ext.ANDROID_GRADLE_PLUGIN_VERSION = '3.5.0'
     ext.DOKKA_VERSION = '0.9.17'
     ext.BINTRAY_VERSION = '1.7.3'
     repositories {
@@ -33,16 +33,16 @@ configure(allprojects) {
         ANDROID_TARGET_SDK_VERSION          = 28
         ANDROID_COMPILE_SDK_VERSION         = 28
 
-        TEST_RUNNER_VERSION                 = '1.1.0'
+        TEST_RUNNER_VERSION                 = '1.2.0'
         SUPER_REFLEKT_VERSION               = '1.0.1'
 
         // Sample app only
-        TEST_RULES_VERSION                  = '1.1.0'
-        TEST_EXT_VERSION                    = '1.0.0'
-        TEST_ORCHESTRATOR_VERSION           = '1.1.0'
-        ESPRESSO_VERSION                    = '3.1.0'
-        APPCOMPAT_VERSION                   = '1.0.2'
-        MATERIAL_VERSION                    = '1.1.0-alpha01'
+        TEST_RULES_VERSION                  = '1.2.0'
+        TEST_EXT_VERSION                    = '1.1.1'
+        TEST_ORCHESTRATOR_VERSION           = '1.2.0'
+        ESPRESSO_VERSION                    = '3.2.0'
+        APPCOMPAT_VERSION                   = '1.1.0'
+        MATERIAL_VERSION                    = '1.1.0-alpha10'
         CONSTRAINT_VERSION                  = '1.1.3'
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

ktlint.gradle

@@ -12,7 +12,7 @@ configurations {
 }
 
 dependencies {
-    ktlint "com.github.shyiko:ktlint:0.24.0"
+    ktlint "com.pinterest:ktlint:0.34.2"
     // additional 3rd party ruleset(s) can be specified here
     // just add them to the classpath (e.g. ktlint 'groupId:artifactId:version') and
     // ktlint will pick them up
@@ -21,15 +21,15 @@ dependencies {
 task ktlint(type: JavaExec, group: "verification") {
     description = "Check Kotlin code style."
     classpath = configurations.ktlint
-    main = "com.github.shyiko.ktlint.Main"
-    args "src/**/*.kt", "--reporter=plain", "--reporter=checkstyle,output=${buildDir}/reports/ktlint.xml"
+    main = "com.pinterest.ktlint.Main"
+    args "src/**/*.kt", "--reporter=plain", "--disabled_rules=import-ordering", "--reporter=checkstyle,output=${buildDir}/reports/ktlint.xml"
     standardOutput = System.err
 
 }
 
 task ktlintFormat(type: JavaExec, group: "formatting") {
     description = "Fix Kotlin code style deviations."
     classpath = configurations.ktlint
-    main = "com.github.shyiko.ktlint.Main"
-    args "-F", "src/**/*.kt"
+    main = "com.pinterest.ktlint.Main"
+    args "-F", "src/**/*.kt", "--disabled_rules=import-ordering"
 }

verification.sh

@@ -37,4 +37,5 @@ echo "Test package run OK!"
 verifyJUnitReport 15 3 3
 echo "Test package with exclusions run OK!"
 
-./gradlew clean assembleRelease publishToMavenLocal
+./gradlew clean assembleRelease
+./gradlew publishToMavenLocal

xrunner-library/build.gradle

@@ -67,7 +67,7 @@ ext {
     siteUrl = 'https://github.com/stepstone-tech/AndroidTestXRunner'
     gitUrl = 'https://github.com/stepstone-tech/AndroidTestXRunner.git'
 
-    libraryVersion = '2.0.0'
+    libraryVersion = '2.1.0'
 
     licenseName = 'The Apache Software License, Version 2.0'
     licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'

xrunner-library/src/main/java/com/stepstone/xrunner/AndroidJUnitXRunner.kt

@@ -72,6 +72,19 @@ open class AndroidJUnitXRunner : AndroidJUnitRunner() {
         super.onStart()
     }
 
+    fun getTestDescriptionFromBundle(bundle: Bundle): Description {
+        val runnerArgs = getRunnerArgsWithReflection()
+        val builder: TestRequestBuilder = SuperReflect.on(this).call(RUNNER_METHOD_CREATE_TEST_REQUEST_BUILDER, this, bundle).get()
+        builder.addPathsToScan(runnerArgs.classpathToScan)
+        if (runnerArgs.classpathToScan.isEmpty()) {
+            builder.addPathToScan(context.packageCodePath)
+        }
+        builder.addFromRunnerArgs(runnerArgs)
+        val request = builder.build()
+        return request.runner.description
+    }
+
+    @Suppress("DEPRECATION")
     private fun isPrimaryInstrumentationProcess(): Boolean = isPrimaryInstrProcess(originalBundle.getString(ARGUMENT_TARGET_PROCESS))
 
     private fun addXRunnerTestsWithOrchestrator(runCount: Int, bundle: Bundle, orchestratorListener: OrchestratedInstrumentationListener) {
@@ -110,18 +123,6 @@ open class AndroidJUnitXRunner : AndroidJUnitRunner() {
         SuperReflect.on(this).set(RUNNER_FIELD_ORCHESTRATOR_LISTENER, null)
     }
 
-    private fun getTestDescriptionFromBundle(bundle: Bundle): Description {
-        val runnerArgs = getRunnerArgsWithReflection()
-        val builder: TestRequestBuilder = SuperReflect.on(this).call(RUNNER_METHOD_CREATE_TEST_REQUEST_BUILDER, this, bundle).get()
-        builder.addPathsToScan(runnerArgs.classpathToScan)
-        if (runnerArgs.classpathToScan.isEmpty()) {
-            builder.addPathToScan(context.packageCodePath)
-        }
-        builder.addFromRunnerArgs(runnerArgs)
-        val request = builder.build()
-        return request.runner.description
-    }
-
     private fun getRunnerArgsWithReflection() = SuperReflect.on(this).get<RunnerArgs>(RUNNER_FIELD_RUNNER_ARGS)
 
     private fun Bundle.setTestArgumentsForXRunnerTestList() {

xrunner-library/src/main/java/com/stepstone/xrunner/internal/TestArgument.kt

@@ -31,7 +31,7 @@ fun parseTestClass(name: String?): TestArgument? {
     if (name.isNullOrEmpty()) {
         return null
     }
-    val methodSeparatorIndex = name!!.indexOf(METHOD_SEPARATOR)
+    val methodSeparatorIndex = name.indexOf(METHOD_SEPARATOR)
     return if (methodSeparatorIndex > 0) {
         val testMethodName = name.substring(methodSeparatorIndex + 1)
         val testClassName = name.substring(0, methodSeparatorIndex)