8000 📽️ Update Kotlin DSL with new extensions by igorescodro · Pull Request #694 · igorescodro/alkaa · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

📽️ Update Kotlin DSL with new extensions #694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 26, 2024
Merged

📽️ Update Kotlin DSL with new extensions #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58b7013
📽️ Update Kotlin DSL with new extensions
igorescodro May 25, 2024
8953686
🫥 Update deprecated code for getParcelable
igorescodro May 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions app/src/main/java/com/escodro/alkaa/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import androidx.activity.SystemBarStyle
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
import androidx.core.os.BundleCompat
import androidx.core.view.WindowCompat
import com.escodro.navigation.NavigationAction
import com.escodro.shared.MainView
Expand Down Expand Up @@ -38,9 +39,13 @@ internal class MainActivity : AppCompatActivity() {
enableEdgeToEdge(statusBarStyle = systemBarStyle, navigationBarStyle = systemBarStyle)
}

private fun getNavigationAction(): NavigationAction =
intent.extras?.getParcelable(NavigationAction.EXTRA_DESTINATION)
?: NavigationAction.Home
private fun getNavigationAction(): NavigationAction = intent.extras?.let { bundle ->
BundleCompat.getParcelable(
bundle,
NavigationAction.EXTRA_DESTINATION,
NavigationAction::class.java,
)
} ?: NavigationAction.Home
}

