From 31431dca8fc8f5bfafdac8192b96f14a00d6c77c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martynas=20Petu=C5=A1ka?= <martynas@petuska.dev>
Date: Sat, 10 Sep 2022 21:29:49 +0100
Subject: [PATCH] Closes #55 (#56)

---
 detekt.yml                                         |  4 +++-
 gradle/wrapper/gradle-wrapper.properties           |  2 +-
 .../src/main/kotlin/NpmPublishPlugin.kt            |  7 ++++---
 versions.properties                                | 14 +++++++-------
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/detekt.yml b/detekt.yml
index 75a0791a..5f89bcc7 100644
--- a/detekt.yml
+++ b/detekt.yml
@@ -18,7 +18,9 @@ comments:
     active: true
   UndocumentedPublicProperty:
     active: true
-
+naming:
+  InvalidPackageDeclaration:
+    active: false
 style:
   WildcardImport:
     active: false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 92f06b50..ae04661e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/npm-publish-gradle-plugin/src/main/kotlin/NpmPublishPlugin.kt b/npm-publish-gradle-plugin/src/main/kotlin/NpmPublishPlugin.kt
index 16fd48c5..bb8a4bda 100644
--- a/npm-publish-gradle-plugin/src/main/kotlin/NpmPublishPlugin.kt
+++ b/npm-publish-gradle-plugin/src/main/kotlin/NpmPublishPlugin.kt
@@ -49,9 +49,10 @@ public class NpmPublishPlugin : Plugin<Project> {
     }
 
     afterEvaluate {
-      val nodeDest = rootProject.tasks.named("kotlinNodeJsSetup", NodeJsSetupTask::class.java).map { it.destination }
-      extension.nodeHome.set(layout.dir(nodeDest))
-
+      val kotlinNodeJsSetup = rootProject.tasks.findByName("kotlinNodeJsSetup")
+      if (kotlinNodeJsSetup is NodeJsSetupTask) {
+        extension.nodeHome.set(kotlinNodeJsSetup.destination)
+      }
       tasks.maybeCreate("assemble").apply {
         group = "build"
         dependsOn(tasks.withType(NpmAssembleTask::class.java))
diff --git a/versions.properties b/versions.properties
index 548dafde..c9e63294 100644
--- a/versions.properties
+++ b/versions.properties
@@ -11,12 +11,12 @@ plugin.android=4.2.2
 plugin.com.gradle.plugin-publish=0.21.0
 plugin.io.github.gradle-nexus.publish-plugin=1.1.0
 version.com.github.jakemarsden..git-hooks-gradle-plugin=0.0.2
-version.com.gradle.publish..plugin-publish-plugin=0.21.0
+version.com.gradle.publish..plugin-publish-plugin=1.0.0
 version.dev.petuska..container-tasks-gradle-plugin=0.0.4
 version.io.github.gradle-nexus..publish-plugin=1.1.0
-version.io.gitlab.arturbosch.detekt..detekt-formatting=1.20.0
-version.io.gitlab.arturbosch.detekt..detekt-gradle-plugin=1.20.0
-version.junit.jupiter=5.8.2
+version.io.gitlab.arturbosch.detekt..detekt-formatting=1.21.0
+version.io.gitlab.arturbosch.detekt..detekt-gradle-plugin=1.21.0
+version.junit.jupiter=5.9.0
 version.com.github.gmazzo..gradle-buildconfig-plugin=3.0.3
 version.ktlint=0.43.2
 #====================================== Libraries =======================================
@@ -24,7 +24,7 @@ version.com.github.tschuchortdev..kotlin-compile-testing=1.4.5
 version.com.google.auto.service..auto-service=1.0
 version.com.google.auto.service..auto-service-annotations=1.0
 version.junit=5.8.2
-version.kotlin=1.7.0
-version.kotest=5.3.2
+version.kotlin=1.7.10
+version.kotest=5.4.2
 version.ktor=2.0.1
-version.com.google.code.gson..gson=2.9.0
+version.com.google.code.gson..gson=2.9.1