Merge branch 'dev'

7 years ago · de420fdb71
parent af5d40997e 5b5eef5d77
commit de420fdb71
2 changed files with 2 additions and 2 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -28,7 +28,7 @@ android {
        applicationId "net.pokeranalytics.android"
        minSdkVersion 23
        targetSdkVersion 28
-        versionCode 16
+        versionCode 18
        versionName "1.0"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
--- a/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt
@ -59,7 +59,7 @@ class PokerAnalyticsMigration : RealmMigration {

            schema.get("FilterCondition")?.let {
                it.removeField("blindValues")
-                it.addField("operator", String::class.java).setNullable("operator", true)
+                it.addField("operator", Int::class.java).setNullable("operator", true)
                it.addField("intValue", Int::class.java).setNullable("intValue", true)
                it.addField("doubleValue", Double::class.java).setNullable("intValue", true)
                it.addField("stringValue", String::class.java).setNullable("stringValue", true)