From d309af5c4251bdc30fec4e05988618b943388a1b Mon Sep 17 00:00:00 2001 From: Ranie Jade Ramiso Date: Sun, 8 Dec 2019 23:12:28 +1100 Subject: [PATCH] Update samples to 2.0.9 candidate (#833) --- samples/android/app/build.gradle | 3 ++- samples/android/build.gradle | 2 +- samples/android/gradle.properties | 4 ++-- samples/android/gradle/wrapper/gradle-wrapper.properties | 4 ++-- samples/jvm/build.gradle | 2 +- samples/maven/pom.xml | 2 +- samples/multiplatform/build.gradle | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/samples/android/app/build.gradle b/samples/android/app/build.gradle index 0626c10fb..4be756f5b 100644 --- a/samples/android/app/build.gradle +++ b/samples/android/app/build.gradle @@ -64,5 +64,6 @@ dependencies { testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestRuntimeOnly "de.mannodermaus.junit5:android-instrumentation-test-runner:$junit5_runner" + androidTestImplementation "de.mannodermaus.junit5:android-test-core:1.0.0" + androidTestRuntimeOnly "de.mannodermaus.junit5:android-test-runner:1.0.0" } diff --git a/samples/android/build.gradle b/samples/android/build.gradle index 88d4a4410..c4b75cc3b 100644 --- a/samples/android/build.gradle +++ b/samples/android/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.0' + classpath 'com.android.tools.build:gradle:3.5.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "de.mannodermaus.gradle.plugins:android-junit5:$android_junit5_version" classpath "org.jacoco:org.jacoco.core:$jacoco_version" diff --git a/samples/android/gradle.properties b/samples/android/gradle.properties index 76b40b3c5..bcbde0066 100644 --- a/samples/android/gradle.properties +++ b/samples/android/gradle.properties @@ -16,7 +16,7 @@ org.gradle.jvmargs=-Xmx1536m # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -spek_version=2.1.0-alpha.0.10+cc4a596 -android_junit5_version=1.4.2.0 +spek_version=2.1.0-alpha.0.9+a2ab044 +android_junit5_version=1.5.2.0 junit5_runner=0.2.2 jacoco_version=0.8.1 diff --git a/samples/android/gradle/wrapper/gradle-wrapper.properties b/samples/android/gradle/wrapper/gradle-wrapper.properties index 14fa702d4..7be605b58 100644 --- a/samples/android/gradle/wrapper/gradle-wrapper.properties +++ b/samples/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Apr 22 11:57:17 AEST 2019 +#Sun Dec 08 16:50:46 AEDT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/samples/jvm/build.gradle b/samples/jvm/build.gradle index 421494b68..ed79febc2 100644 --- a/samples/jvm/build.gradle +++ b/samples/jvm/build.gradle @@ -1,6 +1,6 @@ buildscript { ext.kotlin_version = '1.3.31' - ext.spek_version = '2.1.0-alpha.0.10+cc4a596' + ext.spek_version = '2.1.0-alpha.0.9+a2ab044' repositories { jcenter() diff --git a/samples/maven/pom.xml b/samples/maven/pom.xml index ba96acd83..b703f5b97 100644 --- a/samples/maven/pom.xml +++ b/samples/maven/pom.xml @@ -12,7 +12,7 @@ 1.8 1.3.31 - 2.1.0-alpha.0.10+cc4a596 + 2.1.0-alpha.0.9+a2ab044 diff --git a/samples/multiplatform/build.gradle b/samples/multiplatform/build.gradle index 06364edc2..a7cc81c2b 100644 --- a/samples/multiplatform/build.gradle +++ b/samples/multiplatform/build.gradle @@ -1,6 +1,6 @@ buildscript { ext.kotlin_version = '1.3.31' - ext.spek_version = '2.1.0-alpha.0.10+cc4a596' + ext.spek_version = '2.1.0-alpha.0.9+a2ab044' repositories { jcenter()