Skip to content

Commit 331cdb9

Browse files
chore: Update dependencies and Kotlin version (#264)
* Update dependencies and Kotlin version * Fix depreciations --------- Signed-off-by: starry-shivam <starry@krsh.dev>
1 parent db8be8e commit 331cdb9

File tree

9 files changed

+38
-32
lines changed

9 files changed

+38
-32
lines changed

app/build.gradle

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@ 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 "12.2.4"
8+
id "com.mikepenz.aboutlibraries.plugin.android" version "13.1.0"
99
}
1010

11-
apply plugin: 'com.mikepenz.aboutlibraries.plugin'
12-
1311
String getGoogleApiKey() {
1412
def propFile = rootProject.file("./local.properties")
1513
def properties = new Properties()
@@ -84,26 +82,33 @@ android {
8482
androidResources {
8583
generateLocaleConfig true
8684
}
85+
86+
packaging {
87+
resources {
88+
pickFirsts += ['META-INF/versions/9/OSGI-INF/MANIFEST.MF']
89+
}
90+
}
8791
}
8892

8993
aboutLibraries {
90-
// Remove the "generated" timestamp to allow for reproducible builds
91-
excludeFields = ["generated"]
94+
export {
95+
// Remove the "generated" timestamp to allow for reproducible builds
96+
excludeFields.addAll("generated")
97+
}
9298
}
9399

94-
95100
dependencies {
96-
def composeBom = platform('androidx.compose:compose-bom:2025.08.01')
101+
def composeBom = platform('androidx.compose:compose-bom:2025.11.00')
97102
implementation composeBom
98103
androidTestImplementation composeBom
99104

100105
// Android core components.
101106
implementation 'androidx.core:core-ktx:1.17.0'
102-
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.9.3'
103-
implementation 'androidx.activity:activity-compose:1.10.1'
104-
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.3"
107+
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.9.4'
108+
implementation 'androidx.activity:activity-compose:1.11.0'
109+
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.4"
105110
// TODO: Migrate to type-safe navigation.
106-
implementation "androidx.navigation:navigation-compose:2.9.3"
111+
implementation "androidx.navigation:navigation-compose:2.9.6"
107112
// Jetpack compose.
108113
implementation "androidx.compose.ui:ui"
109114
implementation "androidx.compose.ui:ui-tooling-preview"
@@ -116,13 +121,13 @@ dependencies {
116121
// Material theme for main activity.
117122
implementation 'com.google.android.material:material:1.13.0'
118123
// Android 12+ splash API.
119-
implementation 'androidx.core:core-splashscreen:1.0.1'
124+
implementation 'androidx.core:core-splashscreen:1.2.0'
120125
// KotlinX Serialization library.
121126
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0"
122127
implementation "org.jetbrains.kotlinx:kotlinx-serialization-protobuf:1.9.0"
123128
// OkHttp library.
124-
implementation "com.squareup.okhttp3:okhttp:5.1.0"
125-
implementation "com.squareup.okhttp3:logging-interceptor:5.1.0"
129+
implementation "com.squareup.okhttp3:okhttp:5.3.0"
130+
implementation "com.squareup.okhttp3:logging-interceptor:5.3.0"
126131
// Coil Image loading library.
127132
implementation "io.coil-kt:coil-compose:2.7.0"
128133
// Room database components.
@@ -131,34 +136,35 @@ dependencies {
131136
ksp "androidx.room:room-compiler:$room_version"
132137
androidTestImplementation "androidx.room:room-testing:$room_version"
133138
// Dagger - Hilt.
139+
//noinspection NewerVersionAvailable
134140
implementation "com.google.dagger:hilt-android:$hilt_version"
135-
implementation "androidx.hilt:hilt-navigation-compose:1.2.0"
141+
implementation "androidx.hilt:hilt-navigation-compose:1.3.0"
136142
ksp "com.google.dagger:hilt-android-compiler:$hilt_version"
137-
ksp "androidx.hilt:hilt-compiler:1.2.0"
143+
ksp "androidx.hilt:hilt-compiler:1.3.0"
138144
// Jsoup HTML Parser.
139145
implementation "org.jsoup:jsoup:1.21.2"
140146
// Lottie animations.
141-
implementation "com.airbnb.android:lottie-compose:6.6.7"
147+
implementation "com.airbnb.android:lottie-compose:6.7.1"
142148
// TapTarget Compose
143149
implementation "com.pierfrancescosoffritti.taptargetcompose:core:1.2.1"
144150
// DataStore Preferences.
145151
implementation("androidx.datastore:datastore-preferences:1.1.7")
146152
// Open Source Libraries Screen.
147-
implementation "com.mikepenz:aboutlibraries-core:12.2.4"
148-
implementation "com.mikepenz:aboutlibraries-compose-m3:12.2.4"
153+
implementation "com.mikepenz:aboutlibraries-core:13.1.0"
154+
implementation "com.mikepenz:aboutlibraries-compose-m3:13.1.0"
149155
// Swipe actions.
150156
implementation "me.saket.swipe:swipe:1.3.0"
151157
// Crash Handler.
152158
implementation 'cat.ereza:customactivityoncrash:2.4.0'
153159
// Kotlin reflect API.
154-
implementation "org.jetbrains.kotlin:kotlin-reflect:2.1.20"
160+
implementation "org.jetbrains.kotlin:kotlin-reflect:2.2.0"
155161
// Testing components.
156162
testImplementation 'junit:junit:4.13.2'
157-
testImplementation "com.google.truth:truth:1.4.4"
163+
testImplementation "com.google.truth:truth:1.4.5"
158164
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2'
159-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.13.4'
165+
testImplementation 'org.junit.jupiter:junit-jupiter-api:6.0.1'
160166
testImplementation 'org.robolectric:robolectric:4.16'
161-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.13.4'
167+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:6.0.1'
162168
// Android testing components.
163169
androidTestImplementation 'androidx.test.ext:junit:1.3.0'
164170
androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'

app/src/main/java/com/starry/myne/helpers/book/BookUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ object BookUtils {
6666
* @return String representation of the languages.
6767
*/
6868
fun getLanguagesAsString(languages: List<String>): String {
69-
return languages.joinToString(", ") { Locale(it).displayLanguage }
69+
return languages.joinToString(", ") { Locale.forLanguageTag(it).displayLanguage }
7070
}
7171

7272
/**

app/src/main/java/com/starry/myne/ui/screens/categories/composables/CategoryDetailScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import androidx.compose.ui.Alignment
4141
import androidx.compose.ui.Modifier
4242
import androidx.compose.ui.res.stringResource
4343
import androidx.compose.ui.unit.dp
44-
import androidx.hilt.navigation.compose.hiltViewModel
44+
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
4545
import androidx.navigation.NavController
4646
import com.starry.myne.R
4747
import com.starry.myne.helpers.NetworkObserver

app/src/main/java/com/starry/myne/ui/screens/detail/composables/BookDetailScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ import androidx.compose.ui.text.font.FontWeight
7272
import androidx.compose.ui.tooling.preview.Preview
7373
import androidx.compose.ui.unit.dp
7474
import androidx.compose.ui.unit.sp
75-
import androidx.hilt.navigation.compose.hiltViewModel
75+
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
7676
import androidx.navigation.NavController
7777
import androidx.navigation.compose.rememberNavController
7878
import com.airbnb.lottie.compose.LottieAnimation

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ import androidx.compose.ui.text.input.ImeAction
7676
import androidx.compose.ui.tooling.preview.Preview
7777
import androidx.compose.ui.unit.dp
7878
import androidx.compose.ui.unit.sp
79-
import androidx.hilt.navigation.compose.hiltViewModel
79+
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
8080
import androidx.navigation.NavController
8181
import androidx.navigation.compose.currentBackStackEntryAsState
8282
import androidx.navigation.compose.rememberNavController

app/src/main/java/com/starry/myne/ui/screens/library/composables/LibraryScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ import androidx.compose.ui.tooling.preview.Preview
8989
import androidx.compose.ui.unit.dp
9090
import androidx.compose.ui.unit.sp
9191
import androidx.core.content.FileProvider
92-
import androidx.hilt.navigation.compose.hiltViewModel
92+
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
9393
import androidx.lifecycle.viewModelScope
9494
import androidx.navigation.NavController
9595
import com.psoffritti.taptargetcompose.TapTargetCoordinator

app/src/main/java/com/starry/myne/ui/screens/reader/detail/ReaderDetailScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ import androidx.compose.ui.text.font.FontWeight
5656
import androidx.compose.ui.tooling.preview.Preview
5757
import androidx.compose.ui.unit.dp
5858
import androidx.compose.ui.unit.sp
59-
import androidx.hilt.navigation.compose.hiltViewModel
59+
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
6060
import androidx.navigation.NavController
6161
import androidx.navigation.compose.rememberNavController
6262
import coil.annotation.ExperimentalCoilApi

app/src/main/java/com/starry/myne/ui/screens/welcome/composables/WelcomeScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ import androidx.compose.ui.text.style.TextAlign
5959
import androidx.compose.ui.tooling.preview.Preview
6060
import androidx.compose.ui.unit.dp
6161
import androidx.compose.ui.unit.sp
62-
import androidx.hilt.navigation.compose.hiltViewModel
62+
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
6363
import androidx.navigation.NavController
6464
import coil.compose.AsyncImage
6565
import com.airbnb.lottie.compose.LottieAnimation

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
buildscript {
22
ext {
3-
kotlin_version = '2.2.0'
3+
kotlin_version = '2.2.21'
44
gradle_version = '8.11.1'
55
hilt_version = '2.57.1'
66
room_version = '2.7.1'
@@ -25,6 +25,6 @@ plugins {
2525
id 'com.android.library' version "$gradle_version" apply false
2626
id 'org.jetbrains.kotlin.android' version "$kotlin_version" apply false
2727
id 'org.jetbrains.kotlin.plugin.compose' version "$kotlin_version" apply false
28-
id 'com.google.devtools.ksp' version '2.2.0-2.0.2' apply false
28+
id 'com.google.devtools.ksp' version '2.2.21-2.0.4' apply false
2929
id 'org.jetbrains.kotlin.plugin.serialization' version "$kotlin_version" apply false
3030
}

0 commit comments

Comments
 (0)