Skip to content

Commit 232a4f9

Browse files
authored
Update dependencies (#3)
* Update dependencies * Bump kotlin * Bump compose jb
1 parent 1395a1e commit 232a4f9

File tree

8 files changed

+39
-37
lines changed

8 files changed

+39
-37
lines changed

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ build/
55
!**/src/test/**/build/
66

77
### IntelliJ IDEA ###
8+
.idea
89
.idea/
910
.idea/modules.xml
1011
.idea/jarRepositories.xml

Diff for: app/build.gradle.kts

+3-6
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@ plugins {
2121
}
2222

2323
compose {
24-
kotlinCompilerPlugin = dependencies.compiler.forKotlin("1.9.0")
25-
kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.10")
24+
kotlinCompilerPlugin.set(dependencies.compiler.forKotlin(libs.versions.kotlin.get()))
2625
}
2726

28-
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
27+
2928
kotlin {
30-
targetHierarchy.default()
29+
applyDefaultHierarchyTemplate()
3130
explicitApi()
3231

3332
jvm("desktop")
@@ -141,6 +140,4 @@ compose {
141140
macOS.bundleID = "dev.kadirkid.rickandmorty.app"
142141
}
143142
}
144-
145-
experimental.web.application {}
146143
}

Diff for: core/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ plugins {
1818
alias(libs.plugins.android.library)
1919
}
2020

21-
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
21+
2222
kotlin {
23-
targetHierarchy.default()
23+
applyDefaultHierarchyTemplate()
2424
explicitApi()
2525

2626
jvm("desktop")

Diff for: design/build.gradle.kts

+3-4
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@ plugins {
2020
}
2121

2222
compose {
23-
kotlinCompilerPlugin = dependencies.compiler.forKotlin("1.9.0")
24-
kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.10")
23+
kotlinCompilerPlugin.set(dependencies.compiler.forKotlin(libs.versions.kotlin.get()))
2524
}
2625

27-
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
26+
2827
kotlin {
29-
targetHierarchy.default()
28+
applyDefaultHierarchyTemplate()
3029
explicitApi()
3130

3231
jvm("desktop")

Diff for: gradle/libs.versions.toml

+24-19
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,38 @@
22
compileSdk = "34"
33
minSdk = "24"
44
targetSdk = "33"
5-
agp = "8.1.2"
6-
kotlin = "1.9.10"
7-
activity-compose = "1.7.2"
8-
activity-androidx = "1.7.2"
9-
androidx-material = "1.5.1"
5+
agp = "8.1.4"
6+
kotlin = "1.9.24"
7+
activity-compose = "1.9.0"
8+
activity-androidx = "1.9.0"
9+
androidx-material = "1.6.7"
1010
apollo = "3.8.2"
1111
coil-compose = "2.4.0"
12-
foundation = "1.5.1"
13-
core-ktx = "1.12.0"
14-
coroutines = "1.7.3"
12+
foundation = "1.6.7"
13+
core-ktx = "1.13.1"
14+
coroutines = "1.8.1"
1515
junit = "4.13.2"
1616
androidx-test-ext-junit = "1.1.5"
17+
#androidx-paging3 = "3.3.0"
1718
espresso-core = "3.5.1"
1819
appcompat = "1.6.1"
19-
kotlinx-datetime = "0.4.1"
20-
kotlinx-serialization = "1.6.0"
21-
ktor = "2.3.4"
22-
material = "1.9.0"
23-
compose = "1.5.1"
24-
lifecycle = "2.6.2"
25-
compose-bom = "2023.09.00"
26-
compose-compiler = "1.5.3"
27-
compose-jb = "1.5.1"
20+
kotlinx-datetime = "0.5.0"
21+
kotlinx-serialization = "1.6.3"
22+
ktor = "2.3.8"
23+
material = "1.12.0"
24+
compose = "1.6.7"
25+
lifecycle = "2.8.0"
26+
compose-bom = "2024.05.00"
27+
compose-compiler = "1.5.14"
28+
compose-jb = "1.6.10"
2829
koin = "3.5.0"
2930
koinCompose = "3.4.6"
30-
poko = "0.15.0"
31+
poko = "0.15.2"
3132
spotless = "6.21.0"
3233
jvm = "17"
3334
jvmTarget = "11" # R8 Java 17 support pending, https://issuetracker.google.com/issues/227160052
3435
ktlint = "0.50.0"
35-
cashapp-paging = "3.3.0-alpha02-0.4.0"
36+
cashapp-paging = "3.3.0-alpha02-0.5.1"
3637
arrow = "1.2.0"
3738

3839
[libraries]
@@ -105,6 +106,9 @@ koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
105106
koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" }
106107
koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koinCompose" }
107108

109+
#androidx-paging-common = { module = "androidx.paging:paging-common", version.ref = "androidx-paging3" }
110+
#androidx-paging-common-compose = { module = "androidx.paging:paging-compose", version.ref = "androidx-paging3" }
111+
108112
paging-common = { module = "app.cash.paging:paging-common", version.ref = "cashapp-paging" }
109113
paging-common-compose = { module = "app.cash.paging:paging-compose-common", version.ref = "cashapp-paging" }
110114

@@ -113,6 +117,7 @@ arrow-core = { module = "io.arrow-kt:arrow-core", version.ref = "arrow" }
113117
arrow-coroutines = { module = "io.arrow-kt:arrow-fx-coroutines", version.ref = "arrow" }
114118

115119
[bundles]
120+
#androidx-paging = ["androidx-paging-common", "androidx-paging-common-compose"]
116121
paging = ["paging-common", "paging-common-compose"]
117122

118123
[plugins]

Diff for: service-api/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ plugins {
2121
alias(libs.plugins.poko)
2222
}
2323

24-
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
24+
2525
kotlin {
26-
targetHierarchy.default()
26+
applyDefaultHierarchyTemplate()
2727
explicitApi()
2828

2929
jvm("desktop")

Diff for: service/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ apollo {
3131
}
3232
}
3333

34-
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
34+
3535
kotlin {
36-
targetHierarchy.default()
36+
applyDefaultHierarchyTemplate()
3737
explicitApi()
3838

3939
jvm("desktop")

Diff for: util/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ plugins {
1919
alias(libs.plugins.android.library)
2020
}
2121

22-
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
22+
2323
kotlin {
24-
targetHierarchy.default()
24+
applyDefaultHierarchyTemplate()
2525
explicitApi()
2626

2727
jvm("desktop")

0 commit comments

Comments
 (0)