/**
Expand Down
19 changes: 10 additions & 9 deletions data/datastore/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import extension.commonDependencies
import extension.commonTestDependencies
import extension.setFrameworkBaseName

plugins {
Expand All @@ -9,14 +7,17 @@ plugins {
kotlin {
setFrameworkBaseName("datastore")

commonDependencies {
implementation(projects.data.repository)
sourceSets {
commonMain.dependencies {
implementation(projects.data.repository)

implementation(libs.koin.core)
implementation(libs.androidx.datastore)
}
commonTestDependencies {
implementation(kotlin("test"))
implementation(libs.koin.core)
implementation(libs.androidx.datastore)
}

commonTest.dependencies {
implementation(kotlin("test"))
}
}
}

Expand Down
47 changes: 24 additions & 23 deletions data/local/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
import extension.androidDependencies
import extension.commonDependencies
import extension.commonTestDependencies
import extension.iosDependencies
import extension.setFrameworkBaseName

plugins {
Expand All @@ -14,27 +10,32 @@ plugins {
kotlin {
setFrameworkBaseName("local")

commonDependencies {
implementation(projects.libraries.coroutines)
implementation(projects.data.repository)
implementation(projects.resources)
sourceSets {
commonMain.dependencies {
implementation(projects.libraries.coroutines)
implementation(projects.data.repository)
implementation(projects.resources)

implementation(compose.runtime)
implementation(compose.components.resources)
implementation(compose.runtime)
implementation(compose.components.resources)

implementation(libs.koin.core)
implementation(libs.kotlinx.datetime)
implementation(libs.sqldelight.coroutines)
}
androidDependencies {
implementation(libs.sqldelight.driver)
}
iosDependencies {
implementation(libs.sqldelight.native)
}
commonTestDependencies {
implementation(kotlin("test"))
implementation(libs.kotlinx.coroutines.test)
implementation(libs.koin.core)
implementation(libs.kotlinx.datetime)
implementation(libs.sqldelight.coroutines)
}

androidMain.dependencies {
implementation(libs.sqldelight.driver)
}

iosMain.dependencies {
implementation(libs.sqldelight.native)
}

commonTest.dependencies {
implementation(kotlin("test"))
implementation(libs.kotlinx.coroutines.test)
}
}
}

Expand Down
21 changes: 11 additions & 10 deletions data/repository/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import extension.commonDependencies
import extension.commonTestDependencies
import extension.setFrameworkBaseName

plugins {
Expand All @@ -9,15 +7,18 @@ plugins {
kotlin {
setFrameworkBaseName("repository")

commonDependencies {
implementation(projects.domain)
sourceSets {
commonMain.dependencies {
implementation(projects.domain)

implementation(libs.koin.core)
implementation(libs.kotlinx.coroutines.core)
implementation(libs.kotlinx.datetime)
}
commonTestDependencies {
implementation(kotlin("test"))
implementation(libs.koin.core)
implementation(libs.kotlinx.coroutines.core)
implementation(libs.kotlinx.datetime)
}

commonTest.dependencies {
implementation(kotlin("test"))
}
}
}

Expand Down
25 changes: 13 additions & 12 deletions domain/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import extension.commonDependencies
import extension.commonTestDependencies
import extension.setFrameworkBaseName

plugins {
Expand All @@ -9,16 +7,19 @@ plugins {
kotlin {
setFrameworkBaseName("domain")

commonDependencies {
implementation(libs.koin.core)
implementation(libs.kotlinx.coroutines.core)
implementation(libs.logging)
implementation(libs.logback)
implementation(libs.kotlinx.datetime)
}
commonTestDependencies {
implementation(kotlin("test"))
implementation(libs.kotlinx.coroutines.test)
sourceSets {
commonMain.dependencies {
implementation(libs.koin.core)
implementation(libs.kotlinx.coroutines.core)
implementation(libs.logging)
implementation(libs.logback)
implementation(libs.kotlinx.datetime)
}

commonTest.dependencies {
implementation(kotlin("test"))
implementation(libs.kotlinx.coroutines.test)
}
}
}

Expand Down
54 changes: 27 additions & 27 deletions features/alarm/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import extension.androidDependencies
import extension.androidTestDependencies
import extension.commonDependencies
import extension.setFrameworkBaseName

plugins {
Expand All @@ -12,30 +9,33 @@ plugins {
kotlin {
setFrameworkBaseName("search")

commonDependencies {
implementation(projects.features.alarmApi)
implementation(projects.libraries.coroutines)
implementation(projects.libraries.navigation)
implementation(projects.domain)
implementation(projects.resources)
implementation(libs.kotlinx.datetime)

implementation(compose.runtime)
implementation(compose.components.resources)

implementation(libs.logging)
implementation(libs.logback)
implementation(libs.kotlinx.coroutines.core)
implementation(libs.koin.core)
}

androidDependencies {
implementation(libs.logcat)
implementation(libs.androidx.core)
}

androidTestDependencies {
implementation(libs.test.junit)
sourceSets {
commonMain.dependencies {

implementation(projects.features.alarmApi)
implementation(projects.libraries.coroutines)
implementation(projects.libraries.navigation)
implementation(projects.domain)
implementation(projects.resources)
implementation(libs.kotlinx.datetime)

implementation(compose.runtime)
implementation(compose.components.resources)

implementation(libs.logging)
implementation(libs.logback)
implementation(libs.kotlinx.coroutines.core)
implementation(libs.koin.core)
}

androidMain.dependencies {
implementation(libs.logcat)
implementation(libs.androidx.core)
}

androidUnitTest.dependencies {
implementation(libs.test.junit)
}
}
}

Expand Down
16 changes: 8 additions & 8 deletions features/category-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import extension.commonDependencies
import extension.setFrameworkBaseName
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi

plugins {
id("com.escodro.multiplatform")
Expand All @@ -10,12 +8,14 @@ plugins {
kotlin {
setFrameworkBaseName("categoryapi")

commonDependencies {
implementation(projects.libraries.parcelable)
api(libs.androidx.lifecycle.viewmodel)
implementation(libs.kotlinx.coroutines.core)
implementation(libs.kotlinx.collections.immutable)
implementation(libs.moko.mvvm.core)
sourceSets {
commonMain.dependencies {
implementation(projects.libraries.parcelable)
api(libs.androidx.lifecycle.viewmodel)
implementation(libs.kotlinx.coroutines.core)
implementation(libs.kotlinx.collections.immutable)
implementation(libs.moko.mvvm.core)
}
}
}

Expand Down
45 changes: 22 additions & 23 deletions features/category/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
import extension.commonDependencies
import extension.commonTestDependencies
import extension.setFrameworkBaseName
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi

plugins {
id("com.escodro.multiplatform")
Expand All @@ -13,29 +10,31 @@ plugins {
kotlin {
setFrameworkBaseName("category")

commonDependencies {
implementation(projects.features.categoryApi)
implementation(projects.domain)
implementation(projects.resources)
implementation(projects.libraries.navigation)
implementation(projects.libraries.designsystem)
implementation(projects.libraries.coroutines)
implementation(projects.libraries.di)
implementation(projects.libraries.test)
implementation(projects.libraries.parcelable)
sourceSets {
commonMain.dependencies {
implementation(projects.features.categoryApi)
implementation(projects.domain)
implementation(projects.resources)
implementation(projects.libraries.navigation)
implementation(projects.libraries.designsystem)
implementation(projects.libraries.coroutines)
implementation(projects.libraries.di)
implementation(projects.libraries.test)
implementation(projects.libraries.parcelable)

implementation(compose.runtime)
implementation(compose.material3)
implementation(compose.materialIconsExtended)
implementation(compose.components.resources)
implementation(compose.runtime)
implementation(compose.material3)
implementation(compose.materialIconsExtended)
implementation(compose.components.resources)

implementation(libs.koin.compose.jb)
implementation(libs.kotlinx.collections.immutable)
implementation(libs.moko.mvvm.compose)
}
implementation(libs.koin.compose.jb)
implementation(libs.kotlinx.collections.immutable)
implementation(libs.moko.mvvm.compose)
}

commonTestDependencies {
implementation(kotlin("test"))
commonTest.dependencies {
implementation(kotlin("test"))
}
}
}

Expand Down
40 changes: 20 additions & 20 deletions features/home/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import extension.commonDependencies
import extension.setFrameworkBaseName
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi

plugins {
id("com.escodro.multiplatform")
Expand All @@ -12,26 +10,28 @@ plugins {
kotlin {
setFrameworkBaseName("home")

commonDependencies {
implementation(projects.domain)
implementation(projects.resources)
implementation(projects.features.task)
implementation(projects.features.category)
implementation(projects.features.search)
implementation(projects.features.preference)
implementation(projects.libraries.navigation)
implementation(projects.libraries.appstate)
implementation(projects.libraries.parcelable)
sourceSets {
commonMain.dependencies {
implementation(projects.domain)
implementation(projects.resources)
implementation(projects.features.task)
implementation(projects.features.category)
implementation(projects.features.search)
implementation(projects.features.preference)
implementation(projects.libraries.navigation)
implementation(projects.libraries.appstate)
implementation(projects.libraries.parcelable)

implementation(compose.runtime)
implementation(compose.materialIconsExtended)
implementation(compose.material)
implementation(compose.material3)
implementation(compose.components.resources)
implementation(compose.runtime)
implementation(compose.materialIconsExtended)
implementation(compose.material)
implementation(compose.material3)
implementation(compose.components.resources)

implementation(libs.koin.compose.jb)
implementation(libs.kotlinx.collections.immutable)
implementation(libs.moko.mvvm.compose)
implementation(libs.koin.compose.jb)
implementation(libs.kotlinx.collections.immutable)
implementation(libs.moko.mvvm.compose)
}
}
}

Expand Down
Loading
Loading
0