Skip to content

Commit d694dda

Browse files
committed
IR transitive dependencies
Closes #5
1 parent f8a7818 commit d694dda

File tree

17 files changed

+164
-150
lines changed

17 files changed

+164
-150
lines changed

.editorconfig

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
[*.{kt,kts}]
1+
root = true
2+
3+
[*]
24
indent_size = 2
3-
insert_final_newline = true
4-
max_line_length = 280
5-
disabled_rules=no-wildcard-imports
5+
continuation_indent_size = 4
6+
ij_kotlin_name_count_to_use_star_import = unset

.github/workflows/release.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,10 @@ jobs:
5454
uses: actions/setup-java@v1
5555
with:
5656
java-version: 11
57-
- name: Set Version
58-
run: echo "version=${VERSION//v}" >> gradle.properties
57+
- name: Publish to Gradle Plugin Portal
58+
run: ./gradlew publishPlugins -Pgradle.publish.key="${{ secrets.GRADLE_PUBLISH_KEY }}" -Pgradle.publish.secret="${{ secrets.GRADLE_PUBLISH_SECRET }}" -Pversion=${VERSION//v}
5959
env:
6060
VERSION: ${{ github.event.release.tag_name }}
61-
- name: Publish to Gradle Plugin Portal
62-
run: ./gradlew publishPlugins -Pgradle.publish.key="${{ secrets.GRADLE_PUBLISH_KEY }}" -Pgradle.publish.secret="${{ secrets.GRADLE_PUBLISH_SECRET }}"
6361

6462
release-GitHub:
6563
name: "Release: GitHub"
@@ -81,12 +79,9 @@ jobs:
8179
uses: actions/setup-java@v1
8280
with:
8381
java-version: 11
84-
- name: Set Version
85-
run: echo "version=${VERSION//v}" >> gradle.properties
86-
env:
87-
VERSION: ${{ github.event.release.tag_name }}
8882
- name: Publish to GitHub Packages
89-
run: ./gradlew publish -Ppublish.GitHub=true -Ppublish=true -Poverride=false
83+
run: ./gradlew publish -Ppublish.GitHub=true -Ppublish=true -Poverride=false -Pversion=${VERSION//v}
9084
env:
85+
VERSION: ${{ github.event.release.tag_name }}
9186
GH_USERNAME: ${{ github.actor }}
9287
GH_PASSWORD: ${{ github.token }}

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Gradle plugin enabling NPM publishing (essentially `maven-publish` for NPM packages). Integrates seamlessly with
1010
Kotlin/JS/MPP plugin if applied, providing auto configurations.
1111

12-
> The plugin was last tested with Kotlin 1.4.31
12+
> The plugin was last tested with Kotlin 1.4.32
1313
1414
## Setup
1515

@@ -26,15 +26,17 @@ tasks:
2626
```kotlin
2727
plugins {
2828
id("lt.petuska.npm.publish") version "<VERSION>"
29-
kotlin("multiplatform") version "1.4.0" // Optional, also supports "js"
29+
kotlin("multiplatform") version "1.4.32" // Optional, also supports "js"
3030
}
3131

3232
kotlin {
33-
js {
33+
// Legacy mode
34+
js(Legacy) {
3435
binaries.library()
3536
browser() // or nodejs()
3637
}
37-
js("ir", IR) {
38+
// OR IR mode
39+
js(IR) {
3840
binaries.library()
3941
browser() // or nodejs()
4042
}

build.gradle.kts

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,14 @@ plugins {
44
kotlin("jvm") version "1.3.72"
55
`java-gradle-plugin`
66
`maven-publish`
7-
id("com.gradle.plugin-publish") version "0.12.0"
8-
id("org.jetbrains.dokka") version "1.4.10.2"
9-
id("org.jlleitschuh.gradle.ktlint") version "9.4.1"
7+
id("com.gradle.plugin-publish")
8+
id("org.jetbrains.dokka")
9+
id("com.github.jakemarsden.git-hooks")
10+
id("org.jmailen.kotlinter")
1011
idea
1112
}
1213

1314
description = "Gradle plugin for npm package publishing"
14-
group = "lt.petuska"
15-
if (version == "unspecified") {
16-
version = "0.0.0"
17-
}
1815

1916
idea {
2017
module {
@@ -23,22 +20,25 @@ idea {
2320
}
2421
}
2522

23+
gitHooks {
24+
setHooks(mapOf("pre-commit" to "formatKotlin", "pre-push" to "check"))
25+
}
26+
27+
kotlinter {
28+
indentSize = 2
29+
experimentalRules = false
30+
}
31+
2632
repositories {
27-
jcenter()
28-
mavenCentral()
2933
mavenLocal()
30-
maven("https://dl.bintray.com/mpetuska/lt.petuska")
31-
maven("https://dl.bintray.com/kotlin/kotlin-eap")
32-
maven("https://dl.bintray.com/kotlin/kotlin-dev")
33-
maven("https://kotlin.bintray.com/kotlinx")
34-
maven("https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev")
34+
mavenCentral()
3535
gradlePluginPortal()
3636
}
3737

3838
kotlin {
3939
dependencies {
40-
api(kotlin("gradle-plugin", Version.kotlin))
41-
testImplementation("io.kotest:kotest-runner-junit5:${Version.kotest}")
40+
api("org.jetbrains.kotlin:kotlin-gradle-plugin:_")
41+
testImplementation("io.kotest:kotest-runner-junit5:_")
4242
}
4343
target.compilations {
4444
val main by getting
@@ -152,10 +152,6 @@ publishing {
152152

153153
afterEvaluate {
154154
tasks {
155-
withType<Wrapper> {
156-
gradleVersion = "6.7"
157-
distributionType = Wrapper.DistributionType.ALL
158-
}
159155
withType<Jar> {
160156
manifest {
161157
attributes += sortedMapOf(

buildSrc/src/main/kotlin/Version.kt

Lines changed: 0 additions & 4 deletions
This file was deleted.

gradle.properties

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
# The following property is required to mitigate issue https://github.com/gradle/gradle/issues/11412.
22
systemProp.org.gradle.internal.publish.checksums.insecure=true
33
kotlin.code.style=official
4+
kotlin.parallel.tasks.in.project=true
5+
kotlin.js.generate.externals=false
6+
kotlin.js.compiler=ir
7+
kotlin.incremental.js=true
8+
kotlin.mpp.stability.nowarn=true
49
kotlin.stdlib.default.dependency=false
10+
org.gradle.project.sourceCompatibility=11
511
org.gradle.vfs.watch=true
12+
version=0.0.0
13+
group=lt.petuska
614
#publish.all=true
715
#publish.GitHub=true
816
#publish.Bintray=true
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

sandbox/settings.gradle.kts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@ pluginManagement {
44
mavenLocal()
55
mavenCentral()
66
gradlePluginPortal()
7-
maven("https://dl.bintray.com/kotlin/kotlin-dev")
8-
maven("https://dl.bintray.com/kotlin/kotlin-eap")
9-
maven("https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev")
10-
maven("https://kotlin.bintray.com/kotlinx")
11-
maven("https://dl.bintray.com/mpetuska/lt.petuska")
127
}
138
}
149

scripts/getVersion.sh

Lines changed: 0 additions & 3 deletions
This file was deleted.

scripts/pre-commit

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)