Skip to content

Commit b4cf2ff

Browse files
committed
Clean and update dependencies
1 parent 10e097e commit b4cf2ff

File tree

3 files changed

+32
-49
lines changed

3 files changed

+32
-49
lines changed

app/build.gradle.kts

+18-17
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
* Copyright 2024 HyperDevs
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
plugins {
218
alias(libs.plugins.android.application)
319
alias(libs.plugins.kotlin.android)
@@ -26,7 +42,7 @@ android {
2642
}
2743

2844
composeOptions {
29-
kotlinCompilerExtensionVersion = "1.5.11"
45+
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
3046
}
3147

3248
buildTypes {
@@ -48,11 +64,6 @@ android {
4864
lint {
4965
abortOnError = false
5066
}
51-
52-
configurations.configureEach {
53-
// This library is included with two different versions
54-
resolutionStrategy.force("com.google.code.findbugs:jsr305:3.0.1")
55-
}
5667
}
5768

5869
dependencies {
@@ -72,22 +83,12 @@ dependencies {
7283
// Support
7384
implementation(libs.bundles.androidx)
7485
implementation(libs.bundles.compose)
75-
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
76-
77-
implementation("com.google.android.material:material:1.6.1")
78-
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
7986
implementation(libs.androidx.activity)
80-
implementation(libs.androidx.fragment)
81-
8287
implementation(libs.bundles.androidx.lifecycle)
8388

84-
// Misc
85-
implementation("com.github.minikorp:grove:1.0.3")
86-
8789
// Test
8890
testImplementation(libs.junit)
8991
androidTestImplementation(libs.androidx.test.runner)
9092
androidTestImplementation(libs.espresso)
91-
androidTestImplementation("androidx.test.ext:junit:1.1.3")
92-
androidTestImplementation("com.agoda.kakao:kakao:2.4.0")
93+
androidTestImplementation(libs.androidx.test.junit)
9394
}

gradle/libs.versions.toml

+14-29
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,25 @@ kodein = "7.21.2"
1515

1616
android-library = "4.1.1.4"
1717
androidx-activity = "1.9.0"
18-
androidx-fragment = "1.8.0"
18+
androidx-fragment = "1.8.1"
1919
androidx-appcompat = "1.7.0"
2020
androidx-lifecycle = "2.8.2"
2121

22-
compose-compiler = "1.5.11"
22+
compose-compiler = "1.5.14"
2323
compose-foundation = "1.6.8"
2424
compose-material = "1.6.8"
2525
compose-runtime = "1.6.8"
2626
compose-ui = "1.6.8"
27+
compose-material3 = "1.2.1"
28+
compose-navigation = "2.7.7"
2729

28-
kotlinpoet = "1.15.3"
30+
kotlinpoet = "1.17.0"
2931
incap = "1.0.0"
3032

31-
espresso = "3.5.1"
32-
mockito = "5.12.0"
33-
kluent = "1.68"
33+
espresso = "3.6.1"
34+
kluent = "1.72"
3435

35-
androidGradlePlugin = "8.2.2"
36+
androidGradlePlugin = "8.5.0"
3637

3738
[libraries]
3839
android-library = { group = "com.google.android", name = "android", version.ref = "android-library" }
@@ -55,18 +56,13 @@ androidx-lifecycle-livedata = { group = "androidx.lifecycle", name = "lifecycle-
5556
androidx-annotation = { group = "androidx.annotation", name = "annotation", version = "1.8.0" }
5657
androidx-webkit = { group = "androidx.webkit", name = "webkit", version = "1.11.0" }
5758
androidx-activity = { group = "androidx.activity", name = "activity-ktx", version.ref = "androidx-activity" }
58-
androidx-fragment = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "androidx-fragment" }
5959
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidx-activity" }
60-
androidx-browser = { group = "androidx.browser", name = "browser", version = "1.8.0" }
61-
androidx-test-junit = { group = "androidx.test.ext", name = "junit", version = "1.1.5" }
62-
androidx-test-runner = { group = "androidx.test", name = "runner", version = "1.5.2" }
63-
androidx-arch-core-testing = { group = "androidx.arch.core", name = "core-testing", version = "2.2.0" }
64-
androidx-preference = { group = "androidx.preference", name = "preference", version = "1.2.1" }
60+
androidx-fragment = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "androidx-fragment" }
61+
androidx-test-junit = { group = "androidx.test.ext", name = "junit", version = "1.2.1" }
62+
androidx-test-runner = { group = "androidx.test", name = "runner", version = "1.6.1" }
6563

6664
kodein-jvm = { group = "org.kodein.di", name = "kodein-di-jvm", version.ref = "kodein" }
67-
kodein-conf-jvm = { group = "org.kodein.di", name = "kodein-di-conf-jvm", version.ref = "kodein" }
6865
kodein-framework-androidx = { group = "org.kodein.di", name = "kodein-di-framework-android-x", version.ref = "kodein" }
69-
kodein-framework-compose = { group = "org.kodein.di", name = "kodein-di-framework-android-x-compose", version.ref = "kodein" }
7066

7167
compose-runtime = { group = "androidx.compose.runtime", name = "runtime", version.ref = "compose-runtime" }
7268
compose-runtime-livedata = { group = "androidx.compose.runtime", name = "runtime-livedata", version.ref = "compose-runtime" }
@@ -76,10 +72,8 @@ compose-ui-util = { group = "androidx.compose.ui", name = "ui-util", version.ref
7672
compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "compose-foundation" }
7773
compose-material = { group = "androidx.compose.material", name = "material", version.ref = "compose-material" }
7874
compose-materialicons = { group = "androidx.compose.material", name = "material-icons-core", version.ref = "compose-material" }
79-
compose-navigation = { group = "androidx.navigation", name = "navigation-compose", version = "2.7.7" }
80-
compose-material3 = { group = "androidx.compose.material3", name = "material3", version = "1.2.1" }
81-
compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4", version.ref = "compose-ui" }
82-
compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest", version.ref = "compose-ui" }
75+
compose-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "compose-navigation" }
76+
compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "compose-material3" }
8377

