From 4b1be0fa3a057ee3aed0086cdb4ed78387de8df9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Mon, 11 Mar 2024 20:59:32 +0100 Subject: [PATCH 1/2] fix(compat-gradle): Removed code highlighting for build scripts because it was incorrect IntelliJ would inject the language but not the Gradle DSL, so all function calls from the DSL would appear as errors, which is really inconvenient. --- compat/compat-gradle/src/jvmMain/kotlin/Paths.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/compat/compat-gradle/src/jvmMain/kotlin/Paths.kt b/compat/compat-gradle/src/jvmMain/kotlin/Paths.kt index e70d2cb..fc70d8c 100644 --- a/compat/compat-gradle/src/jvmMain/kotlin/Paths.kt +++ b/compat/compat-gradle/src/jvmMain/kotlin/Paths.kt @@ -1,7 +1,6 @@ package opensavvy.prepared.compat.gradle import opensavvy.prepared.compat.filesystem.div -import org.intellij.lang.annotations.Language import kotlin.io.path.writeText // region Build @@ -54,7 +53,7 @@ val Gradle.settingsKts get() = dir / "settings.gradle.kts" * @see settingsKts Kotlin equivalent * @see buildGroovy Build script file */ -suspend fun Gradle.settingsGroovy(@Language("groovy") text: String) = with(dsl) { +suspend fun Gradle.settingsGroovy(text: String) = with(dsl) { settingsGroovy().writeText(text) } @@ -74,7 +73,7 @@ suspend fun Gradle.settingsGroovy(@Language("groovy") text: String) = with(dsl) * @see settingsGroovy Groovy equivalent * @see buildKts Build script file */ -suspend fun Gradle.settingsKts(@Language("kts") text: String) = with(dsl) { +suspend fun Gradle.settingsKts(text: String) = with(dsl) { settingsKts().writeText(text) } @@ -132,7 +131,7 @@ val Project.buildKts get() = dir / "build.gradle.kts" * @see settingsGroovy Settings file * @see Gradle.project Select the project */ -suspend fun Project.buildGroovy(@Language("groovy") text: String) = with(dsl) { +suspend fun Project.buildGroovy(text: String) = with(dsl) { buildGroovy().writeText(text) } @@ -153,7 +152,7 @@ suspend fun Project.buildGroovy(@Language("groovy") text: String) = with(dsl) { * @see settingsKts Settings file * @see Gradle.project Select the project */ -suspend fun Project.buildKts(@Language("kts") text: String) = with(dsl) { +suspend fun Project.buildKts(text: String) = with(dsl) { buildKts().writeText(text) } -- 2.51.2 From 70a6c8559ea98a0b57373b54c58fea0953a7ac8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Mon, 11 Mar 2024 21:11:40 +0100 Subject: [PATCH 2/2] fix(compat-gradle): Automatically create project directories when build scripts are created Closes #43 --- compat/compat-gradle/src/jvmMain/kotlin/Paths.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compat/compat-gradle/src/jvmMain/kotlin/Paths.kt b/compat/compat-gradle/src/jvmMain/kotlin/Paths.kt index fc70d8c..ac975e1 100644 --- a/compat/compat-gradle/src/jvmMain/kotlin/Paths.kt +++ b/compat/compat-gradle/src/jvmMain/kotlin/Paths.kt @@ -1,6 +1,7 @@ package opensavvy.prepared.compat.gradle import opensavvy.prepared.compat.filesystem.div +import kotlin.io.path.createDirectories import kotlin.io.path.writeText // region Build @@ -132,6 +133,7 @@ val Project.buildKts get() = dir / "build.gradle.kts" * @see Gradle.project Select the project */ suspend fun Project.buildGroovy(text: String) = with(dsl) { + buildGroovy().parent.createDirectories() buildGroovy().writeText(text) } @@ -153,6 +155,7 @@ suspend fun Project.buildGroovy(text: String) = with(dsl) { * @see Gradle.project Select the project */ suspend fun Project.buildKts(text: String) = with(dsl) { + buildKts().parent.createDirectories() buildKts().writeText(text) } -- 2.51.2