Merge pull request #35 from myndocs/upgrade-kotlin-version

Upgrade kotlin to 1.3

Author: adhesivee

oauth2-server-core/pom.xml

@@ -21,7 +21,7 @@
         <dependency>
             <groupId>io.mockk</groupId>
             <artifactId>mockk</artifactId>
-            <version>1.8.6</version>
+            <version>1.8.12.kotlin13</version>
             <scope>test</scope>
         </dependency>
         <dependency>

oauth2-server-ktor/pom.xml

@@ -12,8 +12,7 @@
     <artifactId>oauth2-server-ktor</artifactId>
 
     <properties>
-        <ktor.version>0.9.5</ktor.version>
-        <serialization.version>0.6.1</serialization.version>
+        <ktor.version>1.0.0-beta-4</ktor.version>
     </properties>
 
 

oauth2-server-ktor/src/main/java/nl/myndocs/oauth2/ktor/feature/request/KtorCallContext.kt

@@ -10,7 +10,7 @@ import io.ktor.response.header
 import io.ktor.response.respondRedirect
 import io.ktor.response.respondText
 import io.ktor.util.toMap
-import kotlinx.coroutines.experimental.runBlocking
+import kotlinx.coroutines.runBlocking
 import nl.myndocs.oauth2.json.JsonMapper
 import nl.myndocs.oauth2.request.CallContext
 

pom.xml

@@ -10,7 +10,7 @@
     <version>0.2.2</version>
 
     <properties>
-        <kotlin.version>1.2.60</kotlin.version>
+        <kotlin.version>1.3.0</kotlin.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
     </properties>