Skip to content

Commit fd9b794

Browse files
feat: Update Target SDK to Android 16 (36) (#180)
While at that also update AGP and dependencies Signed-off-by: starry-shivam <[email protected]>
1 parent 8b96085 commit fd9b794

File tree

21 files changed

+67
-60
lines changed

21 files changed

+67
-60
lines changed

.idea/copilot.data.migration.agent.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/copilot.data.migration.edit.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ plugins {
55
id 'dagger.hilt.android.plugin'
66
id 'com.google.devtools.ksp'
77
id 'org.jetbrains.kotlin.plugin.serialization'
8-
id "com.mikepenz.aboutlibraries.plugin" version "11.1.3"
8+
id "com.mikepenz.aboutlibraries.plugin" version "12.2.4"
99
}
1010

1111
apply plugin: 'com.mikepenz.aboutlibraries.plugin'
1212

1313
android {
1414
namespace 'com.starry.greenstash'
15-
compileSdk 35
15+
compileSdk = 36
1616

1717
defaultConfig {
1818
applicationId "com.starry.greenstash"
1919
minSdk 24
20-
targetSdk 35
20+
targetSdk 36
2121
versionCode 394
2222
versionName "3.9.4"
2323

@@ -80,18 +80,18 @@ aboutLibraries {
8080

8181
dependencies {
8282

83-
def composeBom = platform('androidx.compose:compose-bom:2025.06.01')
83+
def composeBom = platform('androidx.compose:compose-bom:2025.09.00')
8484
implementation composeBom
8585
androidTestImplementation composeBom
8686

8787
// Android core components.
88-
implementation 'androidx.core:core-ktx:1.16.0'
88+
implementation 'androidx.core:core-ktx:1.17.0'
8989
implementation 'androidx.appcompat:appcompat:1.7.1'
90-
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.9.1'
91-
implementation 'androidx.activity:activity-compose:1.10.1'
92-
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.1"
93-
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1"
94-
implementation "androidx.navigation:navigation-compose:2.9.0"
90+
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.9.3'
91+
implementation 'androidx.activity:activity-compose:1.11.0'
92+
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.9.3"
93+
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.3"
94+
implementation "androidx.navigation:navigation-compose:2.9.4"
9595
// Jetpack compose.
9696
implementation "androidx.compose.ui:ui"
9797
implementation "androidx.compose.ui:ui-tooling-preview"
@@ -100,7 +100,7 @@ dependencies {
100100
implementation "androidx.compose.runtime:runtime-livedata"
101101
implementation "androidx.compose.material3:material3"
102102
// Material theme for main activity.
103-
implementation 'com.google.android.material:material:1.12.0'
103+
implementation 'com.google.android.material:material:1.13.0'
104104
// Android 12+ splash API.
105105
implementation 'androidx.core:core-splashscreen:1.0.1'
106106
// Material icons.
@@ -111,36 +111,36 @@ dependencies {
111111
androidTestImplementation "androidx.room:room-testing:$room_version"
112112
// Dagger - Hilt.
113113
implementation "com.google.dagger:hilt-android:$hilt_version"
114-
implementation "androidx.hilt:hilt-navigation-compose:1.2.0"
114+
implementation "androidx.hilt:hilt-navigation-compose:1.3.0"
115115
ksp "com.google.dagger:hilt-android-compiler:$hilt_version"
116-
ksp "androidx.hilt:hilt-compiler:1.2.0"
116+
ksp "androidx.hilt:hilt-compiler:1.3.0"
117117
// DataStore Preferences.
118118
implementation("androidx.datastore:datastore-preferences:1.1.7")
119119
// Kotlin Serialization.
120-
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3"
120+
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0"
121121
// Coil Image loading library.
122-
implementation "io.coil-kt:coil-compose:2.6.0"
122+
implementation "io.coil-kt:coil-compose:2.7.0"
123123
// Material 3 calender / Date picker.
124124
implementation 'com.maxkeppeler.sheets-compose-dialogs:core:1.3.0'
125125
implementation 'com.maxkeppeler.sheets-compose-dialogs:calendar:1.3.0'
126126
implementation 'com.maxkeppeler.sheets-compose-dialogs:date-time:1.3.0'
127127
// Tap-target compose.
128-
implementation "com.pierfrancescosoffritti.taptargetcompose:core:1.1.2"
128+
implementation "com.pierfrancescosoffritti.taptargetcompose:core:1.2.1"
129129
// Lottie animations.
130-
implementation "com.airbnb.android:lottie-compose:6.4.0"
130+
implementation "com.airbnb.android:lottie-compose:6.6.7"
131131
// Bio-metric authentication.
132132
implementation "androidx.biometric:biometric:1.1.0"
133133
// Open Source Libraries Screen.
134-
implementation "com.mikepenz:aboutlibraries-core:11.1.3"
135-
implementation "com.mikepenz:aboutlibraries-compose:11.1.3"
134+
implementation "com.mikepenz:aboutlibraries-core:12.2.4"
135+
implementation "com.mikepenz:aboutlibraries-compose-m3:12.2.4"
136136
// Crash Handler.
137137
implementation 'cat.ereza:customactivityoncrash:2.4.0'
138138
// Oreo back-ports for API 24 (N)
139139
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
140140
// Testing components.
141141
testImplementation 'junit:junit:4.13.2'
142-
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
143-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
142+
androidTestImplementation 'androidx.test.ext:junit:1.3.0'
143+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
144144
androidTestImplementation "androidx.compose.ui:ui-test-junit4"
145145
debugImplementation "androidx.compose.ui:ui-tooling"
146146
debugImplementation "androidx.compose.ui:ui-test-manifest"

app/src/main/java/com/starry/greenstash/ui/screens/archive/composables/ArchiveScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ import androidx.compose.ui.platform.LocalView
6363
import androidx.compose.ui.res.stringResource
6464
import androidx.compose.ui.text.style.TextOverflow
6565
import androidx.compose.ui.unit.dp
66-
import androidx.hilt.navigation.compose.hiltViewModel
66+
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
6767
import androidx.navigation.NavController
6868
import com.starry.greenstash.R
6969
import com.starry.greenstash.database.core.GoalWithTransactions

app/src/main/java/com/starry/greenstash/ui/screens/backups/composables/BackupScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ import androidx.compose.ui.res.stringResource
8080
import androidx.compose.ui.res.vectorResource
8181
import androidx.compose.ui.text.style.TextOverflow
8282
import androidx.compose.ui.unit.dp
83-
import androidx.hilt.navigation.compose.hiltViewModel
83+
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
8484
import androidx.navigation.NavController
8585
import coil.compose.AsyncImage
8686
import com.starry.greenstash.R

app/src/main/java/com/starry/greenstash/ui/screens/dwscreen/composables/DWScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ import androidx.compose.ui.text.style.TextOverflow
6969
import androidx.compose.ui.tooling.preview.Preview
7070
import androidx.compose.ui.unit.dp
7171
import androidx.compose.ui.unit.sp
72-
import androidx.hilt.navigation.compose.hiltViewModel
72+
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
7373
import androidx.navigation.NavController
7474
import androidx.navigation.compose.rememberNavController
7575
import com.airbnb.lottie.compose.LottieAnimation

app/src/main/java/com/starry/greenstash/ui/screens/home/composables/HomeScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ import androidx.compose.ui.text.style.TextOverflow
8787
import androidx.compose.ui.tooling.preview.Preview
8888
import androidx.compose.ui.unit.dp
8989
import androidx.compose.ui.unit.sp
90-
import androidx.hilt.navigation.compose.hiltViewModel
90+
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
9191
import androidx.navigation.NavController
9292
import androidx.navigation.compose.rememberNavController
9393
import com.airbnb.lottie.compose.LottieAnimation

app/src/main/java/com/starry/greenstash/ui/screens/info/composables/GoalInfoScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ import androidx.compose.ui.tooling.preview.Preview
8080
import androidx.compose.ui.unit.dp
8181
import androidx.compose.ui.unit.em
8282
import androidx.compose.ui.unit.sp
83-
import androidx.hilt.navigation.compose.hiltViewModel
83+
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
8484
import androidx.navigation.NavController
8585
import androidx.navigation.compose.rememberNavController
8686
import com.airbnb.lottie.compose.LottieAnimation

app/src/main/java/com/starry/greenstash/ui/screens/input/composables/InputScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ import androidx.compose.ui.tooling.preview.Preview
114114
import androidx.compose.ui.unit.dp
115115
import androidx.compose.ui.unit.sp
116116
import androidx.core.app.ActivityCompat
117-
import androidx.hilt.navigation.compose.hiltViewModel
117+
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
118118
import androidx.navigation.NavController
119119
import androidx.navigation.compose.rememberNavController
120120
import coil.compose.AsyncImage

app/src/main/java/com/starry/greenstash/ui/screens/settings/composables/OSLScreen.kt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ import androidx.compose.ui.platform.LocalView
4444
import androidx.compose.ui.res.stringResource
4545
import androidx.compose.ui.text.style.TextOverflow
4646
import androidx.navigation.NavController
47-
import com.mikepenz.aboutlibraries.ui.compose.LibrariesContainer
48-
import com.mikepenz.aboutlibraries.ui.compose.LibraryDefaults
47+
import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer
4948
import com.starry.greenstash.R
5049
import com.starry.greenstash.ui.theme.greenstashFont
5150
import com.starry.greenstash.utils.weakHapticFeedback
@@ -96,12 +95,6 @@ fun OSLScreen(navController: NavController) {
9695
showAuthor = true,
9796
showVersion = true,
9897
showLicenseBadges = true,
99-
colors = LibraryDefaults.libraryColors(
100-
backgroundColor = MaterialTheme.colorScheme.background,
101-
contentColor = MaterialTheme.colorScheme.onBackground,
102-
badgeBackgroundColor = MaterialTheme.colorScheme.primary,
103-
badgeContentColor = MaterialTheme.colorScheme.onPrimary
104-
)
10598
)
10699
}
107100
}

0 commit comments

Comments
 (0)