Refactor build scripts

overpas · overpas · commit 7b0b517d2e86 · 2024-02-26T23:07:03.000+04:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 }
 
 tasks.register("cleanAll", Delete::class) {
-    delete(rootProject.buildDir)
+    delete(rootProject.layout.buildDirectory)
 }
 
 tasks.register("detektAll") {
diff --git a/convention-plugins/src/main/kotlin/publication.gradle.kts b/convention-plugins/src/main/kotlin/publication.gradle.kts
@@ -102,5 +102,5 @@ tasks.matching { it.name.endsWith("PublicationToSonatypeRepository") }
         dependsOn(tasks.matching { it.name == "signKotlinMultiplatformPublication" })
         dependsOn(tasks.matching { it.name == "signAndroidDebugPublication" })
         dependsOn(tasks.matching { it.name == "signAndroidReleasePublication" })
-        dependsOn(tasks.matching { it.name == "signWasmJsPublication'" })
+        dependsOn(tasks.matching { it.name == "signWasmJsPublication" })
     }
diff --git a/sample/shared/build.gradle.kts b/sample/shared/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
@@ -39,9 +38,6 @@ android {
     }
 }
 
-@OptIn(
-    ExperimentalKotlinGradlePluginApi::class,
-)
 kotlin {
 
     cocoapods {
@@ -58,10 +54,10 @@ kotlin {
 
     jvmToolchain(17)
 
-    targetHierarchy.default()
+    applyDefaultHierarchyTemplate()
 
     jvm("desktop")
-    android()
+    androidTarget()
     iosX64()
     iosArm64()
     iosSimulatorArm64()
diff --git a/sample/web-wasm/build.gradle.kts b/sample/web-wasm/build.gradle.kts
@@ -7,14 +7,11 @@ plugins {
     alias(libs.plugins.detekt)
 }
 
-@OptIn(
-    ExperimentalKotlinGradlePluginApi::class,
-)
 kotlin {
 
     jvmToolchain(17)
 
-    targetHierarchy.default()
+    applyDefaultHierarchyTemplate()
 
     @OptIn(ExperimentalWasmDsl::class)
     wasmJs {
diff --git a/sample/web/build.gradle.kts b/sample/web/build.gradle.kts
@@ -1,19 +1,14 @@
-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-
 plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
     alias(libs.plugins.detekt)
 }
 
-@OptIn(
-    ExperimentalKotlinGradlePluginApi::class,
-)
 kotlin {
 
     jvmToolchain(17)
 
-    targetHierarchy.default()
+    applyDefaultHierarchyTemplate()
 
     js(IR) {
         browser()
diff --git a/treemap-chart-compose/build.gradle.kts b/treemap-chart-compose/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 
@@ -45,17 +44,14 @@ android {
     }
 }
 
-@OptIn(
-    ExperimentalKotlinGradlePluginApi::class,
-)
 kotlin {
 
     jvmToolchain(17)
 
-    targetHierarchy.default()
+    applyDefaultHierarchyTemplate()
 
     jvm("desktop")
-    android {
+    androidTarget {
         publishLibraryVariants("release", "debug")
     }
     iosX64()
diff --git a/treemap-chart/build.gradle.kts b/treemap-chart/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
@@ -42,17 +41,14 @@ android {
     }
 }
 
-@OptIn(
-    ExperimentalKotlinGradlePluginApi::class,
-)
 kotlin {
 
     jvmToolchain(17)
 
-    targetHierarchy.default()
+    applyDefaultHierarchyTemplate()
 
     jvm("desktop")
-    android {
+    androidTarget {
         publishLibraryVariants("release", "debug")
     }
     iosX64()

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ plugins {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`tasks.register("cleanAll", Delete::class) {`
`15`		`- delete(rootProject.buildDir)`
	`15`	`+ delete(rootProject.layout.buildDirectory)`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`tasks.register("detektAll") {`
Original file line number	Diff line number	Diff line change
`@@ -102,5 +102,5 @@ tasks.matching { it.name.endsWith("PublicationToSonatypeRepository") }`
`102`	`102`	`dependsOn(tasks.matching { it.name == "signKotlinMultiplatformPublication" })`
`103`	`103`	`dependsOn(tasks.matching { it.name == "signAndroidDebugPublication" })`
`104`	`104`	`dependsOn(tasks.matching { it.name == "signAndroidReleasePublication" })`
`105`		`- dependsOn(tasks.matching { it.name == "signWasmJsPublication'" })`
	`105`	`+ dependsOn(tasks.matching { it.name == "signWasmJsPublication" })`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi`
`2`	`1`	`import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl`
`3`	`2`
`4`	`3`
`@@ -45,17 +44,14 @@ android {`
`45`	`44`	`}`
`46`	`45`	`}`
`47`	`46`
`48`		`-@OptIn(`
`49`		`- ExperimentalKotlinGradlePluginApi::class,`
`50`		`-)`
`51`	`47`	`kotlin {`
`52`	`48`
`53`	`49`	`jvmToolchain(17)`
`54`	`50`
`55`		`- targetHierarchy.default()`
	`51`	`+ applyDefaultHierarchyTemplate()`
`56`	`52`
`57`	`53`	`jvm("desktop")`
`58`		`- android {`
	`54`	`+ androidTarget {`
`59`	`55`	`publishLibraryVariants("release", "debug")`
`60`	`56`	`}`
`61`	`57`	`iosX64()`