Fix samples to work with latest 2.x commit (#679)

spekframework · Apr 26, 2019 · 9a82ca8 · 9a82ca8
1 parent b081e15
commit 9a82ca8
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/samples/android/build.gradle b/samples/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
  jcenter()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:3.2.0'
+ classpath 'com.android.tools.build:gradle:3.4.0'
  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
@@ -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.5+1e19e95
-android_junit5_version=1.2.0.0
+spek_version=2.1.0-alpha.0.7+b081e15
+android_junit5_version=1.4.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
@@ -1,6 +1,6 @@
-#Sat Jan 26 10:24:15 AEDT 2019
+#Mon Apr 22 11:57:17 AEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/samples/jvm/build.gradle b/samples/jvm/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
- ext.kotlin_version = '1.3.20'
- ext.spek_version = '2.1.0-alpha.0.5+1e19e95'
+ ext.kotlin_version = '1.3.30'
+ ext.spek_version = '2.1.0-alpha.0.7+b081e15'
 
  repositories {
  jcenter()

diff --git a/samples/jvm/settings.gradle b/samples/jvm/settings.gradle
diff --git a/samples/maven/pom.xml b/samples/maven/pom.xml
@@ -11,8 +11,8 @@
 
  <properties>
  <jdk.version>1.8</jdk.version>
- <kotlin.version>1.3.20</kotlin.version>
- <spek.version>2.1.0-alpha.0.5+1e19e95</spek.version>
+ <kotlin.version>1.3.30</kotlin.version>
+ <spek.version>2.1.0-alpha.0.7+b081e15</spek.version>
  </properties>
 
  <dependencies>

diff --git a/samples/multiplatform/build.gradle b/samples/multiplatform/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
- ext.kotlin_version = '1.3.20'
- ext.spek_version = '2.1.0-alpha.0.5+1e19e95'
+ ext.kotlin_version = '1.3.30'
+ ext.spek_version = '2.1.0-alpha.0.7+b081e15'
 
  repositories {
  jcenter()

diff --git a/spek-ide-plugin/android-studio/build.gradle b/spek-ide-plugin/android-studio/build.gradle
@@ -29,8 +29,8 @@ intellij {
  pluginName = "Spek Framework"
  version = settings['sdk']
  plugins = ['gradle', 'android'] + settings['deps']
- if (hasProperty("local${sdkVersion}Path")) {
- alternativeIdePath = getProperty("local${sdkVersion}Path")
+ if (project.hasProperty("local${sdkVersion}Path")) {
+ localPath = getProperty("local${sdkVersion}Path")
  }
 }
 

diff --git a/spek-ide-plugin/interop-jvm/build.gradle b/spek-ide-plugin/interop-jvm/build.gradle
@@ -14,6 +14,6 @@ shadowJar {
  relocate 'com.xenomachina', 'shadow.com.xenomachina'
 
  dependencies {
- exclude(dependency('org.jetbrains.*:.*:.*'))
+ exclude(dependency('org.jetbrains.kotlin:.*:.*'))
  }
 }