From e35324f69aa8fe72e0e51940c8f2a89e1597ddec Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Fri, 20 Dec 2024 22:43:53 +0900 Subject: [PATCH] Move extensions into AndroidCompose.kt private function. Change-Id: I06ad3d172310307307f681fb985a9e0b25c0d89c --- .../samples/apps/nowinandroid/AndroidCompose.kt | 15 +++++++++++++++ .../apps/nowinandroid/ProjectExtensions.kt | 15 --------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt index 74688ba75..d2b15b324 100644 --- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt +++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt @@ -18,6 +18,8 @@ package com.google.samples.apps.nowinandroid import com.android.build.api.dsl.CommonExtension import org.gradle.api.Project +import org.gradle.api.file.Directory +import org.gradle.api.provider.Provider import org.gradle.kotlin.dsl.assign import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.dependencies @@ -60,3 +62,16 @@ internal fun Project.configureAndroidCompose( rootProject.layout.projectDirectory.file("compose_compiler_config.conf") } } + +/** + * Checking a value of [propertyName] is true. + */ +private fun Project.isPropertyValueIsTrue(propertyName: String): Boolean = + providers.gradleProperty(propertyName).orNull.toBoolean() + +/** + * Creating a path where the [dir] will be created in. + */ +private fun Project.createPerModulePath(dir: String): Provider = provider { + isolated.rootProject.projectDirectory.dir("build/${projectDir.toRelativeString(rootDir)}/$dir") +} diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/ProjectExtensions.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/ProjectExtensions.kt index 1756cb52b..e45d7f2e1 100644 --- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/ProjectExtensions.kt +++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/ProjectExtensions.kt @@ -19,22 +19,7 @@ package com.google.samples.apps.nowinandroid import org.gradle.api.Project import org.gradle.api.artifacts.VersionCatalog import org.gradle.api.artifacts.VersionCatalogsExtension -import org.gradle.api.file.Directory -import org.gradle.api.provider.Provider import org.gradle.kotlin.dsl.getByType val Project.libs get(): VersionCatalog = extensions.getByType().named("libs") - -/** - * Create new Directory by [dir] name in the root build directory. - */ -internal fun Project.relativeToRootProject(dir: String): Provider = - rootProject.layout.buildDirectory.dir(projectDir.toRelativeString(rootDir)) - .map { it.dir(dir) } - -/** - * Check a [propertyName]'s property value is true. - */ -internal fun Project.isPropertyValueIsTrue(propertyName: String): Boolean = - properties[propertyName].toString().toBoolean()