Merge pull request #673 from igorescodro/hotfix/3.0.6

🚨 Fix 3.0.5 Android issues
igorescodro · May 4, 2024 · c0a15a5 · c0a15a5
2 parents 75ce9d5 + 9506fb9
commit c0a15a5
Show file tree

Hide file tree

Showing 14 changed files with 45 additions and 12 deletions.
diff --git a/...res/category/src/commonMain/kotlin/com/escodro/category/navigation/CategoryBottomSheet.kt b/...res/category/src/commonMain/kotlin/com/escodro/category/navigation/CategoryBottomSheet.kt
@@ -2,6 +2,8 @@ package com.escodro.category.navigation
 
 import androidx.compose.runtime.Composable
 import cafe.adriel.voyager.core.screen.Screen
+import cafe.adriel.voyager.core.screen.ScreenKey
+import cafe.adriel.voyager.core.screen.uniqueScreenKey
 import cafe.adriel.voyager.navigator.bottomSheet.LocalBottomSheetNavigator
 import com.escodro.category.presentation.bottomsheet.CategoryBottomSheet
 
@@ -12,6 +14,8 @@ import com.escodro.category.presentation.bottomsheet.CategoryBottomSheet
  */
 internal data class CategoryBottomSheet(val categoryId: Long?) : Screen {
 
+    override val key: ScreenKey = uniqueScreenKey
+
     @Composable
     override fun Content() {
         val bottomSheetNavigator = LocalBottomSheetNavigator.current

diff --git a/features/glance/proguard-rules.pro b/features/glance/proguard-rules.pro
@@ -19,5 +19,4 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
--dontwarn java.lang.invoke.StringConcatFactory
--dontwarn com.escodro.glance.di.GlanceModuleKt
+-keep class com.escodro.glance.** { *; }
diff --git a/features/home/src/commonMain/kotlin/com/escodro/home/navigation/HomeScreen.kt b/features/home/src/commonMain/kotlin/com/escodro/home/navigation/HomeScreen.kt
@@ -2,13 +2,17 @@ package com.escodro.home.navigation
 
 import androidx.compose.runtime.Composable
 import cafe.adriel.voyager.core.screen.Screen
+import cafe.adriel.voyager.core.screen.ScreenKey
+import cafe.adriel.voyager.core.screen.uniqueScreenKey
 import com.escodro.home.presentation.Home
 
 /**
  * Alkaa's Home Screen.
  */
 class HomeScreen : Screen {
 
+    override val key: ScreenKey = uniqueScreenKey
+
     @Composable
     override fun Content() {
         Home()

diff --git a/features/preference/src/commonMain/kotlin/com/escodro/preference/navigation/AboutScreen.kt b/features/preference/src/commonMain/kotlin/com/escodro/preference/navigation/AboutScreen.kt
@@ -2,6 +2,8 @@ package com.escodro.preference.navigation
 
 import androidx.compose.runtime.Composable
 import cafe.adriel.voyager.core.screen.Screen
+import cafe.adriel.voyager.core.screen.ScreenKey
+import cafe.adriel.voyager.core.screen.uniqueScreenKey
 import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import com.escodro.preference.presentation.AboutScreen
@@ -11,6 +13,8 @@ import com.escodro.preference.presentation.AboutScreen
  */
 internal class AboutScreen : Screen {
 
+    override val key: ScreenKey = uniqueScreenKey
+
     @Composable
     override fun Content() {
         val navigator = LocalNavigator.currentOrThrow

diff --git a/...es/preference/src/commonMain/kotlin/com/escodro/preference/navigation/OpenSourceScreen.kt b/...es/preference/src/commonMain/kotlin/com/escodro/preference/navigation/OpenSourceScreen.kt
@@ -2,6 +2,8 @@ package com.escodro.preference.navigation
 
 import androidx.compose.runtime.Composable
 import cafe.adriel.voyager.core.screen.Screen
+import cafe.adriel.voyager.core.screen.ScreenKey
+import cafe.adriel.voyager.core.screen.uniqueScreenKey
 import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import com.escodro.preference.presentation.OpenSource
@@ -11,6 +13,8 @@ import com.escodro.preference.presentation.OpenSource
  */
 internal class OpenSourceScreen : Screen {
 
+    override val key: ScreenKey = uniqueScreenKey
+
     @Composable
     override fun Content() {
         val navigator = LocalNavigator.currentOrThrow

diff --git a/features/preference/src/commonMain/kotlin/com/escodro/preference/navigation/TrackerScreen.kt b/features/preference/src/commonMain/kotlin/com/escodro/preference/navigation/TrackerScreen.kt
@@ -2,6 +2,8 @@ package com.escodro.preference.navigation
 
 import androidx.compose.runtime.Composable
 import cafe.adriel.voyager.core.screen.Screen
+import cafe.adriel.voyager.core.screen.ScreenKey
+import cafe.adriel.voyager.core.screen.uniqueScreenKey
 import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import com.escodro.preference.provider.TrackerProvider
@@ -13,6 +15,8 @@ import org.koin.core.component.inject
  */
 internal class TrackerScreen : Screen, KoinComponent {
 
+    override val key: ScreenKey = uniqueScreenKey
+
     private val trackerProvider: TrackerProvider by inject()
 
     @Composable

diff --git a/features/task/src/commonMain/kotlin/com/escodro/task/navigation/AddTaskBottomSheet.kt b/features/task/src/commonMain/kotlin/com/escodro/task/navigation/AddTaskBottomSheet.kt
@@ -2,6 +2,8 @@ package com.escodro.task.navigation
 
 import androidx.compose.runtime.Composable
 import cafe.adriel.voyager.core.screen.Screen
+import cafe.adriel.voyager.core.screen.ScreenKey
+import cafe.adriel.voyager.core.screen.uniqueScreenKey
 import cafe.adriel.voyager.navigator.bottomSheet.LocalBottomSheetNavigator
 import com.escodro.task.presentation.add.AddTaskBottomSheet
 
@@ -10,6 +12,8 @@ import com.escodro.task.presentation.add.AddTaskBottomSheet
  */
 internal class AddTaskBottomSheet : Screen {
 
+    override val key: ScreenKey = uniqueScreenKey
+
     @Composable
     override fun Content() {
         val bottomSheetNavigator = LocalBottomSheetNavigator.current

diff --git a/features/task/src/commonMain/kotlin/com/escodro/task/navigation/TaskDetailScreen.kt b/features/task/src/commonMain/kotlin/com/escodro/task/navigation/TaskDetailScreen.kt
@@ -2,6 +2,8 @@ package com.escodro.task.navigation
 
 import androidx.compose.runtime.Composable
 import cafe.adriel.voyager.core.screen.Screen
+import cafe.adriel.voyager.core.screen.ScreenKey
+import cafe.adriel.voyager.core.screen.uniqueScreenKey
 import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import com.escodro.task.presentation.detail.main.TaskDetailScreen
@@ -11,6 +13,8 @@ import com.escodro.task.presentation.detail.main.TaskDetailScreen
  */
 internal data class TaskDetailScreen(val taskId: Long) : Screen {
 
+    override val key: ScreenKey = uniqueScreenKey
+
     @Composable
     override fun Content() {
         val navigator = LocalNavigator.currentOrThrow

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 # Project
-version_code = "30005"
-version_name = "3.0.5"
+version_code = "30006"
+version_name = "3.0.6"
 android_gradle_plugin = "8.4.0"
 kotlin = "1.9.23"
 android_sdk_compile = "34"

diff --git a/ios-app/alkaa.xcodeproj/project.pbxproj b/ios-app/alkaa.xcodeproj/project.pbxproj
@@ -335,7 +335,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 30005;
+				CURRENT_PROJECT_VERSION = 30006;
 				DEVELOPMENT_ASSET_PATHS = "\"alkaa/Preview Content\"";
 				DEVELOPMENT_TEAM = 5Z3927U4ZC;
 				ENABLE_PREVIEWS = YES;
@@ -354,7 +354,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0.5;
+				MARKETING_VERSION = 3.0.6;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-framework",
@@ -377,7 +377,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 30005;
+				CURRENT_PROJECT_VERSION = 30006;
 				DEVELOPMENT_ASSET_PATHS = "\"alkaa/Preview Content\"";
 				DEVELOPMENT_TEAM = 5Z3927U4ZC;
 				ENABLE_PREVIEWS = YES;
@@ -396,7 +396,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0.5;
+				MARKETING_VERSION = 3.0.6;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-framework",

diff --git a/libraries/splitInstall/proguard-rules.pro b/libraries/splitInstall/proguard-rules.pro
@@ -24,4 +24,4 @@
     public static **[] values();
     public static ** valueOf(java.lang.String);
 }
--dontwarn com.escodro.splitinstall.SplitInstallKt
+-keep class com.escodro.splitinstall.** { *; }
diff --git a/plugins/src/main/java/com.escodro.android-compose.gradle.kts b/plugins/src/main/java/com.escodro.android-compose.gradle.kts
@@ -16,6 +16,13 @@ android {
     androidConfig(libs)
     proguardConfig()
     composeConfig(libs)
+
+    kotlinOptions {
+        jvmTarget = "11"
+        freeCompilerArgs = listOf(
+            "-Xstring-concat=inline"
+        )
+    }
 }
 
 dependencies {

diff --git a/plugins/src/main/java/com.escodro.android-dynamic.gradle.kts b/plugins/src/main/java/com.escodro.android-dynamic.gradle.kts
@@ -17,7 +17,7 @@ kotlin {
     androidTarget {
         compilations.all {
             kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "11"
             }
         }
     }

diff --git a/plugins/src/main/java/com.escodro.multiplatform.gradle.kts b/plugins/src/main/java/com.escodro.multiplatform.gradle.kts
@@ -14,7 +14,7 @@ kotlin {
     androidTarget {
         compilations.all {
             kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = "11"
             }
         }
     }
@@ -28,4 +28,3 @@ android {
         minSdk = Integer.parseInt(libs.sdkMin)
     }
 }
-