Compatibility with Kotlin 1.2-rc1

yole · Nov 8, 2017 · 7c44f6e · 7c44f6e
1 parent aacdf60
commit 7c44f6e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,9 @@
 buildscript {
-    ext.kotlin_version = '1.0.3'
+    ext.kotlin_version = '1.2.0-rc-39'
 
     repositories {
         mavenCentral()
+        maven { url "http://dl.bintray.com/kotlin/kotlin-eap" }
     }
 
     dependencies {
@@ -14,6 +15,7 @@ apply plugin: "kotlin"
 
 repositories {
     mavenCentral()
+    maven { url "http://dl.bintray.com/kotlin/kotlin-eap" }
 }
 
 dependencies {

diff --git a/src/main/kotlin/deserialization/ClassInfoCache.kt b/src/main/kotlin/deserialization/ClassInfoCache.kt
@@ -4,9 +4,9 @@ import ru.yole.jkid.*
 import ru.yole.jkid.serialization.getSerializer
 import kotlin.reflect.KClass
 import kotlin.reflect.KParameter
-import kotlin.reflect.declaredMemberProperties
+import kotlin.reflect.full.declaredMemberProperties
+import kotlin.reflect.full.primaryConstructor
 import kotlin.reflect.jvm.javaType
-import kotlin.reflect.primaryConstructor
 
 class ClassInfoCache {
     private val cacheData = mutableMapOf<KClass<*>, ClassInfo<*>>()

diff --git a/src/main/kotlin/serialization/Serializer.kt b/src/main/kotlin/serialization/Serializer.kt
@@ -3,7 +3,7 @@ package ru.yole.jkid.serialization
 import ru.yole.jkid.*
 import kotlin.reflect.KProperty
 import kotlin.reflect.KProperty1
-import kotlin.reflect.memberProperties
+import kotlin.reflect.full.memberProperties
 
 fun serialize(obj: Any): String = buildString { serializeObject(obj) }