8478
androidgitversion = { group = "com.gladed.androidgitversion", name = "gradle-android-git-version", version = "0.4.14" }
8579

@@ -89,18 +83,9 @@ kotlinpoet-ksp = { group = "com.squareup", name = "kotlinpoet-ksp", version.ref
8983
incap = { group = "net.ltgt.gradle.incap", name = "incap", version.ref = "incap" }
9084
incap-processor = { group = "net.ltgt.gradle.incap", name = "incap-processor", version.ref = "incap" }
9185

92-
google-auto = { group = "com.google.auto", name = "auto-common", version = "1.2.2" }
93-
google-testing-compile = { group = "com.google.testing.compile", name = "compile-testing", version = "0.21.0" }
9486
google-ksp-symbolprocessing = { group = "com.google.devtools.ksp", name = "symbol-processing-api", version.ref = "ksp" }
9587

9688
espresso = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso" }
97-
espresso-contrib = { group = "androidx.test.espresso", name = "espresso-contrib", version.ref = "espresso" }
98-
espresso-intents = { group = "androidx.test.espresso", name = "espresso-intents", version.ref = "espresso" }
99-
espresso-web = { group = "androidx.test.espresso", name = "espresso-web", version.ref = "espresso" }
100-
101-
mockito = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
102-
mockito-android = { group = "org.mockito", name = "mockito-android", version.ref = "mockito" }
103-
mockito-kotlin = { group = "com.nhaarman.mockitokotlin2", name = "mockito-kotlin", version = "2.2.0" }
10489

10590
junit = { group = "junit", name = "junit", version = "4.13.2" }
10691
kluent = { group = "org.amshove.kluent", name = "kluent", version.ref = "kluent" }
@@ -124,5 +109,5 @@ versions = { id = "com.github.ben-manes.versions", version = "0.51.0" }
124109
androidx-lifecycle = ["androidx-lifecycle-runtime", "androidx-lifecycle-viewmodel", "androidx-lifecycle-livedata", "androidx-lifecycle-viewmodel-savedstate"]
125110
kotlinpoet = ["kotlinpoet", "kotlinpoet-ksp"]
126111

127-
androidx = ["androidx-appcompat", "androidx-appcompat-resources", "androidx-core", "androidx-core-splashscreen", "androidx-lifecycle-runtime", "androidx-lifecycle-viewmodel", "androidx-lifecycle-livedata", "androidx-lifecycle-runtime-compose", "androidx-annotation", "androidx-webkit", "androidx-activity", "androidx-activity-compose", "androidx-preference"]
112+
androidx = ["androidx-appcompat", "androidx-appcompat-resources", "androidx-core", "androidx-core-splashscreen", "androidx-lifecycle-runtime", "androidx-lifecycle-viewmodel", "androidx-lifecycle-livedata", "androidx-lifecycle-runtime-compose", "androidx-annotation", "androidx-webkit", "androidx-activity", "androidx-activity-compose"]
128113
compose = ["compose-runtime", "compose-runtime-livedata", "compose-ui", "compose-ui-tooling", "compose-ui-util", "compose-foundation", "compose-material", "compose-materialicons", "compose-navigation", "compose-material3"]

mini-processor/build.gradle.kts

-3
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,11 @@ dependencies {
2525
implementation(libs.kotlin.stdlib)
2626
implementation(libs.bundles.kotlinpoet)
2727

28-
implementation(libs.google.auto)
29-
3028
// Lib to add incremental annotation processing
3129
compileOnly(libs.incap)
3230
kapt(libs.incap.processor)
3331

3432
testImplementation(libs.junit)
35-
testImplementation(libs.google.testing.compile)
3633

3734
implementation(libs.google.ksp.symbolprocessing)
3835
}

0 commit comments

Comments
 (0)