Skip to content

Commit 131c1a9

Browse files
authored
Merge branch 'master' into feature/3_initial_structure
2 parents 6c45cb2 + 35a00a9 commit 131c1a9

File tree

17 files changed

+54
-261
lines changed

17 files changed

+54
-261
lines changed

.idea/.gitignore

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

.idea/codeStyles/Project.xml

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

.idea/codeStyles/codeStyleConfig.xml

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

.idea/compiler.xml

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

.idea/gradle.xml

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

.idea/jarRepositories.xml

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

.idea/misc.xml

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

.idea/vcs.xml

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

buildSrc/src/main/java/Dependencies.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ object Dependencies {
99

1010
object Module {
1111
const val core_networking = ":core-networking"
12+
const val feature_list_streams = ":feature-list-streams"
1213
}
1314

1415
val modules: List<String> by lazy {
@@ -134,4 +135,12 @@ object Dependencies {
134135
ViewModel.lifecycleConvertRxToLivedata
135136
)
136137
}
138+
139+
object Compose: GroupLibs {
140+
const val composeFoundation = "androidx.compose.foundation:foundation:${Versions.compose_version}"
141+
override val list: List<String>
142+
get() = listOf(
143+
Compose.composeFoundation
144+
)
145+
}
137146
}

buildSrc/src/main/java/Versions.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ object Versions {
2424
const val viewmodel_version = "2.2.0"
2525
const val mockWebServer = "4.10.0"
2626
const val koin = "3.4.0"
27-
}
27+
const val compose_version = "1.4.2"
28+
}

0 commit comments

Comments
 (0)