--- a/buildSrc/build.gradle.kts	Tue Mar 03 20:27:18 2020 -0400
+++ b/buildSrc/build.gradle.kts	Tue Mar 03 20:51:57 2020 -0400
@@ -43,9 +43,9 @@
 dependencies {
     // 3.5.0 and above make connectedTest in feature modules fails with a ResourceNotFoundException
     // from resources from the base app module
-    implementation("com.android.tools.build:gradle:3.4.2")
+    implementation("com.android.tools.build:gradle:4.0.0-beta01")
     implementation("com.genymotion:plugin:1.4.2")
     implementation("gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0")
     // 2.3.0 requires AGP 3.5.0, wait for fix before upgrade
-    implementation("com.github.triplet.gradle:play-publisher:2.2.1")
+    implementation("com.github.triplet.gradle:play-publisher:2.7.2")
 }

--- a/buildSrc/src/main/kotlin/AndroidPlayStorePublisher.kt	Tue Mar 03 20:27:18 2020 -0400
+++ b/buildSrc/src/main/kotlin/AndroidPlayStorePublisher.kt	Tue Mar 03 20:51:57 2020 -0400
@@ -22,7 +22,6 @@
 
 import com.android.build.gradle.AppExtension
 import com.github.triplet.gradle.play.PlayPublisherExtension
-import com.github.triplet.gradle.play.PlayPublisherPlugin
 import org.gradle.api.NamedDomainObjectContainer
 import org.gradle.api.Project
 import org.gradle.api.plugins.ExtensionAware
@@ -43,7 +42,7 @@
 // PLAY_STORE_FROM_TRACK: track from which to promote a build, default to internal but can be set to alpha, beta or production
 
 internal fun Project.configureAndroidPlayStorePublisher(): Unit {
-    apply<PlayPublisherPlugin>()
+    apply(plugin = "com.github.triplet.play")
     configure<PlayPublisherExtension> {
         defaultToAppBundles = true
         track = properties.getOrDefault("PLAY_STORE_TRACK", "internal") as String

--- a/buildSrc/src/main/kotlin/AndroidTests.kt	Tue Mar 03 20:27:18 2020 -0400
+++ b/buildSrc/src/main/kotlin/AndroidTests.kt	Tue Mar 03 20:51:57 2020 -0400
@@ -85,10 +85,21 @@
         dualTestImplementation("androidx.test.ext:truth:1.3.0-alpha01")
 
         // mock
-        testImplementation("io.mockk:mockk:1.9")
-        androidTestImplementation("io.mockk:mockk-android:1.9")
+        testImplementation("io.mockk:mockk:1.9.3")
+        androidTestImplementation("io.mockk:mockk-android:1.9.3")
         testImplementation("org.robolectric:robolectric:$robolectricVersion")
 
+        constraints {
+            dualTestImplementation(kotlin("reflect")) {
+                because("Use the kotlin version that we use")
+            }
+            androidTestImplementation("org.objenesis:objenesis") {
+                because("3.x version use instructions only available with minSdk 26 (Android O)")
+                version {
+                    strictly("2.6")
+                }
+            }
+        }
     }
 }
 
@@ -106,6 +117,10 @@
 internal fun DependencyHandler.androidTestImplementation(dependencyNotation: Any): Dependency? =
     add("androidTestImplementation", dependencyNotation)
 
+internal fun DependencyHandler.androidTestImplementation(dependencyNotation: Any, action: ExternalModuleDependency.() -> Unit) {
+    val closure = closureOf(action)
+    add("androidTestImplementation", dependencyNotation, closure)
+}
 
 internal fun DependencyHandler.androidTestUtil(dependencyNotation: Any): Dependency? =
     add("androidTestUtil", dependencyNotation)

--- a/gradle.properties	Tue Mar 03 20:27:18 2020 -0400
+++ b/gradle.properties	Tue Mar 03 20:51:57 2020 -0400
@@ -14,9 +14,6 @@
 android.useAndroidX=true
 android.enableJetifier=true
 
-# use binary resources in jvm tests for robolectric
-android.enableUnitTestBinaryResources=true
-
 # plugin dependencies version
 kotlinVersion=1.3.70
 androidxNavigationVersion=2.1.0