diff --git a/.gitignore b/.gitignore index 0f5ba847..75e87c60 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ local.properties apiDiff.api public/ node_modules +*.log diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..d2f1e04d --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,12 @@ +# v2.0.4 +## Versions +* Kotlin: 1.5.21 +* Gradle: 7.1.1 +* JDK: 11 + +## Changes +* Updated versions +* Dynamic version ranges for increased compatibility +* Fixed a bug that always expected version to be a string +* Removed some duplicated code in sandbox +* New sandbox module to check that plugin can work with both, nodejs() and browser() flavours at the same time diff --git a/README.md b/README.md index d1c04dcb..6c2e3762 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Gradle plugin enabling NPM publishing (essentially `maven-publish` for NPM packages). Integrates seamlessly with Kotlin/JS/MPP plugin if applied, providing auto configurations. -> The plugin was last tested with `JDK 11`, `Kotlin 1.5.10` & `Gradle 7.0.2` +> The plugin was last tested with `JDK 11`, `Kotlin 1.5.21` & `Gradle 7.1.1` ## Setup @@ -26,7 +26,7 @@ tasks: ```kotlin plugins { id("dev.petuska.npm.publish") version "" - kotlin("multiplatform") version "1.4.32" // Optional, also supports "js" + kotlin("multiplatform") version "1.5.21" // Optional, also supports "js" } kotlin { @@ -228,7 +228,7 @@ This ensures that any given dependency does not appear in multiple dependency sc ## Known Issues -* [#6435](https://github.com/npm/npm/issues/6435): npm and yarn tries to download bundled dependencies. Can be overcome +* [#6435](https://github.com/npm/npm/issues/6435): (Only applies to legacy backend) npm and yarn tries to download bundled dependencies. Can be overcome for npm (sadly not yarn) with `shrinkwrapBundledDependencies` option. Note that it works fine for both package managers when installing from a tarball. Bug [#2143](https://github.com/npm/cli/issues/2143) on the new npm repo, so please vote for that to get it fixed. Bug [#8436](https://github.com/yarnpkg/yarn/issues/8436) on the yarn repo, so diff --git a/build.gradle.kts b/build.gradle.kts index 35baf769..96a6c289 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -36,9 +36,8 @@ gradleEnterprise { gitHooks { setHooks( mapOf( - "post-checkout" to "ktlintApplyToIdea", "pre-commit" to "ktlintFormat", - "pre-push" to "check" + "pre-push" to "ktlintCheck" ) ) } diff --git a/gradle.properties b/gradle.properties index dc3fe8bd..267bc3a6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,6 @@ # The following property is required to mitigate issue https://github.com/gradle/gradle/issues/11412. systemProp.org.gradle.internal.publish.checksums.insecure=true kotlin.code.style=official -kotlin.parallel.tasks.in.project=true kotlin.js.generate.externals=false kotlin.js.compiler=ir kotlin.incremental.js=true @@ -9,12 +8,7 @@ kotlin.mpp.stability.nowarn=true kotlin.stdlib.default.dependency=false org.gradle.project.sourceCompatibility=11 org.gradle.vfs.watch=true +org.gradle.parallel=true version=0.0.0 -group=dev.petuska -#publish.all=true -#publish.GitHub=true -#publish.Bintray=true -#publish.skip.all=true -#publish.skip.GitLab=true -#publish.skip.Bintray=true +group=dev.petuska \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0f80bbf5..05679dc3 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.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/sandbox/both/build.gradle.kts b/sandbox/both/build.gradle.kts new file mode 100644 index 00000000..b356d35c --- /dev/null +++ b/sandbox/both/build.gradle.kts @@ -0,0 +1,43 @@ +plugins { + kotlin("js") + id("dev.petuska.npm.publish") +} + +kotlin { + js { + nodejs() + browser() + useCommonJs() + binaries.library() + } + dependencies { + implementation(npm("axios", "*")) + api(devNpm("snabbdom", "*")) + implementation("io.ktor:ktor-client-core:_") + } + sourceSets { + all { + languageSettings.useExperimentalAnnotation("kotlin.js.ExperimentalJsExport") + } + } +} + +npmPublishing { + organization = group as String + + publications { + named("js") { + packageJsonTemplateFile = projectDir.resolve("../template.package.json") + packageJson { + author { name = "Martynas Petuška" } + } + } + } + repositories { + repository("GitLab") { + registry = uri("https://gitlab.com/api/v4/projects/${System.getenv("CI_PROJECT_ID")?.trim()}/packages/npm") + authToken = System.getenv("PRIVATE_TOKEN")?.trim() ?: "" + } + } +} + diff --git a/sandbox/mpp/src/commonMain/kotlin/test/sandbox/index.kt b/sandbox/both/src/main/kotlin/test/sandbox/index.kt similarity index 84% rename from sandbox/mpp/src/commonMain/kotlin/test/sandbox/index.kt rename to sandbox/both/src/main/kotlin/test/sandbox/index.kt index d93b66ae..f66b48a8 100644 --- a/sandbox/mpp/src/commonMain/kotlin/test/sandbox/index.kt +++ b/sandbox/both/src/main/kotlin/test/sandbox/index.kt @@ -1,6 +1,11 @@ package test.sandbox -import kotlin.js.JsExport +import io.ktor.http.HttpMethod + +@JsExport +fun direct() { + println("Ktor method: ${HttpMethod.Get}") +} @JsExport fun sayHello(name: Name = "Mr. PP Trump"): Name = "Hello from $name".also { println(it) } @@ -17,7 +22,3 @@ external interface Person { val name: String val sureName: String } - -fun main() { - println("Hey") -} \ No newline at end of file diff --git a/sandbox/browser/src/main/resources/css/main.css b/sandbox/both/src/main/resources/css/main.css similarity index 100% rename from sandbox/browser/src/main/resources/css/main.css rename to sandbox/both/src/main/resources/css/main.css diff --git a/sandbox/browser/src/main/resources/index.html b/sandbox/both/src/main/resources/index.html similarity index 100% rename from sandbox/browser/src/main/resources/index.html rename to sandbox/both/src/main/resources/index.html diff --git a/sandbox/browser/build.gradle.kts b/sandbox/browser/build.gradle.kts index bb7fdbff..9b7061d6 100644 --- a/sandbox/browser/build.gradle.kts +++ b/sandbox/browser/build.gradle.kts @@ -12,7 +12,7 @@ kotlin { dependencies { implementation(npm("axios", "*")) api(devNpm("snabbdom", "*")) - implementation("io.ktor:ktor-client-core:1.4.1") + implementation("io.ktor:ktor-client-core:_") } sourceSets { all { diff --git a/sandbox/browser/src b/sandbox/browser/src new file mode 120000 index 00000000..060d324e --- /dev/null +++ b/sandbox/browser/src @@ -0,0 +1 @@ +../both/src \ No newline at end of file diff --git a/sandbox/browser/src/main/kotlin/test/sandbox/index.kt b/sandbox/browser/src/main/kotlin/test/sandbox/index.kt deleted file mode 100644 index 3941f24c..00000000 --- a/sandbox/browser/src/main/kotlin/test/sandbox/index.kt +++ /dev/null @@ -1,13 +0,0 @@ -package test.sandbox - -import io.ktor.http.HttpMethod - -fun main(args: Array) { - println(args) -} - -@JsName("direct") -@JsExport -fun direct() { - println("Ktor method: ${HttpMethod.Get}") -} diff --git a/sandbox/build.gradle.kts b/sandbox/build.gradle.kts index 02865b58..e8a58dd5 100644 --- a/sandbox/build.gradle.kts +++ b/sandbox/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("multiplatform") version "1.5.10" apply false + kotlin("multiplatform") apply false id("dev.petuska.npm.publish") version "0.0.0" } @@ -17,7 +17,8 @@ npmPublishing { organization = group as String publications { publication("custom") { - nodeJsDir = file("${System.getProperty("user.home")}/.gradle/nodejs/node-v12.16.1-linux-x64") + nodeJsDir = file("${System.getProperty("user.home")}/.gradle/nodejs").listFiles()?.find { it.name.startsWith("node") } + packageJsonTemplateFile = rootDir.resolve("template.package.json") packageJson { author to "Custom Author" keywords = jsonArray( diff --git a/sandbox/gradle b/sandbox/gradle new file mode 120000 index 00000000..3337596a --- /dev/null +++ b/sandbox/gradle @@ -0,0 +1 @@ +../gradle \ No newline at end of file diff --git a/sandbox/gradle.properties b/sandbox/gradle.properties index 98e5428c..8957eeb6 100644 --- a/sandbox/gradle.properties +++ b/sandbox/gradle.properties @@ -1,4 +1,5 @@ kotlin.mpp.stability.nowarn=true org.gradle.vfs.watch=true -npm.publish.dry=true +org.gradle.parallel=true +npm.publish.dry=false kotlin.js.compiler=ir diff --git a/sandbox/mpp/build.gradle.kts b/sandbox/mpp/build.gradle.kts index e7fedf42..2a86ad9d 100644 --- a/sandbox/mpp/build.gradle.kts +++ b/sandbox/mpp/build.gradle.kts @@ -19,7 +19,7 @@ kotlin { sourceSets { all { dependencies { - implementation("io.ktor:ktor-client-core:1.4.1") + implementation("io.ktor:ktor-client-core:_") implementation(devNpm("axios", "*")) api(npm("snabbdom", "*")) } diff --git a/sandbox/mpp/src/commonMain/kotlin b/sandbox/mpp/src/commonMain/kotlin new file mode 120000 index 00000000..c1558189 --- /dev/null +++ b/sandbox/mpp/src/commonMain/kotlin @@ -0,0 +1 @@ +../../../both/src/main/kotlin \ No newline at end of file diff --git a/sandbox/mpp/src/commonMain/resources b/sandbox/mpp/src/commonMain/resources new file mode 120000 index 00000000..8311534d --- /dev/null +++ b/sandbox/mpp/src/commonMain/resources @@ -0,0 +1 @@ +../../../both/src/main/resources \ No newline at end of file diff --git a/sandbox/mpp/src/commonMain/resources/css/exe.css b/sandbox/mpp/src/commonMain/resources/css/exe.css deleted file mode 100644 index e69de29b..00000000 diff --git a/sandbox/mpp/src/commonMain/resources/index.html b/sandbox/mpp/src/commonMain/resources/index.html deleted file mode 100644 index 156938b2..00000000 --- a/sandbox/mpp/src/commonMain/resources/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - Exe - - - - - diff --git a/sandbox/node/build.gradle.kts b/sandbox/node/build.gradle.kts index e06c572a..09eab851 100644 --- a/sandbox/node/build.gradle.kts +++ b/sandbox/node/build.gradle.kts @@ -12,7 +12,7 @@ kotlin { dependencies { implementation(npm("axios", "*")) api(devNpm("snabbdom", "*")) - implementation("io.ktor:ktor-client-core:1.4.1") + implementation("io.ktor:ktor-client-core:_") } sourceSets { all { diff --git a/sandbox/node/src b/sandbox/node/src new file mode 120000 index 00000000..060d324e --- /dev/null +++ b/sandbox/node/src @@ -0,0 +1 @@ +../both/src \ No newline at end of file diff --git a/sandbox/node/src/main/kotlin/test/sandbox/index.kt b/sandbox/node/src/main/kotlin/test/sandbox/index.kt deleted file mode 100644 index 2809b38a..00000000 --- a/sandbox/node/src/main/kotlin/test/sandbox/index.kt +++ /dev/null @@ -1,13 +0,0 @@ -package test.sandbox - -import io.ktor.http.* - -fun main(args: Array) { - println(args) -} - -@JsName("direct") -@JsExport -fun direct() { - println("Ktor method: ${HttpMethod.Get}") -} diff --git a/sandbox/node/src/main/resources/css/main.css b/sandbox/node/src/main/resources/css/main.css deleted file mode 100644 index e69de29b..00000000 diff --git a/sandbox/node/src/main/resources/index.html b/sandbox/node/src/main/resources/index.html deleted file mode 100644 index e149a394..00000000 --- a/sandbox/node/src/main/resources/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - Title - - - - - diff --git a/sandbox/settings.gradle.kts b/sandbox/settings.gradle.kts index 4bcfe597..967aad0c 100644 --- a/sandbox/settings.gradle.kts +++ b/sandbox/settings.gradle.kts @@ -1,4 +1,3 @@ -rootProject.name = "sandbox" pluginManagement { repositories { mavenLocal() @@ -6,12 +5,17 @@ pluginManagement { gradlePluginPortal() } } +plugins { + id("de.fayard.refreshVersions") version "0.10.1" + id("com.gradle.enterprise") version "3.6.3" +} -include(":node", ":browser", ":mpp") +rootProject.name = "sandbox" + +include(":node", ":browser", ":both", ":mpp") includeBuild("../") { dependencySubstitution { substitute(module("dev.petuska:npm-publish")).with(project(":")) substitute(module("dev.petuska.npm.publish:dev.petuska.npm.publish.gradle.plugin")).with(project(":")) } } - diff --git a/sandbox/ts-consumer/package.json b/sandbox/ts-consumer/package.json new file mode 100644 index 00000000..95b12621 --- /dev/null +++ b/sandbox/ts-consumer/package.json @@ -0,0 +1,22 @@ +{ + "name": "@dev.petuska/ts-consumer", + "main": "src/insex.ts", + "version": "0.0.0", + "license": "Apache-2.0", + "scripts": { + "clean": "rm -rf node_modules/@dev.petuska", + "start": "ts-node src/index.ts" + }, + "dependencies": { + "@dev.petuska/both": "file:../both/build/publications/npm/dev.petuska-both-0.0.0.tgz", + "@dev.petuska/browser": "file:../browser/build/publications/npm/dev.petuska-browser-0.0.0.tgz", + "@dev.petuska/mpp-browser": "file:../mpp/build/publications/npm/dev.petuska-mpp-browser-0.0.0.tgz", + "@dev.petuska/mpp-node": "file:../mpp/build/publications/npm/dev.petuska-mpp-node-0.0.0.tgz", + "@dev.petuska/node": "file:../node/build/publications/npm/dev.petuska-node-0.0.0.tgz" + }, + "devDependencies": { + "@types/node": "^16.4.0", + "ts-node": "^10.1.0", + "typescript": "^4.3.5" + } +} diff --git a/sandbox/ts-consumer/src/index.ts b/sandbox/ts-consumer/src/index.ts new file mode 100644 index 00000000..525984ad --- /dev/null +++ b/sandbox/ts-consumer/src/index.ts @@ -0,0 +1,11 @@ +import both from '@dev.petuska/both' +import browser from '@dev.petuska/browser' +import node from '@dev.petuska/node' +import mppBrowser from '@dev.petuska/mpp-browser' +import mppNode from '@dev.petuska/mpp-node' + +both.test.sandbox.sayFormalHello({name: 'Both', sureName: 'Simple'}) +browser.test.sandbox.sayFormalHello({name: 'Browser', sureName: 'Simple'}) +node.test.sandbox.sayFormalHello({name: 'Node', sureName: 'Simple'}) +mppBrowser.test.sandbox.sayFormalHello({name: 'Browser', sureName: 'MPP'}) +mppNode.test.sandbox.sayFormalHello({name: 'Node', sureName: 'MPP'}) \ No newline at end of file diff --git a/sandbox/ts-consumer/yarn.lock b/sandbox/ts-consumer/yarn.lock new file mode 100644 index 00000000..bcf5c1bf --- /dev/null +++ b/sandbox/ts-consumer/yarn.lock @@ -0,0 +1,183 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@dev.petuska/both@file:../both/build/publications/npm/dev.petuska-both-0.0.0.tgz": + version "0.0.0" + resolved "file:../both/build/publications/npm/dev.petuska-both-0.0.0.tgz#a1cfcf0734237af06767677039d123636d548a8a" + dependencies: + abort-controller "3.0.0" + axios "*" + node-fetch "2.6.0" + ws "6.2.1" + +"@dev.petuska/browser@file:../browser/build/publications/npm/dev.petuska-browser-0.0.0.tgz": + version "0.0.0" + resolved "file:../browser/build/publications/npm/dev.petuska-browser-0.0.0.tgz#0f12286a13e9727d18e50c33d1b2a72d9953c8ca" + dependencies: + abort-controller "3.0.0" + axios "*" + node-fetch "2.6.0" + ws "6.2.1" + +"@dev.petuska/mpp-browser@file:../mpp/build/publications/npm/dev.petuska-mpp-browser-0.0.0.tgz": + version "0.0.0" + resolved "file:../mpp/build/publications/npm/dev.petuska-mpp-browser-0.0.0.tgz#fcdd7b0e0aec11b588a8bfe27e4e8198b21e0834" + dependencies: + abort-controller "3.0.0" + node-fetch "2.6.0" + snabbdom "*" + ws "6.2.1" + +"@dev.petuska/mpp-node@file:../mpp/build/publications/npm/dev.petuska-mpp-node-0.0.0.tgz": + version "0.0.0" + resolved "file:../mpp/build/publications/npm/dev.petuska-mpp-node-0.0.0.tgz#638416d6485548e30434b4f5e1a11220c99f479e" + dependencies: + abort-controller "3.0.0" + node-fetch "2.6.0" + snabbdom "*" + ws "6.2.1" + +"@dev.petuska/node@file:../node/build/publications/npm/dev.petuska-node-0.0.0.tgz": + version "0.0.0" + resolved "file:../node/build/publications/npm/dev.petuska-node-0.0.0.tgz#704dc20f399e4bd8a9bbb8c98583c7b79ceb2188" + dependencies: + abort-controller "3.0.0" + axios "*" + node-fetch "2.6.0" + ws "6.2.1" + +"@tsconfig/node10@^1.0.7": + version "1.0.8" + resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.8.tgz#c1e4e80d6f964fbecb3359c43bd48b40f7cadad9" + integrity sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg== + +"@tsconfig/node12@^1.0.7": + version "1.0.9" + resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.9.tgz#62c1f6dee2ebd9aead80dc3afa56810e58e1a04c" + integrity sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw== + +"@tsconfig/node14@^1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.1.tgz#95f2d167ffb9b8d2068b0b235302fafd4df711f2" + integrity sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg== + +"@tsconfig/node16@^1.0.1": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e" + integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA== + +"@types/node@^16.4.0": + version "16.4.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.0.tgz#2c219eaa3b8d1e4d04f4dd6e40bc68c7467d5272" + integrity sha512-HrJuE7Mlqcjj+00JqMWpZ3tY8w7EUd+S0U3L1+PQSWiXZbOgyQDvi+ogoUxaHApPJq5diKxYBQwA3iIlNcPqOg== + +abort-controller@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" + integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== + dependencies: + event-target-shim "^5.0.0" + +arg@^4.1.0: + version "4.1.3" + resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" + integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== + +async-limiter@~1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" + integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== + +axios@*: + version "0.21.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" + integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA== + dependencies: + follow-redirects "^1.10.0" + +buffer-from@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" + integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + +create-require@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" + integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== + +diff@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" + integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== + +event-target-shim@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" + integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== + +follow-redirects@^1.10.0: + version "1.14.1" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43" + integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg== + +make-error@^1.1.1: + version "1.3.6" + resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" + integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== + +node-fetch@2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" + integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== + +snabbdom@*: + version "3.0.3" + resolved "https://registry.yarnpkg.com/snabbdom/-/snabbdom-3.0.3.tgz#13ff22fbdd1c971ace1af55d4831bdb4972aafd0" + integrity sha512-+HEwNccHj1lTKx3I7vKm7La+FhhcJFJloPkmPE0pwYQFq6aZSx2SCJrUKotD/+L8kA+EHcXRmBe5Yd2LX1WlQQ== + +source-map-support@^0.5.17: + version "0.5.19" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" + integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map@^0.6.0: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +ts-node@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.1.0.tgz#e656d8ad3b61106938a867f69c39a8ba6efc966e" + integrity sha512-6szn3+J9WyG2hE+5W8e0ruZrzyk1uFLYye6IGMBadnOzDh8aP7t8CbFpsfCiEx2+wMixAhjFt7lOZC4+l+WbEA== + dependencies: + "@tsconfig/node10" "^1.0.7" + "@tsconfig/node12" "^1.0.7" + "@tsconfig/node14" "^1.0.0" + "@tsconfig/node16" "^1.0.1" + arg "^4.1.0" + create-require "^1.1.0" + diff "^4.0.1" + make-error "^1.1.1" + source-map-support "^0.5.17" + yn "3.1.1" + +typescript@^4.3.5: + version "4.3.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4" + integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA== + +ws@6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb" + integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA== + dependencies: + async-limiter "~1.0.0" + +yn@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" + integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== diff --git a/sandbox/versions.properties b/sandbox/versions.properties new file mode 120000 index 00000000..fb038ece --- /dev/null +++ b/sandbox/versions.properties @@ -0,0 +1 @@ +../versions.properties \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 5552e95c..47aeac49 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("de.fayard.refreshVersions") version "0.10.0" - id("com.gradle.enterprise") version "3.6.1" + id("de.fayard.refreshVersions") version "0.10.1" + id("com.gradle.enterprise") version "3.6.3" } rootProject.name = "npm-publish" diff --git a/src/main/kotlin/dsl/NpmPublishExtension.kt b/src/main/kotlin/dsl/NpmPublishExtension.kt index 3c00cbbc..a3277739 100644 --- a/src/main/kotlin/dsl/NpmPublishExtension.kt +++ b/src/main/kotlin/dsl/NpmPublishExtension.kt @@ -28,7 +28,7 @@ open class NpmPublishExtension(private val project: Project) : NpmPublishExtensi * NPM package version. * Defaults to [Project.getVersion] or rootProject.version. */ - var version: String? by project.propertyDelegate { it } or project.fallbackDelegate { version as String? } + var version: String? by project.propertyDelegate { it } or project.fallbackDelegate { version.toString() } /** * Default [NpmRepository.access] diff --git a/versions.properties b/versions.properties index 8fdd0040..959cd152 100644 --- a/versions.properties +++ b/versions.properties @@ -1,5 +1,5 @@ #### Dependencies and Plugin versions with their available updates. -#### Generated by `./gradlew refreshVersions` version 0.10.0 +#### Generated by `./gradlew refreshVersions` version 0.10.1 #### #### Don't manually edit or split the comments that start with four hashtags (####), #### they will be overwritten by refreshVersions. @@ -23,3 +23,5 @@ version.kotest=4.6.0 version.kotlin=1.5.10 ## # available=1.5.20-M1 + + version.ktor=1.6.1