diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 12b63ce2..a2c9e540 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -57,7 +57,7 @@ jobs: run: | VERSION=${VERSION:=${{ github.event.inputs.version }}} VERSION=${VERSION/v} - ./gradlew dokkaHtml; + ./gradlew dokkaHtml -Pversion=${VERSION//v}; cp -avr build/dokka/html/ public; find public -type f -regex '.*\.\(htm\|html\|txt\|text\|js\|css\)$' -exec gzip -f -k {} \; echo '/npm-publish /npm-publish/npm-publish/index.html 301' > public/_redirects; diff --git a/src/main/kotlin/task/NpmPackageAssembleTask.kt b/src/main/kotlin/task/NpmPackageAssembleTask.kt index 3f452165..7fe9d32d 100644 --- a/src/main/kotlin/task/NpmPackageAssembleTask.kt +++ b/src/main/kotlin/task/NpmPackageAssembleTask.kt @@ -3,14 +3,11 @@ package dev.petuska.npm.publish.task import com.google.gson.Gson import dev.petuska.npm.publish.delegate.fallbackDelegate import dev.petuska.npm.publish.delegate.gradleProperty -import dev.petuska.npm.publish.dsl.JsonObject -import dev.petuska.npm.publish.dsl.NpmPublication -import dev.petuska.npm.publish.dsl.NpmShrinkwrapJson -import dev.petuska.npm.publish.dsl.PackageJson -import dev.petuska.npm.publish.dsl.writeTo +import dev.petuska.npm.publish.dsl.* import dev.petuska.npm.publish.npmPublishing import org.gradle.api.DefaultTask import org.gradle.api.file.CopySpec +import org.gradle.api.file.DuplicatesStrategy import org.gradle.api.tasks.Internal import org.gradle.api.tasks.TaskAction import org.jetbrains.kotlin.gradle.targets.js.ir.JsIrBinary @@ -63,6 +60,7 @@ open class NpmPackageAssembleTask @Inject constructor( destinationDir.deleteRecursively() with(publication) { project.copy { cp -> + cp.duplicatesStrategy = DuplicatesStrategy.WARN cp.into(this@NpmPackageAssembleTask.destinationDir) cp.resolveFiles() diff --git a/versions.properties b/versions.properties index cd6fca60..8fdd0040 100644 --- a/versions.properties +++ b/versions.properties @@ -6,12 +6,20 @@ #### #### suppress inspection "SpellCheckingInspection" for whole file #### suppress inspection "UnusedProperty" for whole file + plugin.com.github.jakemarsden.git-hooks=0.0.2 + plugin.com.gradle.plugin-publish=0.15.0 + plugin.org.jetbrains.dokka=1.4.32 + plugin.org.jlleitschuh.gradle.ktlint=10.0.0 + plugin.io.github.gradle-nexus.publish-plugin=1.1.0 version.com.google.code.gson..gson=2.8.7 + version.kotest=4.6.0 + version.kotlin=1.5.10 +## # available=1.5.20-M1