Skip to content

Commit b42cf74

Browse files
committed
used deps from toml
1 parent 684607e commit b42cf74

File tree

14 files changed

+153
-259
lines changed

14 files changed

+153
-259
lines changed

benchmark/build.gradle.kts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,8 @@ dependencies {
4545
implementation(project(Core))
4646
}
4747

48-
with(Dependencies) {
49-
implementation(libs.androidx.benchmark)
50-
}
51-
52-
with(Dependencies.Test) {
53-
implementation(JUnitExt)
54-
implementation(EspressoCore)
55-
implementation(UiAutomator)
56-
}
48+
implementation(libs.androidx.benchmark)
49+
implementation(libs.bundles.uiTest)
5750
}
5851

5952
androidComponents {

buildSrc/src/main/java/Dependencies.kt

Lines changed: 0 additions & 55 deletions
This file was deleted.

buildSrc/src/main/java/Versions.kt

Lines changed: 0 additions & 24 deletions
This file was deleted.

buildSrc/src/main/java/plugin/RoomPlugin.kt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package plugin
22

3-
import Dependencies
43
import Plugins
4+
import libs
55
import org.gradle.api.Plugin
66
import org.gradle.api.Project
77
import org.gradle.kotlin.dsl.dependencies
@@ -17,11 +17,9 @@ class RoomPlugin : Plugin<Project> {
1717
}
1818

1919
project.dependencies {
20-
with(Dependencies.Room) {
21-
implementation(Ktx)
22-
implementation(Runtime)
23-
ksp(Compiler)
24-
}
20+
implementation(project.libs.room.ktx)
21+
implementation(project.libs.room.runtime)
22+
ksp(project.libs.room.compiler)
2523
}
2624
}
2725
}
Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package plugin
22

3+
import Modules
4+
import libs
35
import org.gradle.api.Plugin
46
import org.gradle.api.Project
5-
import org.gradle.kotlin.dsl.apply
67
import org.gradle.kotlin.dsl.dependencies
7-
import plugin.util.implementation
88
import plugin.util.testImplementation
99
import plugin.util.testImplementationProject
1010

@@ -14,15 +14,8 @@ class UnitTestPlugin : Plugin<Project> {
1414
override fun apply(project: Project) {
1515

1616
project.dependencies {
17-
with(Dependencies.Test) {
18-
testImplementation(mockk)
19-
testImplementation(junit)
20-
testImplementation(kotlinTests)
21-
testImplementation(coroutine)
22-
testImplementation(orbitMvi)
23-
testImplementation(turbine)
24-
testImplementationProject(Modules.Core.TestHelper)
25-
}
17+
testImplementation(project.libs.bundles.test)
18+
testImplementationProject(Modules.Core.TestHelper)
2619
}
2720
}
2821
}

buildSrc/src/main/java/plugin/base/CorePlugin.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package plugin.base
22

33
import Plugins
4-
import Versions
54
import com.android.build.gradle.BaseExtension
65
import libs
76
import org.gradle.api.JavaVersion
@@ -44,7 +43,7 @@ open class CorePlugin : Plugin<Project> {
4443
}
4544

4645
composeOptions {
47-
kotlinCompilerExtensionVersion = Versions.Compose.Compiler
46+
kotlinCompilerExtensionVersion = project.libs.versions.compose.compiler.get()
4847
}
4948

5049
lintOptions {

buildSrc/src/main/java/plugin/compose/ComposeFeaturePlugin.kt

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
package plugin.compose
22

3-
import Dependencies
43
import Modules
4+
import libs
55
import org.gradle.api.Project
66
import org.gradle.kotlin.dsl.dependencies
7-
import plugin.util.*
7+
import plugin.util.implementation
8+
import plugin.util.implementationProject
9+
import plugin.util.kotlinExtension
10+
import plugin.util.ksp
11+
import plugin.util.libraryExtension
812

913
/**
1014
* Plugin containing setup for adding compose core deps with navigation lib setup
@@ -27,14 +31,11 @@ class ComposeFeaturePlugin : ComposeCorePlugin() {
2731
}
2832

2933
project.dependencies {
30-
with(Dependencies.Compose) {
31-
this@dependencies.implementation(ComposeDestinations)
32-
this@dependencies.ksp(ComposeDestinationsKsp)
33-
this@dependencies.implementation(OrbitMvi)
34-
}
35-
with(Dependencies.Koin) {
36-
this@dependencies.implementation(Compose)
37-
}
34+
implementation(project.libs.compose.destinations)
35+
ksp(project.libs.compose.destinations.ksp)
36+
implementation(project.libs.compose.orbit.mvi)
37+
implementation(project.libs.koin.compose)
38+
3839
with(Modules.Core) {
3940
this@dependencies.implementationProject(DesignSystem)
4041
this@dependencies.implementationProject(CoreUi)

buildSrc/src/main/java/plugin/util/PluginExtensions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ internal fun DependencyHandlerScope.implementationProject(dependency: String) {
4242
)
4343
}
4444

45-
internal fun DependencyHandlerScope.ksp(dependency: String) {
45+
internal fun DependencyHandlerScope.ksp(dependency: Any) {
4646
add(PluginConstants.KSP, dependency)
4747
}

core/core-ui/build.gradle.kts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ dependencies {
1212
implementation(project(DesignSystem))
1313
}
1414

15-
with(Dependencies.Compose) {
16-
implementation(ComposeDestinations)
17-
implementation(OrbitMvi)
18-
}
15+
implementation(libs.compose.destinations)
16+
implementation(libs.compose.orbit.mvi)
1917
}

core/design-system/build.gradle.kts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,8 @@ android {
99
}
1010

1111
dependencies {
12-
with(Dependencies.Compose) {
13-
implementation(FontAwesome)
14-
implementation(DatePicker)
15-
implementation(Pager)
16-
implementation(PagerIndicator)
17-
implementation(PlaceHolder)
18-
implementation(SwipeableCard)
19-
}
12+
implementation(libs.compose.fontawesome)
13+
implementation(libs.compose.datepicker)
14+
implementation(libs.compose.placeholder)
15+
implementation(libs.compose.swipe)
2016
}

0 commit comments

Comments
 (0)