Skip to content

Commit e5a8354

Browse files
committed
chore: build logic changes
1 parent 6910874 commit e5a8354

File tree

6 files changed

+66
-40
lines changed

6 files changed

+66
-40
lines changed

gradle/build-logic/src/main/kotlin/common/Multiplatform.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ fun KotlinMultiplatformExtension.jvmTarget(project: Project) =
103103
testRuns.configureEach { executionTask.configure { configureJavaTest() } }
104104

105105
// Configures JavaExec task with name "runJvm" and Gradle distribution "jvmDistZip"
106-
if (isKmpExecEnabled) {
106+
if (extraProp("enableKmpExec", false)) {
107107
binaries {
108108
executable {
109109
mainClass = libs.versions.app.mainclass

gradle/build-logic/src/main/kotlin/common/ProjectExtns.kt

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ val Project.isSharedProject
6464
get() = name == sharedProjectName
6565

6666
val Project.skipTest
67-
get() = gradleBooleanProperty("skip.test").get()
67+
get() = gradleBooleanProp("skip.test").get()
6868

6969
val Project.hasCleanTask
7070
get() = gradle.startParameter.taskNames.any { it in listOf("clean", "cleanAll") }
@@ -74,19 +74,16 @@ val Project.runsOnCI
7474

7575
// val debug: String? by project
7676
val Project.debugEnabled
77-
get() = gradleBooleanProperty("debug").get()
77+
get() = gradleBooleanProp("debug").get()
7878

7979
val Project.isSnapshotVersion
8080
get() = version.toString().endsWith("-SNAPSHOT", true)
8181

82-
val Project.isKmpExecEnabled
83-
get() = extra.has("enableKmpExec") && extra["enableKmpExec"] as Boolean
84-
8582
val Project.isNativeTargetEnabled: Boolean
86-
get() = gradleBooleanProperty("kotlin.target.native.enabled").get()
83+
get() = gradleBooleanProp("kotlin.target.native.enabled").get()
8784

8885
val Project.isWinTargetEnabled: Boolean
89-
get() = gradleBooleanProperty("kotlin.target.win.enabled").get()
86+
get() = gradleBooleanProp("kotlin.target.win.enabled").get()
9087

9188
/** Java version properties. */
9289
val Project.javaVersion
@@ -105,7 +102,7 @@ val Project.addModules
105102
get() = libs.versions.java.addModules.get()
106103

107104
val Project.isAutomaticModuleEnabled
108-
get() = gradleBooleanProperty("java.automatic.module.enabled").get()
105+
get() = gradleBooleanProp("java.automatic.module.enabled").get()
109106

110107
val Project.defaultJarManifest
111108
get() = buildMap {
@@ -632,7 +629,7 @@ fun Project.appRunCmd(binary: Path, args: List<String>): String {
632629
prefix =
633630
"""
634631
|To Run the app,
635-
|${'$'} java -jar $lineCont $newLine
632+
|$ java -jar $lineCont $newLine
636633
"""
637634
.trimMargin(),
638635
postfix = "$newLine$indent$path",
@@ -746,9 +743,14 @@ fun Project.addFileToJavaComponent(file: File) {
746743
}
747744
}
748745

749-
fun Project.gradleBooleanProperty(name: String): Provider<Boolean> =
746+
fun Project.gradleBooleanProp(name: String): Provider<Boolean> =
750747
providers.gradleProperty(name).map(String::toBoolean).orElse(false)
751748

749+
inline fun <reified T> Project.extraProp(name: String, defaultValue: T): T =
750+
if (extra.has(name)) {
751+
extra[name] as? T ?: defaultValue
752+
} else defaultValue
753+
752754
/** Lazy version of [TaskContainer.maybeCreate] */
753755
inline fun <reified T : Task> TaskContainer.maybeRegister(
754756
name: String,

gradle/build-logic/src/main/kotlin/common/SettingsExtns.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ import kotlin.text.toBoolean
44
import org.gradle.api.initialization.Settings
55
import org.gradle.api.provider.Provider
66

7-
fun Settings.gradleBooleanProperty(name: String): Provider<Boolean> =
7+
fun Settings.gradleBooleanProp(name: String): Provider<Boolean> =
88
providers.gradleProperty(name).map(String::toBoolean).orElse(false)
99

1010
val Settings.isNativeTargetEnabled: Boolean
11-
get() = gradleBooleanProperty("kotlin.target.native.enabled").get()
11+
get() = gradleBooleanProp("kotlin.target.native.enabled").get()
1212

1313
val Settings.isWinTargetEnabled: Boolean
14-
get() = gradleBooleanProperty("kotlin.target.win.enabled").get()
14+
get() = gradleBooleanProp("kotlin.target.win.enabled").get()
1515

1616
val Settings.isComposeEnabled: Boolean
17-
get() = gradleBooleanProperty("compose.enabled").get()
17+
get() = gradleBooleanProp("compose.enabled").get()
1818

1919
val Settings.isSpringBootEnabled: Boolean
20-
get() = gradleBooleanProperty("springboot.enabled").get()
20+
get() = gradleBooleanProp("springboot.enabled").get()

gradle/build-logic/src/main/kotlin/dev.suresh.plugin.repos.settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ fun RepositoryHandler.nodeJS() {
137137
}
138138

139139
fun RepositoryHandler.mavenSnapshot() {
140-
val mvnSnapshot = gradleBooleanProperty("maven.snapshot.repo.enabled").get()
140+
val mvnSnapshot = gradleBooleanProp("maven.snapshot.repo.enabled").get()
141141
if (mvnSnapshot) {
142142
logger.lifecycle("❖ Maven Snapshot is enabled!")
143143
maven(url = versionCatalog?.getString("repo-mvn-snapshot").orEmpty()) {

gradle/kotlin-js-store/package-lock.json

Lines changed: 42 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

settings.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,16 @@ if (isSpringBootEnabled) {
5757
// }
5858

5959
val Settings.isNativeTargetEnabled: Boolean
60-
get() = gradleBooleanProperty("kotlin.target.native.enabled").get()
60+
get() = gradleBooleanProp("kotlin.target.native.enabled").get()
6161

6262
val Settings.isComposeEnabled: Boolean
63-
get() = gradleBooleanProperty("composeBuild").get()
63+
get() = gradleBooleanProp("composeBuild").get()
6464

6565
val Settings.isSpringBootEnabled: Boolean
66-
get() = gradleBooleanProperty("springBoot").get()
66+
get() = gradleBooleanProp("springBoot").get()
6767

6868
val Settings.isWinTargetEnabled: Boolean
69-
get() = gradleBooleanProperty("kotlin.target.win.enabled").get()
69+
get() = gradleBooleanProp("kotlin.target.win.enabled").get()
7070

71-
fun Settings.gradleBooleanProperty(name: String): Provider<Boolean> =
71+
fun Settings.gradleBooleanProp(name: String): Provider<Boolean> =
7272
providers.gradleProperty(name).map(String::toBoolean).orElse(false)

0 commit comments

Comments
 (0)