Fix Gradle warnings

karakum-team · Oct 21, 2023 · d49fa99 · d49fa99
1 parent 52e4b7e
commit d49fa99
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 28 deletions.
diff --git a/buildSrc/src/main/kotlin/Tasks.kt b/buildSrc/src/main/kotlin/Tasks.kt
@@ -0,0 +1,6 @@
+import org.gradle.api.Task
+import java.io.File
+
+val Task.nodeModules: File
+    get() = project.rootProject.layout.buildDirectory
+        .dir("js/node_modules").get().asFile
diff --git a/buildSrc/src/main/kotlin/actions-declarations.gradle.kts b/buildSrc/src/main/kotlin/actions-declarations.gradle.kts
@@ -8,8 +8,7 @@ tasks.named("generateDeclarations") {
 
         delete(sourceDir)
 
-        val definitionsDir = rootProject.buildDir
-            .resolve("js/node_modules/@actions")
+        val definitionsDir = nodeModules.resolve("@actions")
 
         karakum.actions.generateKotlinDeclarations(
             definitionsDir = definitionsDir,

diff --git a/buildSrc/src/main/kotlin/browser-declarations.gradle.kts b/buildSrc/src/main/kotlin/browser-declarations.gradle.kts
@@ -8,15 +8,9 @@ tasks.named("generateDeclarations") {
 
         delete(sourceDir)
 
-        val definitionsDir = rootProject.buildDir
-            .resolve("js/node_modules/typescript")
-            .resolve("lib")
-
-        val webDefinitionsDir = rootProject.buildDir
-            .resolve("js/node_modules/@types/web")
-
-        val serviceworkerDefinitionsDir = rootProject.buildDir
-            .resolve("js/node_modules/@types/serviceworker")
+        val definitionsDir = nodeModules.resolve("typescript/lib")
+        val webDefinitionsDir = nodeModules.resolve("@types/web")
+        val serviceworkerDefinitionsDir = nodeModules.resolve("@types/serviceworker")
 
         karakum.browser.generateKotlinDeclarations(
             definitionsDir = definitionsDir,

diff --git a/buildSrc/src/main/kotlin/cesium-declarations.gradle.kts b/buildSrc/src/main/kotlin/cesium-declarations.gradle.kts
@@ -15,9 +15,7 @@ tasks {
         doLast {
             delete(sourceDir)
 
-            val definitionsFile = rootProject.buildDir
-                .resolve("js/node_modules/cesium")
-                .resolve("Source/Cesium.d.ts")
+            val definitionsFile = nodeModules.resolve("cesium/Source/Cesium.d.ts")
 
             generateKotlinDeclarations(
                 definitionsFile = definitionsFile,

diff --git a/buildSrc/src/main/kotlin/csstype-declarations.gradle.kts b/buildSrc/src/main/kotlin/csstype-declarations.gradle.kts
@@ -4,8 +4,7 @@ plugins {
 
 tasks.named("generateDeclarations") {
     doLast {
-        val definitionsFile = rootProject.buildDir
-            .resolve("js/node_modules/csstype/index.d.ts")
+        val definitionsFile = nodeModules.resolve("csstype/index.d.ts")
         val sourceDir = projectDir.resolve("src/jsMain/kotlin")
 
         delete(sourceDir)

diff --git a/buildSrc/src/main/kotlin/popper-declarations.gradle.kts b/buildSrc/src/main/kotlin/popper-declarations.gradle.kts
@@ -4,8 +4,7 @@ plugins {
 
 tasks.named("generateDeclarations") {
     doLast {
-        val definitionsDir = rootProject.buildDir
-            .resolve("js/node_modules/@popperjs/core/lib")
+        val definitionsDir = nodeModules.resolve("@popperjs/core/lib")
         val sourceDir = projectDir.resolve("src/jsMain/kotlin")
 
         delete(sourceDir)

diff --git a/buildSrc/src/main/kotlin/react-query-declarations.gradle.kts b/buildSrc/src/main/kotlin/react-query-declarations.gradle.kts
@@ -4,8 +4,7 @@ plugins {
 
 tasks.named("generateDeclarations") {
     doLast {
-        val tanstackDir = rootProject.buildDir
-            .resolve("js/node_modules/@tanstack")
+        val tanstackDir = nodeModules.resolve("@tanstack")
 
         val coreTypesDir = tanstackDir
             .resolve("query-core/build/lib")

diff --git a/buildSrc/src/main/kotlin/react-table-declarations.gradle.kts b/buildSrc/src/main/kotlin/react-table-declarations.gradle.kts
@@ -4,9 +4,7 @@ plugins {
 
 tasks.named("generateDeclarations") {
     doLast {
-        val coreDefinitionsDir = rootProject.buildDir
-            .resolve("js/node_modules/@tanstack/table-core/build/lib")
-
+        val coreDefinitionsDir = nodeModules.resolve("@tanstack/table-core/build/lib")
         val sourceDir = projectDir.resolve("src/jsMain/kotlin")
 
         delete(sourceDir)

diff --git a/buildSrc/src/main/kotlin/react-virtual-declarations.gradle.kts b/buildSrc/src/main/kotlin/react-virtual-declarations.gradle.kts
@@ -4,9 +4,7 @@ plugins {
 
 tasks.named("generateDeclarations") {
     doLast {
-        val coreDefinitionsFile = rootProject.buildDir
-            .resolve("js/node_modules/@tanstack/virtual-core/build/lib/index.d.ts")
-
+        val coreDefinitionsFile = nodeModules.resolve("@tanstack/virtual-core/build/lib/index.d.ts")
         val sourceDir = projectDir.resolve("src/jsMain/kotlin")
 
         delete(sourceDir)

diff --git a/buildSrc/src/main/kotlin/typescript-declarations.gradle.kts b/buildSrc/src/main/kotlin/typescript-declarations.gradle.kts
@@ -4,8 +4,7 @@ plugins {
 
 tasks.named("generateDeclarations") {
     doLast {
-        val definitionsFile = rootProject.buildDir
-            .resolve("js/node_modules/typescript/lib/typescript.d.ts")
+        val definitionsFile = nodeModules.resolve("typescript/lib/typescript.d.ts")
         val sourceDir = projectDir.resolve("src/jsMain/kotlin")
 
         delete(sourceDir)