-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2 from makeevrserg/develop
split modules
- Loading branch information
Showing
19 changed files
with
95 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -48,7 +48,7 @@ makeevrserg.android.kotlinCompilerExtensionVersion=1.5.3 | |
| # Project | ||
| makeevrserg.project.name=ApplicationTemplate | ||
| makeevrserg.project.group=com.makeevrserg.applicationtemplate | ||
| makeevrserg.project.version.string=1.0.1 | ||
| makeevrserg.project.version.string=1.1.0 | ||
| makeevrserg.project.version.code=11 | ||
| makeevrserg.project.description=Template for KMP applcation | ||
| makeevrserg.project.developers=makeevrserg|Makeev Roman|[email protected] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| @file:Suppress("UnusedPrivateMember") | ||
|
|
||
| import ru.astrainteractive.gradleplugin.property.extension.ModelPropertyValueExt.requireProjectInfo | ||
|
|
||
| plugins { | ||
| id("org.jetbrains.compose") | ||
| id("com.android.library") | ||
| kotlin("multiplatform") | ||
| id("ru.astrainteractive.gradleplugin.java.core") | ||
| id("ru.astrainteractive.gradleplugin.android.core") | ||
| id("ru.astrainteractive.gradleplugin.android.compose") | ||
| } | ||
|
|
||
| kotlin { | ||
| android() | ||
| sourceSets { | ||
| val commonMain by getting { | ||
| dependencies { | ||
| // Compose MPP | ||
| implementation(compose.foundation) | ||
| implementation(compose.ui) | ||
| implementation(compose.runtime) | ||
| implementation(compose.uiTooling) | ||
| implementation(compose.preview) | ||
| implementation(compose.material) | ||
| implementation(compose.material3) | ||
| implementation(compose.materialIconsExtended) | ||
| // Moko | ||
| implementation(libs.moko.resources.core) | ||
| // Local | ||
| implementation(projects.modules.services.coreResources) | ||
| implementation(projects.modules.services.coreUi) | ||
| implementation(projects.modules.services.buildKonfig) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| android { | ||
| namespace = "${requireProjectInfo.group}.features.info.ui" | ||
| } |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| @file:Suppress("UnusedPrivateMember") | ||
|
|
||
| import ru.astrainteractive.gradleplugin.property.extension.ModelPropertyValueExt.requireProjectInfo | ||
|
|
||
| plugins { | ||
| id("org.jetbrains.compose") | ||
| id("com.android.library") | ||
| kotlin("multiplatform") | ||
| id("ru.astrainteractive.gradleplugin.java.core") | ||
| id("ru.astrainteractive.gradleplugin.android.core") | ||
| id("ru.astrainteractive.gradleplugin.android.compose") | ||
| } | ||
|
|
||
| kotlin { | ||
| androidTarget() | ||
| targetHierarchy.default() | ||
| sourceSets { | ||
| val commonMain by getting { | ||
| dependencies { | ||
| // Compose MPP | ||
| implementation(compose.foundation) | ||
| implementation(compose.ui) | ||
| implementation(compose.runtime) | ||
| // Local | ||
| implementation(projects.modules.services.coreUi) | ||
| implementation(projects.modules.features.theme.impl) | ||
| } | ||
| } | ||
| val androidMain by getting { | ||
| dependencies { | ||
| // Accompanist | ||
| implementation(libs.google.accompanist.systemuicontroller) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| android { | ||
| namespace = "${requireProjectInfo.group}.features.theme.ui" | ||
| } |
2 changes: 1 addition & 1 deletion
2
...features/ui/components/TransparentBars.kt → ...tures/theme/components/TransparentBars.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...features/ui/components/TransparentBars.kt → ...tures/theme/components/TransparentBars.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters