Upgrade to version 1.5

Kotlin · oleksiyp · Nov 1, 2017 · Nov 2, 2017 · Nov 2, 2017 · Nov 2, 2017
commit 8e092526e667bda87923d58f1f6582d6de724e3c
diff --git a/.idea/runConfigurations/Backend____Jetty.xml b/.idea/runConfigurations/Backend____Jetty.xml
diff --git a/backend/build.gradle b/backend/build.gradle
@@ -1,6 +1,5 @@
 plugins {
     id "jacoco"
-    id "com.zoltu.application-agent" version "1.0.8"
 }
 
 group = 'org.jetbrains.demo.thinkter'
@@ -10,7 +9,6 @@ apply plugin: 'kotlin'
 apply plugin: 'application'
 
 dependencies {
-    agent "io.mockk:mockk-agent:1.4"
 
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
@@ -25,7 +23,7 @@ dependencies {
     testCompile "org.jetbrains.ktor:ktor-test-host:$ktor_version"
     testCompile "org.jsoup:jsoup:1.9.1"
 
-    testCompile "io.mockk:mockk:1.4"
+    testCompile "io.mockk:mockk:1.5"
 
     compile "org.jetbrains.ktor:ktor-jetty:$ktor_version"
     compile group: 'com.google.code.gson', name: 'gson', version: '2.8.0'

diff --git a/backend/test/org/jetbrains/demo/thinkter/DeleteKtTest.kt b/backend/test/org/jetbrains/demo/thinkter/DeleteKtTest.kt
@@ -14,7 +14,6 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(MockKJUnit4Runner::class)
 class DeleteKtTest {
     val route = mockk<Routing>()
     val dao = mockk<ThinkterStorage>()

diff --git a/backend/test/org/jetbrains/demo/thinkter/IndexKtTest.kt b/backend/test/org/jetbrains/demo/thinkter/IndexKtTest.kt
@@ -18,7 +18,6 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import java.nio.charset.Charset
 
-@RunWith(MockKJUnit4Runner::class)
 class IndexKtTest {
     val route = mockk<Routing>()
     val dao = mockk<ThinkterStorage>()

diff --git a/backend/test/org/jetbrains/demo/thinkter/LoginKtTest.kt b/backend/test/org/jetbrains/demo/thinkter/LoginKtTest.kt
@@ -16,7 +16,6 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(MockKJUnit4Runner::class)
 class LoginKtTest {
     val route = mockk<Routing>()
     val dao = mockk<ThinkterStorage>()

diff --git a/backend/test/org/jetbrains/demo/thinkter/PostThoughtKtTest.kt b/backend/test/org/jetbrains/demo/thinkter/PostThoughtKtTest.kt
@@ -15,7 +15,6 @@ import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(MockKJUnit4Runner::class)
 class PostThoughtKtTest {
     val route = mockk<Routing>()
     val dao = mockk<ThinkterStorage>()

diff --git a/backend/test/org/jetbrains/demo/thinkter/RegisterKtTest.kt b/backend/test/org/jetbrains/demo/thinkter/RegisterKtTest.kt
@@ -18,7 +18,6 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(MockKJUnit4Runner::class)
 class RegisterKtTest {
     val route = mockk<Routing>()
     val dao = mockk<ThinkterStorage>()

diff --git a/backend/test/org/jetbrains/demo/thinkter/UserPageKtTest.kt b/backend/test/org/jetbrains/demo/thinkter/UserPageKtTest.kt
@@ -15,7 +15,6 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(MockKJUnit4Runner::class)
 class UserPageKtTest {
     val route = mockk<Routing>()
     val dao = mockk<ThinkterStorage>()

diff --git a/backend/test/org/jetbrains/demo/thinkter/ViewThoughtKtTest.kt b/backend/test/org/jetbrains/demo/thinkter/ViewThoughtKtTest.kt
@@ -15,7 +15,6 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@RunWith(MockKJUnit4Runner::class)
 class ViewThoughtKtTest {
     val route = mockk<Routing>()
     val dao = mockk<ThinkterStorage>()

diff --git a/backend/test/org/jetbrains/demo/thinkter/dao/ThinkterDatabaseTest.kt b/backend/test/org/jetbrains/demo/thinkter/dao/ThinkterDatabaseTest.kt
@@ -19,7 +19,6 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import java.time.LocalDateTime
 
-@RunWith(MockKJUnit4Runner::class)
 class ThinkterDatabaseTest {
     val connection = mockk<DatabaseConnection>("db")
     fun tx() = connection.createTransaction()

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Wed Nov 08 07:41:52 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-all.zip