Upgrade KGP to 1.8.0

Author: mpetuska

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 renamed to 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 renamed to 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.git-hooks.gradle.kts renamed to build-conventions/src/main/kotlin/convention.git-hooks.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.kotlin-jvm.gradle.kts renamed to build-conventions/src/main/kotlin/convention.kotlin-jvm.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
+      )
     }
   }
 }