From 6fa7f5f188de70201bafd200d3c20eca0628713e Mon Sep 17 00:00:00 2001 From: Felix Date: Fri, 10 Apr 2020 23:25:32 +0200 Subject: [PATCH 1/3] fix crash on import by adding keep-annotations --- .../src/main/java/de/nicidienase/chaosflix/common/ImportItem.kt | 2 ++ .../nicidienase/chaosflix/common/eventimport/FahrplanLecture.kt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/common/src/main/java/de/nicidienase/chaosflix/common/ImportItem.kt b/common/src/main/java/de/nicidienase/chaosflix/common/ImportItem.kt index ed300a3c..62f579c0 100644 --- a/common/src/main/java/de/nicidienase/chaosflix/common/ImportItem.kt +++ b/common/src/main/java/de/nicidienase/chaosflix/common/ImportItem.kt @@ -1,8 +1,10 @@ package de.nicidienase.chaosflix.common +import androidx.annotation.Keep import de.nicidienase.chaosflix.common.eventimport.FahrplanLecture import de.nicidienase.chaosflix.common.mediadata.entities.recording.persistence.Event +@Keep data class ImportItem( val lecture: FahrplanLecture, var event: Event?, diff --git a/common/src/main/java/de/nicidienase/chaosflix/common/eventimport/FahrplanLecture.kt b/common/src/main/java/de/nicidienase/chaosflix/common/eventimport/FahrplanLecture.kt index 9b6d8a0b..b10c369c 100644 --- a/common/src/main/java/de/nicidienase/chaosflix/common/eventimport/FahrplanLecture.kt +++ b/common/src/main/java/de/nicidienase/chaosflix/common/eventimport/FahrplanLecture.kt @@ -1,7 +1,9 @@ package de.nicidienase.chaosflix.common.eventimport +import androidx.annotation.Keep import com.google.gson.annotations.SerializedName +@Keep data class FahrplanLecture( @SerializedName("lecture_id") var lectureId: String? = null, From 34352be271807d46cb7f67fdea5f5c732ed9199b Mon Sep 17 00:00:00 2001 From: Felix Date: Fri, 10 Apr 2020 23:26:42 +0200 Subject: [PATCH 2/3] update version for next release 0.7.0 --- versionfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versionfile b/versionfile index a918a2aa..faef31a4 100644 --- a/versionfile +++ b/versionfile @@ -1 +1 @@ -0.6.0 +0.7.0 From 99c4878da88f07ddcaff43cdda58e2a6287c4b28 Mon Sep 17 00:00:00 2001 From: Felix Date: Fri, 10 Apr 2020 23:27:25 +0200 Subject: [PATCH 3/3] add trim() to gradle to prevent spaces from messing up the signing config --- touch/build.gradle | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/touch/build.gradle b/touch/build.gradle index 33ef13ed..67d23666 100644 --- a/touch/build.gradle +++ b/touch/build.gradle @@ -36,12 +36,12 @@ android { signingConfigs { //noinspection GroovyMissingReturnStatement, GroovyAssignabilityCheck release { - if (project.hasProperty("chaosflixKeystore") && file(chaosflixKeystore).exists() && file(chaosflixKeystore).isFile()) { + if (project.hasProperty("chaosflixKeystore") && file(chaosflixKeystore.trim()).exists() && file(chaosflixKeystore.trim()).isFile()) { println "Release app signing is configured: will sign APK" - storeFile file(chaosflixKeystore) - storePassword chaosflixStorePassword - keyAlias chaosflixKeyName - keyPassword chaosflixKeyPassword + storeFile file(chaosflixKeystore.trim()) + storePassword chaosflixStorePassword.trim() + keyAlias chaosflixKeyName.trim() + keyPassword chaosflixKeyPassword.trim() } else { println "App signing data not found. Will not sign." } @@ -59,8 +59,7 @@ android { shrinkResources true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - if (project.hasProperty("chaosflixKeystore") && file(chaosflixKeystore).exists() && file(chaosflixKeystore).isFile()) { - + if (project.hasProperty("chaosflixKeystore") && file(chaosflixKeystore.trim()).exists() && file(chaosflixKeystore.trim()).isFile()) { signingConfig signingConfigs.release } }