Skip to content

Commit 3fd7819

Browse files
author
mpetuska
committed
Duplication Strategy
1 parent 3d26a0a commit 3fd7819

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
run: |
5858
VERSION=${VERSION:=${{ github.event.inputs.version }}}
5959
VERSION=${VERSION/v}
60-
./gradlew dokkaHtml;
60+
./gradlew dokkaHtml -Pversion=${VERSION//v};
6161
cp -avr build/dokka/html/ public;
6262
find public -type f -regex '.*\.\(htm\|html\|txt\|text\|js\|css\)$' -exec gzip -f -k {} \;
6363
echo '/npm-publish /npm-publish/npm-publish/index.html 301' > public/_redirects;

src/main/kotlin/task/NpmPackageAssembleTask.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,11 @@ package dev.petuska.npm.publish.task
33
import com.google.gson.Gson
44
import dev.petuska.npm.publish.delegate.fallbackDelegate
55
import dev.petuska.npm.publish.delegate.gradleProperty
6-
import dev.petuska.npm.publish.dsl.JsonObject
7-
import dev.petuska.npm.publish.dsl.NpmPublication
8-
import dev.petuska.npm.publish.dsl.NpmShrinkwrapJson
9-
import dev.petuska.npm.publish.dsl.PackageJson
10-
import dev.petuska.npm.publish.dsl.writeTo
6+
import dev.petuska.npm.publish.dsl.*
117
import dev.petuska.npm.publish.npmPublishing
128
import org.gradle.api.DefaultTask
139
import org.gradle.api.file.CopySpec
10+
import org.gradle.api.file.DuplicatesStrategy
1411
import org.gradle.api.tasks.Internal
1512
import org.gradle.api.tasks.TaskAction
1613
import org.jetbrains.kotlin.gradle.targets.js.ir.JsIrBinary
@@ -63,6 +60,7 @@ open class NpmPackageAssembleTask @Inject constructor(
6360
destinationDir.deleteRecursively()
6461
with(publication) {
6562
project.copy { cp ->
63+
cp.duplicatesStrategy = DuplicatesStrategy.WARN
6664
cp.into(this@NpmPackageAssembleTask.destinationDir)
6765
cp.resolveFiles()
6866

versions.properties

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,20 @@
66
####
77
#### suppress inspection "SpellCheckingInspection" for whole file
88
#### suppress inspection "UnusedProperty" for whole file
9+
910
plugin.com.github.jakemarsden.git-hooks=0.0.2
11+
1012
plugin.com.gradle.plugin-publish=0.15.0
13+
1114
plugin.org.jetbrains.dokka=1.4.32
15+
1216
plugin.org.jlleitschuh.gradle.ktlint=10.0.0
17+
1318
plugin.io.github.gradle-nexus.publish-plugin=1.1.0
1419

1520
version.com.google.code.gson..gson=2.8.7
21+
1622
version.kotest=4.6.0
23+
1724
version.kotlin=1.5.10
25+
## # available=1.5.20-M1

0 commit comments

Comments
 (0)