From 44350ba36cf343591d4f08b14b600bbd351bf182 Mon Sep 17 00:00:00 2001
From: artyomcool <artyomcool@yandex-team.ru>
Date: Wed, 24 Oct 2018 10:54:37 +0300
Subject: [PATCH 1/2] Ability to add test listener

---
 src/main/kotlin/com/jaredsburrows/spoon/SpoonExtension.kt | 5 ++++-
 src/main/kotlin/com/jaredsburrows/spoon/SpoonTask.kt      | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/kotlin/com/jaredsburrows/spoon/SpoonExtension.kt b/src/main/kotlin/com/jaredsburrows/spoon/SpoonExtension.kt
index e1e6a6d..1ab781b 100644
--- a/src/main/kotlin/com/jaredsburrows/spoon/SpoonExtension.kt
+++ b/src/main/kotlin/com/jaredsburrows/spoon/SpoonExtension.kt
@@ -1,5 +1,7 @@
 package com.jaredsburrows.spoon
 
+import com.android.ddmlib.testrunner.ITestRunListener
+
 /**
  * Variables based on the following documentation:
  * - https://developer.android.com/reference/android/support/test/runner/AndroidJUnitRunner.html
@@ -78,7 +80,8 @@ open class SpoonExtension { // Extensions cannot be final
   /** Toggle sharding. (false by default) */
   var shard: Boolean = false
 
-  // TODO testRunListener
+  /** Add listener for tests execution */
+  var testRunListener: ITestRunListener? = null
 
   // TODO terminateAdb
 
diff --git a/src/main/kotlin/com/jaredsburrows/spoon/SpoonTask.kt b/src/main/kotlin/com/jaredsburrows/spoon/SpoonTask.kt
index 56b4f29..d15778f 100644
--- a/src/main/kotlin/com/jaredsburrows/spoon/SpoonTask.kt
+++ b/src/main/kotlin/com/jaredsburrows/spoon/SpoonTask.kt
@@ -55,6 +55,10 @@ open class SpoonTask : DefaultTask() {
       .setSingleInstrumentationCall(extension.singleInstrumentationCall)
       .setClearAppDataBeforeEachTest(extension.clearAppDataBeforeEachTest)
 
+    if (extension.testRunListener != null) {
+      builder.addTestRunListener(extension.testRunListener)
+    }
+
     // APKs
     if (!testing) {
       builder.setTestApk(instrumentationApk)

From 3f683cb96b5c8c9c6fa4fa9fdb29ee007a490470 Mon Sep 17 00:00:00 2001
From: artyomcool <artyomcool@yandex-team.ru>
Date: Tue, 27 Nov 2018 18:31:52 +0300
Subject: [PATCH 2/2] Ability to restart tests

---
 build.gradle               | 5 ++---
 gradle.properties          | 2 +-
 gradle/dependencies.gradle | 3 +--
 test-app/build.gradle      | 2 --
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 96d875d..4018cbe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,9 +12,9 @@ plugins {
 }
 
 repositories {
-  jcenter()
+  mavenLocal()
   google()
-  maven { url "https://oss.sonatype.org/content/repositories/snapshots" } // For Spoon snapshot, until 2.0.0 is released
+  jcenter()
 }
 
 apply from: "gradle/dependencies.gradle"
@@ -58,7 +58,6 @@ dependencies {
   implementation deps.kotlinReflect
   implementation deps.gradle
   implementation deps.spoonRunner
-  implementation deps.ddmlib
 
   testImplementation localGroovy()
   testImplementation deps.spockCore, { exclude module: "groovy-all" } // Use localGroovy()
diff --git a/gradle.properties b/gradle.properties
index 79a93f4..08acc3e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 GROUP=com.jaredsburrows
-VERSION_NAME=1.4.1-SNAPSHOT
+VERSION_NAME=1.4.1-SNAPSHOT-fork-1.0.0
 
 POM_NAME=Gradle Spoon Plugin
 POM_ARTIFACT_ID=gradle-spoon-plugin
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 6aa3050..8edd737 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -5,7 +5,7 @@ ext {
   minSdkVersion = 19
   targetSdkVersion = 28
   compileSdkVersion = 28
-  spoonVersion = "2.0.0-SNAPSHOT"
+  spoonVersion = "2.0.0-SNAPSHOT-fork-1.0.0"
   jacocoVersion = "0.7.4.201502262128"
 }
 
@@ -18,7 +18,6 @@ ext.deps = [
   "kotlinStdlib"      : "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion",
   "kotlinReflect"     : "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion",
   "spoonRunner"       : "com.squareup.spoon:spoon-runner:$spoonVersion",
-  "ddmlib"            : "com.android.tools.ddms:ddmlib:26.0.0",
 
   // testImplementation
   "junit"             : "junit:junit:4.12",
diff --git a/test-app/build.gradle b/test-app/build.gradle
index a6ecbf8..f0265be 100644
--- a/test-app/build.gradle
+++ b/test-app/build.gradle
@@ -4,7 +4,6 @@ buildscript {
   repositories {
     mavenLocal()
     google()
-    maven { url "https://oss.sonatype.org/content/repositories/snapshots" } // For Spoon snapshot, until 2.0.0 is released
     jcenter()
   }
 
@@ -17,7 +16,6 @@ buildscript {
 
 repositories {
   google()
-  maven { url "https://oss.sonatype.org/content/repositories/snapshots" } // For Spoon snapshot, until 2.0.0 is released
   jcenter()
 }