wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change app and library compose build plugins to share dependencies

Browse source
This commit is contained in:
Wolf Montwé 2023-03-16 13:36:57 +01:00
parent bd6cde63b0
commit 7b4f3d796e
No known key found for this signature in database
GPG key ID: 6D45B21512ACBF72
5 changed files with 42 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
build-plugin/src/main/kotlin/AndroidExtension.kt
View file

@ -1,7 +1,8 @@
import com.android.build.api.dsl.CommonExtension
import org.gradle.accessors.dm.LibrariesForLibs
import org.gradle.api.artifacts.dsl.DependencyHandler
fun CommonExtension<*, *, *, *>.configureSharedConfig() {
internal fun CommonExtension<*, *, *, *>.configureSharedConfig() {
compileSdk = ThunderbirdProjectConfig.androidSdkCompile
defaultConfig {
@ -28,7 +29,9 @@ fun CommonExtension<*, *, *, *>.configureSharedConfig() {
}
}
fun CommonExtension<*, *, *, *>.configureSharedComposeConfig(libs: LibrariesForLibs) {
internal fun CommonExtension<*, *, *, *>.configureSharedComposeConfig(
libs: LibrariesForLibs,
) {
buildFeatures {
compose = true
}
@ -48,3 +51,19 @@ fun CommonExtension<*, *, *, *>.configureSharedComposeConfig(libs: LibrariesForL
}
}
}
internal fun DependencyHandler.configureSharedComposeDependencies(
libs: LibrariesForLibs,
) {
val composeBom = platform(libs.androidx.compose.bom)
implementation(composeBom)
androidTestImplementation(composeBom)
implementation(libs.bundles.shared.jvm.android.compose)
debugImplementation(libs.bundles.shared.jvm.android.compose.debug)
testImplementation(libs.bundles.shared.jvm.test.compose)
androidTestImplementation(libs.bundles.shared.jvm.androidtest.compose)
}

14
build-plugin/src/main/kotlin/DependencyHandlerExtension.kt Normal file
View file

@ -0,0 +1,14 @@
import org.gradle.api.artifacts.Dependency
import org.gradle.api.artifacts.dsl.DependencyHandler
internal fun DependencyHandler.implementation(dependencyNotation: Any): Dependency? =
add("implementation", dependencyNotation)
internal fun DependencyHandler.debugImplementation(dependencyNotation: Any): Dependency? =
add("debugImplementation", dependencyNotation)
internal fun DependencyHandler.testImplementation(dependencyNotation: Any): Dependency? =
add("testImplementation", dependencyNotation)
internal fun DependencyHandler.androidTestImplementation(dependencyNotation: Any): Dependency? =
add("androidTestImplementation", dependencyNotation)

6
build-plugin/src/main/kotlin/ProjectExtension.kt
View file

@ -1,6 +1,10 @@
import org.gradle.accessors.dm.LibrariesForLibs
import org.gradle.api.Project
import org.gradle.kotlin.dsl.DependencyHandlerScope
import org.gradle.kotlin.dsl.getByName
val Project.libs: LibrariesForLibs
internal val Project.libs: LibrariesForLibs
get() = extensions.getByName<LibrariesForLibs>("libs")
internal fun Project.dependencies(configuration: DependencyHandlerScope.() -> Unit) =
DependencyHandlerScope.of(dependencies).configuration()

11
build-plugin/src/main/kotlin/thunderbird.app.android.compose.gradle.kts
View file

@ -17,16 +17,7 @@ android {
}
dependencies {
val composeBom = platform(libs.androidx.compose.bom)
implementation(composeBom)
androidTestImplementation(composeBom)
configureSharedComposeDependencies(libs)
implementation(libs.bundles.shared.jvm.android.compose)
implementation(libs.androidx.compose.activity)
debugImplementation(libs.bundles.shared.jvm.android.compose.debug)
testImplementation(libs.bundles.shared.jvm.test.compose)
androidTestImplementation(libs.bundles.shared.jvm.androidtest.compose)
}

12
build-plugin/src/main/kotlin/thunderbird.library.android.compose.gradle.kts
View file

@ -7,15 +7,5 @@ android {
}
dependencies {
val composeBom = platform(libs.androidx.compose.bom)
implementation(composeBom)
androidTestImplementation(composeBom)
implementation(libs.bundles.shared.jvm.android.compose)
debugImplementation(libs.bundles.shared.jvm.android.compose.debug)
testImplementation(libs.bundles.shared.jvm.test.compose)
androidTestImplementation(libs.bundles.shared.jvm.androidtest.compose)
configureSharedComposeDependencies(libs)
}