From 7fe197e3b6e8bebd216524d9c4f73394d8f15abc Mon Sep 17 00:00:00 2001 From: jarnedemeulemeester Date: Thu, 23 Sep 2021 09:39:51 +0200 Subject: [PATCH 1/4] Add mpvlib to proguard rules Fix #35 --- app/proguard-rules.pro | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 36d19cd8..97fdeba0 100644 --- 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 \ No newline at end of file +-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 { + *; +} \ No newline at end of file From 18b2867c3ba25f55471791ce84d6c16a0ea047e3 Mon Sep 17 00:00:00 2001 From: jarnedemeulemeester Date: Thu, 23 Sep 2021 09:40:55 +0200 Subject: [PATCH 2/4] Create staging build type after release --- app/build.gradle.kts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6b29a419..86975e91 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -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 { From 823330273d6c9cccab9e7112c3befed48857af83 Mon Sep 17 00:00:00 2001 From: jarnedemeulemeester Date: Thu, 23 Sep 2021 09:53:12 +0200 Subject: [PATCH 3/4] Upgrade kotlin to 1.5.31 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8c272304..08ebb2fe 100644 --- 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() From 44f7d6fa6dd0010eeb98966b8caab7db12bcd91b Mon Sep 17 00:00:00 2001 From: jarnedemeulemeester Date: Thu, 23 Sep 2021 09:53:45 +0200 Subject: [PATCH 4/4] Bump versionCode to 5 and versionName to 0.2.1 --- app/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 86975e91..938ceeb1 100644 --- 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" }