From ff84c427fc6259efa1d628f9a64baccd1a1f2410 Mon Sep 17 00:00:00 2001 From: Adam <897017+aSemy@users.noreply.github.com> Date: Fri, 3 Jun 2022 18:05:52 +0200 Subject: [PATCH 1/4] try to fix build on JitPack https://github.com/gradle/gradle/issues/20925 --- .../buildsrc/convention/maven-publish.gradle.kts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/buildSrc/src/main/kotlin/buildsrc/convention/maven-publish.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/convention/maven-publish.gradle.kts index 50ab18d3..f0abfc21 100644 --- a/buildSrc/src/main/kotlin/buildsrc/convention/maven-publish.gradle.kts +++ b/buildSrc/src/main/kotlin/buildsrc/convention/maven-publish.gradle.kts @@ -12,12 +12,14 @@ plugins { signing } -val sonatypeRepositoryCredentials: Provider> = providers - .credentials(PasswordCredentials::class, "sonatypeRepository") - .map { credentials -> +val sonatypeRepositoryCredentials: Provider> = + providers.zip( + providers.gradleProperty("sonatypeRepositoryUsername"), + providers.gradleProperty("sonatypeRepositoryPassword"), + ) { user, pass -> Action { - username = credentials.username - password = credentials.password + username = user + password = pass } } From 376c8aedccc2540d67ee5077bb72b87ab740761b Mon Sep 17 00:00:00 2001 From: Adam <897017+aSemy@users.noreply.github.com> Date: Fri, 3 Jun 2022 18:06:09 +0200 Subject: [PATCH 2/4] quick fix for publish/signing task ordering warning --- .../kotlin/buildsrc/convention/maven-publish.gradle.kts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/buildSrc/src/main/kotlin/buildsrc/convention/maven-publish.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/convention/maven-publish.gradle.kts index f0abfc21..598ec2b3 100644 --- a/buildSrc/src/main/kotlin/buildsrc/convention/maven-publish.gradle.kts +++ b/buildSrc/src/main/kotlin/buildsrc/convention/maven-publish.gradle.kts @@ -62,6 +62,13 @@ tasks.matching { } +// Gradle warns about some signing tasks using publishing task outputs without explicit +// dependencies. I'm not going to go through them all and fix them, so here's a quick safety check. +tasks.matching { it.name.startsWith("publish") }.configureEach { + mustRunAfter(tasks.matching { it.name.startsWith("sign") }) +} + + publishing { if (sonatypeRepositoryCredentials.isPresent()) { repositories { From 0f6827749c8190a6f36a3efc9456964e69874814 Mon Sep 17 00:00:00 2001 From: Adam <897017+aSemy@users.noreply.github.com> Date: Fri, 3 Jun 2022 18:06:40 +0200 Subject: [PATCH 3/4] bump qoomon git versioning https://github.com/qoomon/gradle-git-versioning-plugin/issues/76 --- gradle/libs.versions.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 28fe0828..06738275 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,8 +23,7 @@ classgraph = "4.8.143" gradleNodePlugin = "3.3.0" -#qoomonGitVersioning = "6.1.1" // bugged: https://github.com/qoomon/gradle-git-versioning-plugin/issues/76 -qoomonGitVersioning = "5.2.0" +qoomonGitVersioning = "6.1.2" [libraries] From 04bf0dc936bee7cc399c0fcd51bf21b9bc78bba7 Mon Sep 17 00:00:00 2001 From: Adam <897017+aSemy@users.noreply.github.com> Date: Fri, 3 Jun 2022 18:06:50 +0200 Subject: [PATCH 4/4] add some cool badges to readme --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3ce0cfb0..aa34183d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,7 @@ -[![](https://jitpack.io/v/adamko-dev/kotlinx-serialization-typescript-generator.svg)](https://jitpack.io/#adamko-dev/kotlinx-serialization-typescript-generator) +[![Status](https://img.shields.io/badge/status-proof--of--concept-blueviolet?style=flat-square)](https://github.com/adamko-dev/kotlinx-serialization-typescript-generator#status) +[![GitHub license](https://img.shields.io/github/license/adamko-dev/kotlinx-serialization-typescript-generator?style=flat-square)](https://github.com/adamko-dev/kotlinx-serialization-typescript-generator/blob/main/LICENSE) +[![Maven Central](https://img.shields.io/maven-central/v/dev.adamko.txstsgen/kxs-ts-gen-core?style=flat-square)](https://search.maven.org/search?q=g:dev.adamko.txstsgen) +[![](https://jitpack.io/v/adamko-dev/kotlinx-serialization-typescript-generator.svg?style=flat-square)](https://jitpack.io/#adamko-dev/kotlinx-serialization-typescript-generator) # Kotlinx Serialization TypeScript Generator @@ -35,7 +38,7 @@ export interface MyClass { } ``` -Only Kotlinx Serialization +Only Kotlinx Serialization [`SerialDescriptor`s](https://kotlin.github.io/kotlinx.serialization/kotlinx-serialization-core/kotlinx.serialization.descriptors/-serial-descriptor/index.html) are used to generate TypeScript. They are flexible and comprehensive enough to allow for accurate TypeScript code, without any deviation.