Skip to content

Commit c888864

Browse files
committed
Update project
1 parent c501154 commit c888864

File tree

6 files changed

+11
-6
lines changed

6 files changed

+11
-6
lines changed

androidApp/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import com.google.firebase.appdistribution.gradle.AppDistributionExtension
22
import org.apache.commons.io.output.ByteArrayOutputStream
33
import org.jetbrains.kotlin.konan.properties.Properties
44
import java.io.FileInputStream
5+
import java.nio.charset.Charset
56

67
@Suppress("dsl_scope_violation")
78

@@ -19,7 +20,7 @@ private val gitCommitsCount by lazy {
1920
commandLine("git", "rev-list", "--count", "HEAD")
2021
standardOutput = stdout
2122
}
22-
stdout.toString().trim().toInt()
23+
stdout.toString(Charset.defaultCharset()).trim().toInt()
2324
}
2425

2526
val currentTime by lazy {

core/common/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ kotlin {
5454
api(libs.bundles.koin.android)
5555
implementation(libs.bundles.appcompat.android)
5656
implementation(libs.bundles.browser.android)
57-
implementation(libs.bundles.paging.common)
57+
implementation(libs.bundles.paging.android)
5858
}
5959
jvmMain.dependencies {
6060
api(libs.bundles.kotlinx.coroutines.desktop)

core/ui/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ kotlin {
3939
api(libs.bundles.coil.android)
4040
api(libs.bundles.compose.android)
4141
api(libs.bundles.google.material.android)
42-
implementation(libs.bundles.paging.common)
42+
implementation(libs.bundles.paging.android)
4343
}
4444
jvmMain.dependencies {
4545
api(compose.desktop.common)

feature/feed-impl/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ kotlin {
2525
implementation(project(":core:notifications"))
2626
}
2727
androidMain.dependencies {
28-
implementation(libs.bundles.paging.common)
28+
implementation(libs.bundles.paging.android)
2929
}
3030
}
3131

feature/search-impl/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ kotlin {
2424
implementation(project(":core:notifications"))
2525
}
2626
androidMain.dependencies {
27-
implementation(libs.bundles.paging.common)
27+
implementation(libs.bundles.paging.android)
2828
}
2929
}
3030

gradle/libs.versions.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-
133133
androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "androidx-lifecycle" }
134134
androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigation" }
135135
androidx-palette-ktx = { module = "androidx.palette:palette-ktx", version.ref = "androidx-palette-ktx" }
136+
androidx-paging-common-ktx = { module = "androidx.paging:paging-common-ktx", version.ref = "androidx-paging" }
136137
androidx-paging-compose = { module = "androidx.paging:paging-compose", version.ref = "androidx-paging" }
137138
androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "androidx-room" }
138139
androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "androidx-room" }
@@ -210,7 +211,7 @@ lifecycle-common = [
210211
# "androidx-lifecycle-viewmodel"
211212
]
212213
paging-common = [
213-
"androidx-paging-compose"
214+
"androidx-paging-common-ktx"
214215
]
215216
room-common = [
216217
"androidx-room-runtime",
@@ -303,6 +304,9 @@ lifecycle-android = [
303304
navigation-android = [
304305
"androidx-navigation-compose"
305306
]
307+
paging-android = [
308+
"androidx-paging-compose"
309+
]
306310
palette-android = [
307311
"androidx-palette-ktx"
308312
]

0 commit comments

Comments
 (0)