Upgrade KGP to 1.8.0

CHANGELOG.md

@@ -17,16 +17,36 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+### Changed
+
+### Removed
+
+---
+
+## [3.2.0] - 2022-12-28
+
+### Verified Versions
+
+- Kotlin: 1.8.0
+- Gradle: 7.5.1
+- JDK: 11
+
+### Added
+
 - New [samples](./samples) project containing examples of various use-cases the plugin is able to cover.
 - `@DslMarkers` to plugin's DSL to prevent incorrect nested property usage.
 - Pull transitive npm dependencies from project dependencies via `publicPackageJson`
 - New accessors for assemble and pack tasks inside package DSL
+- KGP 1.8.0 support.
 
 ### Changed
+
 - Fix #73: `nodeHome` override not working when used with kotlin plugin
 
 ### Removed
 
+- Support for KGP < 1.8.0!!! **DO NOT UPGRADE IF YOU'RE ON OLDER KOTLIN VERSION**
+
 ---
 
 ## [3.1.0] - 2022-11-07
@@ -274,7 +294,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ---
 
-[Unreleased]: https://github.com/mpetuska/npm-publish/compare/3.1.0...HEAD
+[Unreleased]: https://github.com/mpetuska/npm-publish/compare/3.2.0...HEAD
+
+[3.2.0]: https://github.com/mpetuska/npm-publish/compare/3.1.0...3.2.0
 
 [3.1.0]: https://github.com/mpetuska/npm-publish/compare/3.0.1...3.1.0
 

buildSrc/build.gradle.kts → build-conventions/build.gradle.kts

@@ -9,11 +9,18 @@ repositories {
 }
 
 dependencies {
-  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$embeddedKotlinVersion")
-  implementation("org.jetbrains.dokka:dokka-gradle-plugin:$embeddedKotlinVersion")
+  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:_")
+  implementation("org.jetbrains.dokka:dokka-gradle-plugin:_")
   implementation("com.github.jakemarsden:git-hooks-gradle-plugin:_")
   implementation("com.gradle.publish:plugin-publish-plugin:_")
   implementation("io.github.gradle-nexus:publish-plugin:_")
   implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:_")
   implementation("dev.petuska:container-tasks-gradle-plugin:_")
 }
+
+gradleEnterprise {
+  buildScan {
+    termsOfServiceUrl = "https://gradle.com/terms-of-service"
+    termsOfServiceAgree = "yes"
+  }
+}

build-conventions/gradle

@@ -0,0 +1 @@
+../gradle

build-conventions/settings.gradle.kts

@@ -0,0 +1,11 @@
+plugins {
+  id("de.fayard.refreshVersions") version "0.40.1"
+  id("com.gradle.enterprise") version "3.8.1"
+}
+
+enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
+
+refreshVersions {
+  versionsPropertiesFile = rootDir.resolve("gradle/versions.properties")
+  extraArtifactVersionKeyRules(rootDir.resolve("gradle/versions.rules"))
+}

build-conventions/src/main/kotlin/convention.base.gradle.kts

@@ -0,0 +1,16 @@
+plugins {
+  idea
+}
+
+idea {
+  module {
+    isDownloadJavadoc = true
+    isDownloadSources = true
+  }
+}
+
+repositories {
+  mavenLocal()
+  mavenCentral()
+  gradlePluginPortal()
+}

buildSrc/src/main/kotlin/plugin.base.gradle.kts → build-conventions/src/main/kotlin/convention.detekt.gradle.kts

@@ -2,32 +2,18 @@ import io.gitlab.arturbosch.detekt.Detekt
 
 plugins {
   id("io.gitlab.arturbosch.detekt")
-  idea
 }
 
 dependencies {
   detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:_")
 }
 
 detekt {
-  config.from(rootDir.resolve("detekt.yml"))
+  config.from(rootDir.resolve("gradle/detekt.yml"))
   buildUponDefaultConfig = true
 }
 
