Skip to content
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

Adding Type-safe project accessors #194

Merged
merged 14 commits into from
Jan 23, 2024
Merged

Adding Type-safe project accessors #194

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
64b5e2a
replace the windowInsetsPadding for navigationBarsPadding + statusBar…
theolm Jan 21, 2024
7bdec4e
Enabling TYPESAFE_PROJECT_ACCESSORS
theolm Jan 22, 2024
4f17b76
Adding typesafe project accessors in the app module
theolm Jan 22, 2024
049b938
Adding typesafe project accessors in the core module
theolm Jan 22, 2024
cfccc14
Adding typesafe project accessors in the core-metadata module
theolm Jan 22, 2024
7ec7f93
Adding typesafe project accessors in the data module
theolm Jan 22, 2024
4049ef7
Adding typesafe project accessors in the domain module
theolm Jan 22, 2024
4ddc919
Adding typesafe project accessors in the presentation-core module
theolm Jan 22, 2024
882bb56
Adding typesafe project accessors in the presentation-widget module
theolm Jan 22, 2024
eac9d5f
Adding typesafe project accessors in the source-local module
theolm Jan 22, 2024
5b80ebf
Adding typesafe project accessors in the source-api module
theolm Jan 22, 2024
c85b2c7
Rolling back
theolm Jan 22, 2024
6d4db69
Changing TYPESAFE_PROJECT_ACCESSORS line
theolm Jan 22, 2024
153874d
Removing extra spaces
theolm Jan 23, 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
18 changes: 9 additions & 9 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,15 +139,15 @@ android {
}

dependencies {
implementation(project(":i18n"))
implementation(project(":core"))
implementation(project(":core-metadata"))
implementation(project(":source-api"))
implementation(project(":source-local"))
implementation(project(":data"))
implementation(project(":domain"))
implementation(project(":presentation-core"))
implementation(project(":presentation-widget"))
implementation(projects.i18n)
implementation(projects.core)
implementation(projects.coreMetadata)
implementation(projects.sourceApi)
implementation(projects.sourceLocal)
implementation(projects.data)
implementation(projects.domain)
implementation(projects.presentationCore)
implementation(projects.presentationWidget)

// Compose
implementation(platform(compose.bom))
Expand Down
2 changes: 1 addition & 1 deletion core-metadata/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ android {
}

dependencies {
implementation(project(":source-api"))
implementation(projects.sourceApi)

implementation(kotlinx.bundles.serialization)
}
2 changes: 1 addition & 1 deletion core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ android {
}

dependencies {
implementation(project(":i18n"))
implementation(projects.i18n)

api(libs.logcat)

Expand Down
6 changes: 3 additions & 3 deletions data/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ android {
}

dependencies {
implementation(project(":source-api"))
implementation(project(":domain"))
implementation(project(":core"))
implementation(projects.sourceApi)
implementation(projects.domain)
implementation(projects.core)

api(libs.bundles.sqldelight)
}
Expand Down
4 changes: 2 additions & 2 deletions domain/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ android {
}

dependencies {
implementation(project(":source-api"))
implementation(project(":core"))
implementation(projects.sourceApi)
implementation(projects.core)

implementation(platform(kotlinx.coroutines.bom))
implementation(kotlinx.bundles.coroutines)
Expand Down
4 changes: 2 additions & 2 deletions presentation-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ android {
}

dependencies {
api(project(":core"))
api(project(":i18n"))
api(projects.core)
api(projects.i18n)

// Compose
implementation(platform(compose.bom))
Expand Down
8 changes: 4 additions & 4 deletions presentation-widget/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ android {
}

dependencies {
implementation(project(":core"))
implementation(project(":domain"))
implementation(project(":presentation-core"))
api(project(":i18n"))
implementation(projects.core)
implementation(projects.domain)
implementation(projects.presentationCore)
api(projects.i18n)

implementation(compose.glance)
lintChecks(compose.lintchecks)
Expand Down
2 changes: 2 additions & 0 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,5 @@ include(":presentation-widget")
include(":presentation-core")
include(":source-local")
include(":core-metadata")

enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
AntsyLich marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion source-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ kotlin {
}
val androidMain by getting {
dependencies {
implementation(project(":core"))
implementation(projects.core)
api(libs.preferencektx)

// Workaround for https://youtrack.jetbrains.com/issue/KT-57605
Expand Down
10 changes: 5 additions & 5 deletions source-local/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@ kotlin {
sourceSets {
val commonMain by getting {
dependencies {
implementation(project(":source-api"))
api(project(":i18n"))
implementation(projects.sourceApi)
api(projects.i18n)

implementation(libs.unifile)
implementation(libs.junrar)
}
}
val androidMain by getting {
dependencies {
implementation(project(":core"))
implementation(project(":core-metadata"))
implementation(projects.core)
implementation(projects.coreMetadata)

// Move ChapterRecognition to separate module?
implementation(project(":domain"))
implementation(projects.domain)

implementation(kotlinx.bundles.serialization)
}
Expand Down