Skip to content

Commit

Permalink
Update dependencies, Gradle & Kotlin (#102)
Browse files Browse the repository at this point in the history
Signed-off-by: starry-shivam <[email protected]>
  • Loading branch information
starry-shivam authored Apr 22, 2024
1 parent b4aa09d commit 9f779cb
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 37 deletions.
15 changes: 1 addition & 14 deletions .idea/deploymentTargetDropDown.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'org.jetbrains.kotlin.android'
id 'dagger.hilt.android.plugin'
id 'com.google.devtools.ksp'
id "com.mikepenz.aboutlibraries.plugin" version "10.5.2"
id "com.mikepenz.aboutlibraries.plugin" version "11.1.3"
}

apply plugin: 'com.mikepenz.aboutlibraries.plugin'
Expand Down Expand Up @@ -58,7 +58,7 @@ android {

}
composeOptions {
kotlinCompilerExtensionVersion '1.5.10'
kotlinCompilerExtensionVersion '1.5.12'
}
packagingOptions {
resources {
Expand All @@ -75,15 +75,15 @@ aboutLibraries {

dependencies {

def composeBom = platform('androidx.compose:compose-bom:2024.04.00')
def composeBom = platform('androidx.compose:compose-bom:2024.04.01')
implementation composeBom
androidTestImplementation composeBom

// Android core components.
implementation 'androidx.core:core-ktx:1.12.0'
implementation 'androidx.core:core-ktx:1.13.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
implementation 'androidx.activity:activity-compose:1.8.2'
implementation 'androidx.activity:activity-compose:1.9.0'
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.7.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0"
implementation "androidx.navigation:navigation-compose:2.7.7"
Expand All @@ -101,7 +101,7 @@ dependencies {
// Android 12+ splash API.
implementation 'androidx.core:core-splashscreen:1.0.1'
// Material icons.
implementation 'androidx.compose.material:material-icons-extended:1.6.4'
implementation 'androidx.compose.material:material-icons-extended:1.6.6'
// Room database
implementation "androidx.room:room-ktx:$room_version"
ksp "androidx.room:room-compiler:$room_version"
Expand All @@ -112,7 +112,7 @@ dependencies {
ksp "com.google.dagger:hilt-android-compiler:$hilt_version"
ksp "androidx.hilt:hilt-compiler:1.2.0"
// DataStore Preferences.
implementation("androidx.datastore:datastore-preferences:1.0.0")
implementation("androidx.datastore:datastore-preferences:1.1.0")
// Gson JSON parser.
implementation 'com.google.code.gson:gson:2.10.1'
// Coil Image loading library.
Expand All @@ -124,12 +124,12 @@ dependencies {
// Tap-target compose.
implementation "com.pierfrancescosoffritti.taptargetcompose:core:1.1.1"
// Lottie animations.
implementation "com.airbnb.android:lottie-compose:4.1.0"
implementation "com.airbnb.android:lottie-compose:6.4.0"
// Bio-metric authentication.
implementation "androidx.biometric:biometric:1.1.0"
// Open Source Libraries Screen.
implementation "com.mikepenz:aboutlibraries-core:10.5.2"
implementation "com.mikepenz:aboutlibraries-compose:10.5.2"
implementation "com.mikepenz:aboutlibraries-core:11.1.3"
implementation "com.mikepenz:aboutlibraries-compose:11.1.3"
// Crash Handler.
implementation 'cat.ereza:customactivityoncrash:2.4.0'
// Oreo back-ports for API 24 (N)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ fun DWScreen(goalId: String, transactionTypeName: String, navController: NavCont

LottieAnimation(
composition = compositionResult.value,
progress = progressAnimation,
progress = { progressAnimation },
modifier = Modifier
.size(280.dp)
.padding(top = 28.dp),
Expand Down Expand Up @@ -345,7 +345,7 @@ private fun TransactionAddedAnimation(transactionType: TransactionType) {

LottieAnimation(
composition = compositionResult.value,
progress = progressAnimation,
progress = { progressAnimation },
modifier = Modifier.size(320.dp)
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ private fun HomeScreenContent(

LottieAnimation(
composition = compositionResult.value,
progress = progressAnimation,
progress = { progressAnimation },
modifier = Modifier.size(320.dp),
enableMergePaths = true
)
Expand Down Expand Up @@ -549,7 +549,7 @@ private fun NoGoalAnimation() {

LottieAnimation(
composition = compositionResult.value,
progress = progressAnimation,
progress = { progressAnimation },
modifier = Modifier.size(335.dp),
enableMergePaths = true
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ fun GoalInfoScreen(goalId: String, navController: NavController) {

LottieAnimation(
composition = compositionResult.value,
progress = progressAnimation,
progress = { progressAnimation },
modifier = Modifier.size(320.dp),
enableMergePaths = true
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,7 @@ private fun GoalAddedOREditedAnimation(editGoalId: String?) {

LottieAnimation(
composition = compositionResult.value,
progress = progressAnimation,
progress = { progressAnimation },
modifier = Modifier.size(320.dp)
)
val textStr = if (editGoalId == null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ fun CongratsScreen(navController: NavController) {

LottieAnimation(
composition = compositionResult.value,
progress = progressAnimation,
progress = { progressAnimation },
modifier = Modifier.size(360.dp),
enableMergePaths = true
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ sealed class AboutLinks(val url: String) {

data object GithubIssues : AboutLinks("https://github.com/Pool-Of-Tears/GreenStash/issues")
data object Telegram : AboutLinks("https://t.me/PotApps")
data object Sponser : AboutLinks("https://github.com/sponsors/starry-shivam")
data object Sponsor : AboutLinks("https://github.com/sponsors/starry-shivam")
}


Expand Down Expand Up @@ -137,7 +137,7 @@ fun AboutScreen(navController: NavController) {
SettingsItem(title = stringResource(id = R.string.about_support_title),
description = stringResource(id = R.string.about_support_desc),
icon = Icons.Filled.Favorite,
onClick = { openWebLink(context, AboutLinks.Sponser.url) }
onClick = { openWebLink(context, AboutLinks.Sponsor.url) }
)
}
item {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ fun WelcomeScreen(navController: NavController) {
Box(modifier = Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {
LottieAnimation(
composition = compositionResult.value,
progress = progressAnimation,
progress = { progressAnimation },
modifier = Modifier.size(320.dp),
enableMergePaths = true
)
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
ext {
kotlin_version = '1.9.22'
kotlin_version = '1.9.23'
gradle_version = '8.3.2'
hilt_version = '2.49'
room_version = '2.6.1'
Expand All @@ -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.22-1.0.17' apply false
id 'com.google.devtools.ksp' version '1.9.23-1.0.20' apply false
}

0 comments on commit 9f779cb

Please sign in to comment.