-idea {
-  module {
-    isDownloadJavadoc = true
-    isDownloadSources = true
-  }
-}
-
-repositories {
-  mavenLocal()
-  mavenCentral()
-  gradlePluginPortal()
-}
-
-tasks.withType<Detekt>().configureEach {
+tasks.withType<Detekt> {
   reports {
     html.required.set(true) // observe findings in your browser with structure and code snippets
     xml.required.set(true) // checkstyle like format mainly for integrations like Jenkins

buildSrc/src/main/kotlin/plugin.kotlin-jvm.gradle.kts → build-conventions/src/main/kotlin/convention.kotlin-jvm.gradle.kts

@@ -1,17 +1,21 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-  id("plugin.base")
+  id("convention.detekt")
+  id("convention.base")
   kotlin("jvm")
 }
 
 tasks {
-  withType<KotlinCompile>().configureEach {
+  withType<KotlinCompile> {
     kotlinOptions {
       languageVersion = "1.4"
+      kotlinOptions {
+        jvmTarget = "11"
+      }
     }
   }
-  withType<Test>().configureEach {
+  withType<Test> {
     useJUnitPlatform()
   }
 }

buildSrc/src/main/kotlin/plugin.publishing.gradle.kts → build-conventions/src/main/kotlin/convention.publishing.gradle.kts

@@ -74,20 +74,16 @@ java {
 }
 
 tasks {
-  withType<Test> {
-    useJUnitPlatform()
-  }
   withType<Jar> {
     manifest {
-      attributes +=
-        sortedMapOf(
-          "Built-By" to System.getProperty("user.name"),
-          "Build-Jdk" to System.getProperty("java.version"),
-          "Build-Kotlin" to embeddedKotlinVersion,
-          "Implementation-Version" to project.version,
-          "Created-By" to GradleVersion.current(),
-          "Created-From" to Git.headCommitHash
-        )
+      attributes += sortedMapOf(
+        "Built-By" to System.getProperty("user.name"),
+        "Build-Jdk" to System.getProperty("java.version"),
+        "Build-Kotlin" to embeddedKotlinVersion,
+        "Implementation-Version" to project.version,
+        "Created-By" to GradleVersion.current(),
+        "Created-From" to Git.headCommitHash
+      )
     }
   }
 }

build.gradle.kts

@@ -1,15 +1,8 @@
 plugins {
   id("io.github.gradle-nexus.publish-plugin")
-  id("plugin.base")
+  id("convention.base")
   if (System.getenv("CI") in arrayOf(null, "0", "false", "n")) {
-    id("plugin.git-hooks")
-  }
-}
-
-gradleEnterprise {
-  buildScan {
-    termsOfServiceUrl = "https://gradle.com/terms-of-service"
-    termsOfServiceAgree = "yes"
+    id("convention.git-hooks")
   }
 }
 
@@ -22,6 +15,13 @@ nexusPublishing {
   }
 }
 
+gradleEnterprise {
+  buildScan {
+    termsOfServiceUrl = "https://gradle.com/terms-of-service"
+    termsOfServiceAgree = "yes"
+  }
+}
+
 println(
   """
   BUILD VERSIONS

gradle/versions.properties

@@ -6,47 +6,27 @@
 ####
 #### suppress inspection "SpellCheckingInspection" for whole file
 #### suppress inspection "UnusedProperty" for whole file
-
 #======================================= Plugins ========================================
 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=1.1.0
-
 version.dev.petuska..container-tasks-gradle-plugin=0.0.4
-
 version.io.github.gradle-nexus..publish-plugin=1.1.0
-
 version.detekt=1.22.0
-
 version.io.gitlab.arturbosch.detekt..detekt-formatting=1.22.0
-
 version.io.gitlab.arturbosch.detekt..detekt-gradle-plugin=1.22.0
-
 version.junit.jupiter=5.9.1
-
 version.com.github.gmazzo..gradle-buildconfig-plugin=3.0.3
-
 version.ktlint=0.43.2
-
 #====================================== Libraries =======================================
 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.8.0-RC
-
+version.kotlin=1.8.0
 version.kotest=5.5.4
-
- version.ktor=2.2.1
-
+version.ktor=2.2.1
 version.com.google.code.gson..gson=2.10
+version.org.jetbrains.dokka..dokka-gradle-plugin=1.7.20

npm-publish-docs/build.gradle.kts

@@ -3,7 +3,7 @@ import task.MkDocsExec
 import java.io.FileFilter
 
 plugins {
-  id("plugin.base")
+  id("convention.base")
 }
 
 tasks {

npm-publish-gradle-plugin/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-  id("plugin.kotlin-jvm")
-  id("plugin.publishing")
+  id("convention.kotlin-jvm")
+  id("convention.publishing")
 }
 
 description = """

npm-publish-gradle-plugin/src/main/kotlin/config/kotlinJsTarget.kt

@@ -80,7 +80,7 @@ internal fun ProjectEnhancer.configure(target: KotlinJsTargetDsl) {
         typesFile.map<String> { it.takeIf(File::exists)?.name.unsafeCast() }
           .orElse(pkg.packageJson.flatMap(PackageJson::types))
       )
-      pkg.dependencies.addAllLater(resolveDependencies(publicPackageJsonTask))
+      pkg.dependencies.addAllLater(resolveDependencies(target.name, binary))
       pkg.files { files ->
         files.from(outputFile.map(File::getParentFile))
         files.from(processResourcesTask.map(Copy::getDestinationDir))
@@ -90,19 +90,20 @@ internal fun ProjectEnhancer.configure(target: KotlinJsTargetDsl) {
   }
 }
 
-private fun ProjectEnhancer.resolveDependencies(publicPackageJsonTask: Provider<PublicPackageJsonTask>) =
-  publicPackageJsonTask.map {
-    val json = Gson().fromJson(it.packageJsonFile.readText(), JsonObject::class.java)
-    fun JsonObject.parse(scope: NpmDependency.Type) = asMap().mapValues { (_, v) -> v.asString }.map { (n, v) ->
-      objects.newInstance(NpmDependency::class.java, n).apply {
-        type.set(scope)
-        version.set(v)
-      }
+private fun ProjectEnhancer.resolveDependencies(
+  publicPackageJsonTask: Provider<PublicPackageJsonTask>
+): Provider<List<NpmDependency>> = publicPackageJsonTask.map(PublicPackageJsonTask::packageJsonFile).map { pJson ->
+  val json = Gson().fromJson(pJson.readText(), JsonObject::class.java)
+  fun JsonObject.parse(scope: NpmDependency.Type) = asMap().mapValues { (_, v) -> v.asString }.map { (n, v) ->
+    objects.newInstance(NpmDependency::class.java, n).apply {
+      type.set(scope)
+      version.set(v)
     }
-    json.getAsJsonObject("dependencies").parse(NpmDependency.Type.NORMAL) +
-      json.getAsJsonObject("peerDependencies").parse(NpmDependency.Type.PEER) +
-      json.getAsJsonObject("optionalDependencies").parse(NpmDependency.Type.OPTIONAL)
   }
+  json.getAsJsonObject("dependencies").parse(NpmDependency.Type.NORMAL) +
+    json.getAsJsonObject("peerDependencies").parse(NpmDependency.Type.PEER) +
+    json.getAsJsonObject("optionalDependencies").parse(NpmDependency.Type.OPTIONAL)
+}
 
 private fun ProjectEnhancer.resolveDependencies(
   targetName: String,

npm-publish-gradle-plugin/src/main/kotlin/extension/NpmPublishExtension.kt

@@ -1,15 +1,11 @@
 package dev.petuska.npm.publish.extension
 
 import dev.petuska.npm.publish.NpmPublishPlugin
-import dev.petuska.npm.publish.extension.domain.NpmAccess
-import dev.petuska.npm.publish.extension.domain.NpmAccessScope
-import dev.petuska.npm.publish.extension.domain.NpmPackage
-import dev.petuska.npm.publish.extension.domain.NpmPackages
-import dev.petuska.npm.publish.extension.domain.NpmRegistries
-import dev.petuska.npm.publish.extension.domain.NpmRegistry
+import dev.petuska.npm.publish.extension.domain.*
 import dev.petuska.npm.publish.task.NodeExecTask
 import dev.petuska.npm.publish.task.NpmPackTask
 import dev.petuska.npm.publish.task.NpmPublishTask
+import dev.petuska.npm.publish.util.NpmPublishDsl
 import dev.petuska.npm.publish.util.WithGradleFactories
 import org.gradle.api.Action
 import org.gradle.api.NamedDomainObjectProvider
@@ -24,7 +20,8 @@ import java.net.URI
  * An extension for npm-publish plugin configuration
  * @see [NpmPublishPlugin]
  */
-@Suppress("unused", "LeakingThis")
+@Suppress("unused")
+@NpmPublishDsl
 public abstract class NpmPublishExtension : WithGradleFactories(), ExtensionAware, NpmAccessScope {
   public companion object {
     internal const val NAME = "npmPublish"

npm-publish-gradle-plugin/src/main/kotlin/extension/domain/NpmAccess.kt

@@ -1,6 +1,6 @@
 package dev.petuska.npm.publish.extension.domain
 
-import java.util.Locale
+import java.util.*
 
 /** Enum representation of NPM repository access */
 public enum class NpmAccess {

npm-publish-gradle-plugin/src/main/kotlin/extension/domain/NpmDependency.kt

@@ -1,6 +1,7 @@
 package dev.petuska.npm.publish.extension.domain
 
 import dev.petuska.npm.publish.util.NamedInput
+import dev.petuska.npm.publish.util.NpmPublishDsl
 import org.gradle.api.NamedDomainObjectContainer
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
@@ -10,6 +11,7 @@ import org.gradle.api.tasks.Optional
  * A simple representation of a npm dependency
  */
 @Suppress("unused")
+@NpmPublishDsl
 public interface NpmDependency : NamedInput {
   /**
    * Dependency version specification.