From 22832f93588ab35e15d09d2dbd4d3e6fb02d82d8 Mon Sep 17 00:00:00 2001 From: Yamin Siahmargooei Date: Tue, 21 May 2024 20:40:07 +0330 Subject: [PATCH] fixes #133 --- app/build.gradle.kts | 6 +++--- app/proguard-rules.pro | 3 +++ build.gradle.kts | 4 ++-- data/build.gradle.kts | 13 ------------- data/consumer-rules.pro | 17 ----------------- data/proguard-rules.pro | 3 --- .../metadata/android/en-US/changelogs/42.txt | 1 + network/build.gradle.kts | 13 ------------- network/consumer-rules.pro | 2 -- 9 files changed, 9 insertions(+), 53 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/42.txt diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 5c0227ed..57405fa4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -39,10 +39,10 @@ android { applicationId = appId minSdk = 21 targetSdk = 34 - versionCode = 41 - versionName = "1.6.4" + versionCode = 42 + versionName = "1.6.5" vectorDrawables.useSupportLibrary = true - archivesName = "$applicationId-v$versionCode($versionName)" + archivesName = "$applicationId-v$versionCode-n$versionName" } buildTypes { diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 9bdb7764..1c91fc35 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -55,3 +55,6 @@ -keepnames class * implements android.os.Parcelable { public static final ** CREATOR; } + +# This is generated automatically by the Android Gradle plugin. +-dontwarn java.lang.invoke.StringConcatFactory diff --git a/build.gradle.kts b/build.gradle.kts index 272b4213..a4578b3e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,8 +20,8 @@ */ plugins { - id("com.android.application") version "8.4.0" apply false - id("com.android.library") version "8.4.0" apply false + id("com.android.application") version "8.4.1" apply false + id("com.android.library") version "8.4.1" apply false id("org.jetbrains.kotlin.android") version "1.9.24" apply false id("com.google.devtools.ksp") version "1.9.24-1.0.20" } \ No newline at end of file diff --git a/data/build.gradle.kts b/data/build.gradle.kts index 41a59a17..b9b1032c 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -35,19 +35,6 @@ android { consumerProguardFiles("consumer-rules.pro") } - buildTypes { - release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) - isMinifyEnabled = true - } - debug { - isMinifyEnabled = false - } - } - compileOptions { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 diff --git a/data/consumer-rules.pro b/data/consumer-rules.pro index e680a5ed..e69de29b 100644 --- a/data/consumer-rules.pro +++ b/data/consumer-rules.pro @@ -1,17 +0,0 @@ --dontwarn io.github.yamin8000.owl.data.DataStoreRepository --dontwarn io.github.yamin8000.owl.data.db.dao.AdvancedDao --dontwarn io.github.yamin8000.owl.data.db.dao.DAOs$DefinitionDao --dontwarn io.github.yamin8000.owl.data.db.dao.DAOs$EntryDao --dontwarn io.github.yamin8000.owl.data.db.dao.DAOs$MeaningDao --dontwarn io.github.yamin8000.owl.data.db.dao.DAOs$PhoneticDao --dontwarn io.github.yamin8000.owl.data.db.dao.DAOs$TermDao --dontwarn io.github.yamin8000.owl.data.db.entity.DefinitionEntity --dontwarn io.github.yamin8000.owl.data.db.entity.EntryEntity --dontwarn io.github.yamin8000.owl.data.db.entity.MeaningEntity --dontwarn io.github.yamin8000.owl.data.db.entity.PhoneticEntity --dontwarn io.github.yamin8000.owl.data.db.entity.TermEntity --dontwarn io.github.yamin8000.owl.data.model.Definition --dontwarn io.github.yamin8000.owl.data.model.Entry --dontwarn io.github.yamin8000.owl.data.model.License --dontwarn io.github.yamin8000.owl.data.model.Meaning --dontwarn io.github.yamin8000.owl.data.model.Phonetic \ No newline at end of file diff --git a/data/proguard-rules.pro b/data/proguard-rules.pro index 4e3199e2..f1b42451 100644 --- a/data/proguard-rules.pro +++ b/data/proguard-rules.pro @@ -19,6 +19,3 @@ # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile - -# This is generated automatically by the Android Gradle plugin. --dontwarn java.lang.invoke.StringConcatFactory \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/42.txt b/fastlane/metadata/android/en-US/changelogs/42.txt new file mode 100644 index 00000000..3d944be0 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/42.txt @@ -0,0 +1 @@ +- Startup Crash BUGFIX \ No newline at end of file diff --git a/network/build.gradle.kts b/network/build.gradle.kts index 12bbdd82..7bbbbcd3 100644 --- a/network/build.gradle.kts +++ b/network/build.gradle.kts @@ -34,19 +34,6 @@ android { consumerProguardFiles("consumer-rules.pro") } - buildTypes { - release { - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) - isMinifyEnabled = true - } - debug { - isMinifyEnabled = false - } - } - compileOptions { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 diff --git a/network/consumer-rules.pro b/network/consumer-rules.pro index 96e88b6e..e69de29b 100644 --- a/network/consumer-rules.pro +++ b/network/consumer-rules.pro @@ -1,2 +0,0 @@ --dontwarn io.github.yamin8000.owl.network.APIs$FreeDictionaryAPI --dontwarn io.github.yamin8000.owl.network.Web \ No newline at end of file