Skip to content

Commit c45f5b9

Browse files
authored
Merge pull request #8 from ZenWave360/main
backport main to develop
2 parents bdfa179 + 9d7d1be commit c45f5b9

File tree

6 files changed

+11
-20
lines changed

6 files changed

+11
-20
lines changed

.github/workflows/publish-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ jobs:
5050
env:
5151
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.CENTRAL_USERNAME }}
5252
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.CENTRAL_TOKEN }}
53-
SIGN_KEY: ${{ secrets.SIGN_KEY }}
54-
SIGN_KEY_PASS: ${{ secrets.SIGN_KEY_PASS }}
53+
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGN_KEY }}
54+
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGN_KEY_PASS }}
5555

5656
# NPM publishing disabled - uncomment when ready
5757
# - name: Publish JS package to npm

.github/workflows/publish-snapshots.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,5 @@ jobs:
5656
env:
5757
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.CENTRAL_USERNAME }}
5858
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.CENTRAL_TOKEN }}
59-
SIGN_KEY: ${{ secrets.SIGN_KEY }}
60-
SIGN_KEY_PASS: ${{ secrets.SIGN_KEY_PASS }}
59+
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGN_KEY }}
60+
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGN_KEY_PASS }}

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11

2-
> **Work in Progress**: Migration to kotlin multiplatform from the original [zdl-jvm](https://github.com/ZenWave360/zdl-jvm) repository.
3-
42
ZenWave Domain Model Language
53
=====================================
64

@@ -25,7 +23,7 @@ Usage:
2523

2624
```xml
2725
<dependency>
28-
<groupId>io.zenwave360.sdk</groupId>
26+
<groupId>io.zenwave360.dsl</groupId>
2927
<artifactId>dsl-kotlin-jvm</artifactId>
3028
<version>${dsl-kotlin.version}</version>
3129
</dependency>
@@ -41,6 +39,8 @@ NOTE: jvm version includes a working ZdlParser compiled from Kotlin ANTL4 target
4139

4240
* JavaScript/TypeScript:
4341

42+
NOTE: pending publishing to npm-registy
43+
4444
```bash
4545
npm install @zenwave360/dsl
4646
```

build.gradle.kts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
}
88

99
group = "io.zenwave360.dsl"
10-
version = "1.5.0-SNAPSHOT"
10+
version = "1.6.0-SNAPSHOT"
1111

1212
val antlrVersion = "4.13.2"
1313

@@ -72,12 +72,7 @@ val generateJavaGrammarSource by tasks.registering(JavaExec::class) {
7272
mavenPublishing {
7373
publishToMavenCentral(com.vanniktech.maven.publish.SonatypeHost.CENTRAL_PORTAL)
7474

75-
// Only sign if credentials are available (for CI/CD)
76-
val signingKey = System.getenv("SIGN_KEY")
77-
val signingPassword = System.getenv("SIGN_KEY_PASS")
78-
if (!signingKey.isNullOrBlank() && !signingPassword.isNullOrBlank()) {
79-
signAllPublications()
80-
}
75+
signAllPublications()
8176

8277
pom {
8378
name.set("ZDL Kotlin Multiplatform")
@@ -282,3 +277,5 @@ tasks.register("koverPrintCoverageDetailed") {
282277
}
283278
}
284279
}
280+
281+

gradle.properties

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,3 @@ org.gradle.caching=true
66
# Kotlin
77
kotlin.code.style=official
88
kotlin.mpp.stability.nowarn=true
9-
10-
# Maven Publishing
11-
# Signing is required for Maven Central but optional for local development
12-
# Set to false to skip signing when publishing to mavenLocal
13-
mavenPublishing.signing.required=false
14-

gradlew

100644100755
File mode changed.

0 commit comments

Comments
 (0)