From 02eb1afc667412bcdb61666a115d5c6cc40a5f6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C9=91rry=20Shiv=C9=91m?= Date: Sun, 17 Mar 2024 15:12:22 +0530 Subject: [PATCH] Update Compose BOM, Kotlin & Gradle versions (#78) --------- Signed-off-by: starry-shivam --- .idea/.gitignore | 2 ++ .idea/kotlinc.xml | 2 +- app/build.gradle | 4 ++-- .../com/starry/greenstash/ExampleInstrumentedTest.kt | 2 +- .../main/java/com/starry/greenstash/MainViewModel.kt | 2 ++ .../starry/greenstash/reminder/ReminderManager.kt | 2 ++ .../greenstash/reminder/receivers/BootReceiver.kt | 2 ++ .../reminder/receivers/DateTimeChangeReceiver.kt | 2 ++ .../reminder/receivers/ReminderDepositReceiver.kt | 2 ++ .../reminder/receivers/ReminderDismissReceiver.kt | 2 ++ .../com/starry/greenstash/ui/common/DotIndicator.kt | 2 +- .../ui/screens/input/composables/DWScreen.kt | 12 ++++++++++-- build.gradle | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 14 files changed, 33 insertions(+), 11 deletions(-) diff --git a/.idea/.gitignore b/.idea/.gitignore index 26d33521..8f00030d 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -1,3 +1,5 @@ # Default ignored files /shelf/ /workspace.xml +# GitHub Copilot persisted chat sessions +/copilot/chatSessions diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index ae3f30ae..8d81632f 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 58cd993a..3437b5d8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -58,7 +58,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.6' + kotlinCompilerExtensionVersion '1.5.10' } packagingOptions { resources { @@ -75,7 +75,7 @@ aboutLibraries { dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.10.01') + def composeBom = platform('androidx.compose:compose-bom:2024.02.02') implementation composeBom androidTestImplementation composeBom diff --git a/app/src/androidTest/java/com/starry/greenstash/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/starry/greenstash/ExampleInstrumentedTest.kt index bc16ed7b..cf00ac76 100644 --- a/app/src/androidTest/java/com/starry/greenstash/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/com/starry/greenstash/ExampleInstrumentedTest.kt @@ -2,7 +2,7 @@ package com.starry.greenstash import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry -import org.junit.Assert.* +import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith diff --git a/app/src/main/java/com/starry/greenstash/MainViewModel.kt b/app/src/main/java/com/starry/greenstash/MainViewModel.kt index 38510660..552419e7 100644 --- a/app/src/main/java/com/starry/greenstash/MainViewModel.kt +++ b/app/src/main/java/com/starry/greenstash/MainViewModel.kt @@ -42,10 +42,12 @@ import com.starry.greenstash.ui.navigation.DrawerScreens import com.starry.greenstash.ui.navigation.Screens import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.delay import kotlinx.coroutines.launch import javax.inject.Inject +@ExperimentalCoroutinesApi @ExperimentalMaterialApi @ExperimentalFoundationApi @ExperimentalComposeUiApi diff --git a/app/src/main/java/com/starry/greenstash/reminder/ReminderManager.kt b/app/src/main/java/com/starry/greenstash/reminder/ReminderManager.kt index 519772d3..b1d965eb 100644 --- a/app/src/main/java/com/starry/greenstash/reminder/ReminderManager.kt +++ b/app/src/main/java/com/starry/greenstash/reminder/ReminderManager.kt @@ -37,10 +37,12 @@ import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.ui.ExperimentalComposeUiApi import com.starry.greenstash.database.core.GoalWithTransactions import com.starry.greenstash.reminder.receivers.AlarmReceiver +import kotlinx.coroutines.ExperimentalCoroutinesApi import java.util.Calendar import java.util.Locale +@ExperimentalCoroutinesApi @ExperimentalMaterial3Api @ExperimentalAnimationApi @ExperimentalComposeUiApi diff --git a/app/src/main/java/com/starry/greenstash/reminder/receivers/BootReceiver.kt b/app/src/main/java/com/starry/greenstash/reminder/receivers/BootReceiver.kt index b9c5ad9c..e5a0e3e6 100644 --- a/app/src/main/java/com/starry/greenstash/reminder/receivers/BootReceiver.kt +++ b/app/src/main/java/com/starry/greenstash/reminder/receivers/BootReceiver.kt @@ -38,9 +38,11 @@ import com.starry.greenstash.reminder.ReminderManager import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.launch import javax.inject.Inject +@ExperimentalCoroutinesApi @ExperimentalMaterial3Api @ExperimentalAnimationApi @ExperimentalComposeUiApi diff --git a/app/src/main/java/com/starry/greenstash/reminder/receivers/DateTimeChangeReceiver.kt b/app/src/main/java/com/starry/greenstash/reminder/receivers/DateTimeChangeReceiver.kt index 337270e5..6c988630 100644 --- a/app/src/main/java/com/starry/greenstash/reminder/receivers/DateTimeChangeReceiver.kt +++ b/app/src/main/java/com/starry/greenstash/reminder/receivers/DateTimeChangeReceiver.kt @@ -38,9 +38,11 @@ import com.starry.greenstash.reminder.ReminderManager import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.launch import javax.inject.Inject +@ExperimentalCoroutinesApi @ExperimentalMaterial3Api @ExperimentalAnimationApi @ExperimentalComposeUiApi diff --git a/app/src/main/java/com/starry/greenstash/reminder/receivers/ReminderDepositReceiver.kt b/app/src/main/java/com/starry/greenstash/reminder/receivers/ReminderDepositReceiver.kt index 9f44d0fa..e615a4c7 100644 --- a/app/src/main/java/com/starry/greenstash/reminder/receivers/ReminderDepositReceiver.kt +++ b/app/src/main/java/com/starry/greenstash/reminder/receivers/ReminderDepositReceiver.kt @@ -44,9 +44,11 @@ import com.starry.greenstash.reminder.ReminderNotificationSender import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.launch import javax.inject.Inject +@ExperimentalCoroutinesApi @ExperimentalMaterialApi @ExperimentalFoundationApi @ExperimentalComposeUiApi diff --git a/app/src/main/java/com/starry/greenstash/reminder/receivers/ReminderDismissReceiver.kt b/app/src/main/java/com/starry/greenstash/reminder/receivers/ReminderDismissReceiver.kt index 441e7a61..d84bb2d8 100644 --- a/app/src/main/java/com/starry/greenstash/reminder/receivers/ReminderDismissReceiver.kt +++ b/app/src/main/java/com/starry/greenstash/reminder/receivers/ReminderDismissReceiver.kt @@ -36,8 +36,10 @@ import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.ui.ExperimentalComposeUiApi import com.starry.greenstash.reminder.ReminderNotificationSender import dagger.hilt.android.AndroidEntryPoint +import kotlinx.coroutines.ExperimentalCoroutinesApi import javax.inject.Inject +@ExperimentalCoroutinesApi @ExperimentalMaterialApi @ExperimentalFoundationApi @ExperimentalComposeUiApi diff --git a/app/src/main/java/com/starry/greenstash/ui/common/DotIndicator.kt b/app/src/main/java/com/starry/greenstash/ui/common/DotIndicator.kt index 7d1667dd..b8765462 100644 --- a/app/src/main/java/com/starry/greenstash/ui/common/DotIndicator.kt +++ b/app/src/main/java/com/starry/greenstash/ui/common/DotIndicator.kt @@ -47,7 +47,7 @@ fun DotIndicator(modifier: Modifier = Modifier, color: Color) { animationSpec = infiniteRepeatable( animation = tween(durationMillis = 1000, easing = FastOutSlowInEasing), repeatMode = RepeatMode.Reverse - ) + ), label = "GlowColor" ) Canvas(modifier = modifier) { diff --git a/app/src/main/java/com/starry/greenstash/ui/screens/input/composables/DWScreen.kt b/app/src/main/java/com/starry/greenstash/ui/screens/input/composables/DWScreen.kt index 5219936e..03ab84c9 100644 --- a/app/src/main/java/com/starry/greenstash/ui/screens/input/composables/DWScreen.kt +++ b/app/src/main/java/com/starry/greenstash/ui/screens/input/composables/DWScreen.kt @@ -318,7 +318,11 @@ fun DWScreen(goalId: String, transactionTypeName: String, navController: NavCont } } }, onComplete = { - navigateToHome(navController, coroutineScope, showTransactionAddedAnim) + navigateToHome( + navController, + coroutineScope, + showTransactionAddedAnim + ) } ) } @@ -335,7 +339,11 @@ fun DWScreen(goalId: String, transactionTypeName: String, navController: NavCont } }, onComplete = { - navigateToHome(navController, coroutineScope, showTransactionAddedAnim) + navigateToHome( + navController, + coroutineScope, + showTransactionAddedAnim + ) } ) } diff --git a/build.gradle b/build.gradle index b9fad866..a0604d93 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { - kotlin_version = '1.9.21' - gradle_version = '8.2.2' + kotlin_version = '1.9.22' + gradle_version = '8.3.0' hilt_version = '2.49' room_version = '2.6.1' } @@ -22,5 +22,5 @@ plugins { id 'com.android.application' version "$gradle_version" apply false id 'com.android.library' version "$gradle_version" apply false id 'org.jetbrains.kotlin.android' version "$kotlin_version" apply false - id 'com.google.devtools.ksp' version '1.9.21-1.0.16' apply false + id 'com.google.devtools.ksp' version '1.9.22-1.0.17' apply false } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bfffcd91..13f5f913 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Jan 23 11:16:57 IST 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME