Merge pull request #178 from willowtreeapps/bugfix/177

Fix crash on release builds
willowtreeapps · Apr 27, 2020 · 79ddd21 · 79ddd21
2 parents 1ca18b8 + 008a497
commit 79ddd21
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,7 +12,7 @@ android {
         applicationId "com.willowtree.vocable"
         minSdkVersion 24
         targetSdkVersion 29
-        versionCode 10
+        versionCode 11
         versionName "1.3.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         javaCompileOptions {

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -19,3 +19,10 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+# JSR 305 annotations are for embedding nullability information.
+
+# Keep room model class members
+-keepclassmembers class com.willowtree.vocable.room.models** {
+  <init>(...);
+  <fields>;
+}
diff --git a/app/src/main/java/com/willowtree/vocable/presets/PresetsRepository.kt b/app/src/main/java/com/willowtree/vocable/presets/PresetsRepository.kt
@@ -5,6 +5,7 @@ import android.util.Log
 import com.squareup.moshi.Moshi
 import com.willowtree.vocable.R
 import com.willowtree.vocable.room.*
+import com.willowtree.vocable.room.models.PresetsObject
 import com.willowtree.vocable.utils.VocableSharedPreferences
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext

diff --git a/...willowtree/vocable/room/PresetCategory.kt → ...ree/vocable/room/models/PresetCategory.kt b/...willowtree/vocable/room/PresetCategory.kt → ...ree/vocable/room/models/PresetCategory.kt
@@ -1,4 +1,4 @@
-package com.willowtree.vocable.room
+package com.willowtree.vocable.room.models
 
 data class PresetCategory(
     val id: String,

diff --git a/...m/willowtree/vocable/room/PresetPhrase.kt → ...wtree/vocable/room/models/PresetPhrase.kt b/...m/willowtree/vocable/room/PresetPhrase.kt → ...wtree/vocable/room/models/PresetPhrase.kt
@@ -1,4 +1,4 @@
-package com.willowtree.vocable.room
+package com.willowtree.vocable.room.models
 
 data class PresetPhrase(
     val id: String,

diff --git a/.../willowtree/vocable/room/PresetsObject.kt → ...tree/vocable/room/models/PresetsObject.kt b/.../willowtree/vocable/room/PresetsObject.kt → ...tree/vocable/room/models/PresetsObject.kt
@@ -1,4 +1,4 @@
-package com.willowtree.vocable.room
+package com.willowtree.vocable.room.models
 
 data class PresetsObject(
     val schemaVersion: Int,