Merge pull request #36 from jarnedemeulemeester/develop

Version 0.2.1
jarnedemeulemeester · Sep 23, 2021 · b711180 · b711180
2 parents ac54e40 + 44f7d6f
commit b711180
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -16,8 +16,8 @@ android {
         applicationId = "dev.jdtech.jellyfin"
         minSdk = 24
         targetSdk = 31
-        versionCode = 4
-        versionName = "0.2.0"
+        versionCode = 5
+        versionName = "0.2.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -26,15 +26,15 @@ android {
         getByName("debug") {
             applicationIdSuffix = ".debug"
         }
-        create("staging") {
-            initWith(getByName("release"))
-            applicationIdSuffix = ".staging"
-        }
         getByName("release") {
             isMinifyEnabled = true
             isShrinkResources = true
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
+        create("staging") {
+            initWith(getByName("release"))
+            applicationIdSuffix = ".staging"
+        }
     }
 
     compileOptions {

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -20,4 +20,9 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
--keepnames class dev.jdtech.jellyfin.models.PlayerItem
+-keepnames class dev.jdtech.jellyfin.models.PlayerItem
+
+# Keep all mpvlib methods because proguard removes some which makes the app crash
+-keep class is.xyz.libmpv.MPVLib {
+  *;
+}
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    val kotlinVersion = "1.5.30"
+    val kotlinVersion = "1.5.31"
     repositories {
         google()
         mavenCentral()