From 6a3b5016b7c669c71ee518332040272d384b6cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Rou=C3=A9l?= Date: Thu, 28 Jul 2022 15:19:29 +0200 Subject: [PATCH] Update Kotlin to 1.7.10 --- build.gradle.kts | 4 ++-- src/main/java/io/outfoxx/typescriptpoet/FileSpec.kt | 4 ++-- src/main/java/io/outfoxx/typescriptpoet/Modifier.kt | 2 +- src/main/java/io/outfoxx/typescriptpoet/NameAllocator.kt | 2 +- src/main/java/io/outfoxx/typescriptpoet/Utils.kt | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2b49a296..eec21f48 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,8 +6,8 @@ plugins { `maven-publish` signing - kotlin("jvm") version "1.4.32" - id("org.jetbrains.dokka") version "1.4.32" + kotlin("jvm") version "1.7.10" + id("org.jetbrains.dokka") version "1.7.10" id("net.minecrell.licenser") version "0.4.1" id("org.jmailen.kotlinter") version "3.3.0" diff --git a/src/main/java/io/outfoxx/typescriptpoet/FileSpec.kt b/src/main/java/io/outfoxx/typescriptpoet/FileSpec.kt index e83d1953..8245e326 100644 --- a/src/main/java/io/outfoxx/typescriptpoet/FileSpec.kt +++ b/src/main/java/io/outfoxx/typescriptpoet/FileSpec.kt @@ -344,13 +344,13 @@ private constructor( fun builder(modulePath: String) = Builder(modulePath) @JvmStatic - fun get(moduleSpec: ModuleSpec, modulePath: String = moduleSpec.name.replace('.', '/').toLowerCase()): FileSpec = + fun get(moduleSpec: ModuleSpec, modulePath: String = moduleSpec.name.replace('.', '/').lowercase()): FileSpec = builder(modulePath) .apply { members.addAll(moduleSpec.members.toMutableList()) } .build() @JvmStatic - fun get(typeSpec: AnyTypeSpec, modulePath: String = typeSpec.name.replace('.', '/').toLowerCase()): FileSpec = + fun get(typeSpec: AnyTypeSpec, modulePath: String = typeSpec.name.replace('.', '/').lowercase()): FileSpec = builder(modulePath) .addType(typeSpec) .build() diff --git a/src/main/java/io/outfoxx/typescriptpoet/Modifier.kt b/src/main/java/io/outfoxx/typescriptpoet/Modifier.kt index c43bec62..b6c3833c 100644 --- a/src/main/java/io/outfoxx/typescriptpoet/Modifier.kt +++ b/src/main/java/io/outfoxx/typescriptpoet/Modifier.kt @@ -34,5 +34,5 @@ enum class Modifier { VAR; val keyword: String - get() = name.toLowerCase() + get() = name.lowercase() } diff --git a/src/main/java/io/outfoxx/typescriptpoet/NameAllocator.kt b/src/main/java/io/outfoxx/typescriptpoet/NameAllocator.kt index 122de861..ba4f973a 100644 --- a/src/main/java/io/outfoxx/typescriptpoet/NameAllocator.kt +++ b/src/main/java/io/outfoxx/typescriptpoet/NameAllocator.kt @@ -135,7 +135,7 @@ private fun toTypeScriptIdentifier(suggestion: String) = buildString { val validCodePoint: Int = if (Character.isJavaIdentifierPart(codePoint)) { codePoint } else { - '_'.toInt() + '_'.code } appendCodePoint(validCodePoint) i += Character.charCount(codePoint) diff --git a/src/main/java/io/outfoxx/typescriptpoet/Utils.kt b/src/main/java/io/outfoxx/typescriptpoet/Utils.kt index 9417d2f1..1e1dbc00 100644 --- a/src/main/java/io/outfoxx/typescriptpoet/Utils.kt +++ b/src/main/java/io/outfoxx/typescriptpoet/Utils.kt @@ -89,7 +89,7 @@ internal fun characterLiteralWithoutDoubleQuotes(c: Char) = when { c == '\"' -> "\\\"" // \u0022: double quote (") c == '\'' -> "'" // \u0027: single quote (') c == '\\' -> "\\\\" // \u005c: backslash (\) - isISOControl(c) -> String.format("\\u%04x", c.toInt()) + isISOControl(c) -> String.format("\\u%04x", c.code) else -> c.toString() }