diff --git a/README.md b/README.md index 655b9c6..f589eb2 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Json.kt: Json bindings for Kotlin Multiplatform -[![Kotlin](https://img.shields.io/badge/Kotlin-1.5-blue.svg)](https://kotlinlang.org) +[![Kotlin](https://img.shields.io/badge/Kotlin-1.6-blue.svg)](https://kotlinlang.org) [![GitHub release (latest by date)](https://img.shields.io/github/v/release/StarryBlueSky/Json.kt)](https://github.com/StarryBlueSky/Json.kt/releases) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/StarryBlueSky/Json.kt/Check)](https://github.com/StarryBlueSky/Json.kt) [![license](https://img.shields.io/github/license/StarryBlueSky/Json.kt)](https://github.com/StarryBlueSky/Json.kt/blob/master/LICENSE) diff --git a/build.gradle.kts b/build.gradle.kts index 7e505e7..858ec72 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,39 +1,12 @@ -plugins { - kotlin("multiplatform") version "1.5.0" - - id("org.jlleitschuh.gradle.ktlint") version "10.0.0" - id("com.adarshr.test-logger") version "3.0.0" - id("net.rdrei.android.buildtimetracker") version "0.11.0" +import blue.starry.scriptextender.EnvReference +plugins { + kotlin("multiplatform") version "1.6.10" `maven-publish` signing id("io.codearte.nexus-staging") version "0.30.0" - - id("org.jetbrains.dokka") version "1.4.32" -} - -object Versions { - const val KotlinxSerializationJson = "1.2.1" - - const val JUnit = "5.7.1" - const val KotlinLogging = "2.0.6" - const val Logback = "1.2.3" - const val Jansi = "2.3.2" -} - -object Libraries { - const val KotlinxSerializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:${Versions.KotlinxSerializationJson}" - const val KotlinLogging = "io.github.microutils:kotlin-logging:${Versions.KotlinLogging}" - - const val JUnitJupiter = "org.junit.jupiter:junit-jupiter:${Versions.JUnit}" - const val LogbackCore = "ch.qos.logback:logback-core:${Versions.Logback}" - const val LogbackClassic = "ch.qos.logback:logback-classic:${Versions.Logback}" - const val Jansi = "org.fusesource.jansi:jansi:${Versions.Jansi}" - - val ExperimentalAnnotations = setOf( - "kotlin.Experimental", - "kotlin.contracts.ExperimentalContracts" - ) + id("org.jetbrains.dokka") version "1.6.10" + id("blue.starry.scriptextender") version "0.0.2" } object Publications { @@ -58,18 +31,18 @@ object Publications { } object Env { - const val Version = "VERSION" + val Version = EnvReference("VERSION") - const val OSSRHProfileId = "OSSRH_PROFILE_ID" - const val OSSRHUsername = "OSSRH_USERNAME" - const val OSSRHPassword = "OSSRH_PASSWORD" + val OSSRHProfileId = EnvReference("OSSRH_PROFILE_ID") + val OSSRHUsername = EnvReference("OSSRH_USERNAME") + val OSSRHPassword = EnvReference("OSSRH_PASSWORD") - const val GitHubUsername = "GITHUB_USERNAME" - const val GitHubPassword = "GITHUB_PASSWORD" + val GitHubUsername = EnvReference("GITHUB_USERNAME") + val GitHubPassword = EnvReference("GITHUB_PASSWORD") - const val SigningKeyId = "SIGNING_KEYID" - const val SigningKey = "SIGNING_KEY" - const val SigningPassword = "SIGNING_PASSWORD" + val SigningKeyId = EnvReference("SIGNING_KEYID") + val SigningKey = EnvReference("SIGNING_KEY") + val SigningPassword = EnvReference("SIGNING_PASSWORD") } /* @@ -104,8 +77,8 @@ kotlin { dependencies { implementation(kotlin("reflect")) - api(Libraries.KotlinxSerializationJson) - api(Libraries.KotlinLogging) + api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2") + api("io.github.microutils:kotlin-logging:2.1.21") } } commonTest { @@ -121,12 +94,7 @@ kotlin { dependencies { implementation(kotlin("test")) - implementation(kotlin("test-junit5")) - implementation(Libraries.JUnitJupiter) - - implementation(Libraries.LogbackCore) - implementation(Libraries.LogbackClassic) - implementation(Libraries.Jansi) + implementation("ch.qos.logback:logback-classic:1.3.0-alpha12") } } @@ -142,8 +110,8 @@ kotlin { targets.all { compilations.all { kotlinOptions { - apiVersion = "1.5" - languageVersion = "1.5" + apiVersion = "1.6" + languageVersion = "1.6" allWarningsAsErrors = true verbose = true } @@ -151,50 +119,15 @@ kotlin { } sourceSets.all { - languageSettings.progressiveMode = true - - Libraries.ExperimentalAnnotations.forEach { - languageSettings.useExperimentalAnnotation(it) - } - } -} - -/* - * Tests - */ - -ktlint { - verbose.set(true) - outputToConsole.set(true) - reporters { - reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.CHECKSTYLE) - } - ignoreFailures.set(true) -} + languageSettings { + progressiveMode = true -buildtimetracker { - reporters { - register("summary") { - options["ordered"] = "true" - options["barstyle"] = "ascii" - options["shortenTaskNames"] = "false" + optIn("kotlin.Experimental") + optIn("kotlin.contracts.ExperimentalContracts") } } } -tasks.withType { - useJUnitPlatform() - - testLogging { - showStandardStreams = true - events("passed", "failed") - } - - testlogger { - theme = com.adarshr.gradle.testlogger.theme.ThemeType.MOCHA_PARALLEL - } -} - /* * Publishing */ @@ -212,7 +145,7 @@ publishing { maven { name = "Sonatype" url = uri( - if (System.getenv(Env.Version).orEmpty().endsWith("-SNAPSHOT")) { + if (Env.Version.valueOrNull.orEmpty().endsWith("-SNAPSHOT")) { Publications.MavenCentralSnapshotRepositoryUrl } else { Publications.MavenCentralStagingRepositoryUrl @@ -220,8 +153,8 @@ publishing { ) credentials { - username = System.getenv(Env.OSSRHUsername) - password = System.getenv(Env.OSSRHPassword) + username = Env.OSSRHUsername.valueOrNull + password = Env.OSSRHPassword.valueOrNull } } @@ -230,8 +163,8 @@ publishing { url = uri(Publications.GitHubPackagesRepositoryUrl) credentials { - username = System.getenv(Env.GitHubUsername) - password = System.getenv(Env.GitHubPassword) + username = Env.GitHubUsername.valueOrNull + password = Env.GitHubPassword.valueOrNull } } } @@ -246,7 +179,7 @@ publishing { "${rootProject.name}-$name" } } - version = System.getenv(Env.Version) + version = Env.Version.valueOrNull pom { name.set(artifactId) @@ -283,19 +216,19 @@ signing { setRequired { gradle.taskGraph.hasTask("publish") } sign(publishing.publications) - if (System.getenv(Env.SigningKey) != null) { + if (Env.SigningKey.isPresent) { @Suppress("UnstableApiUsage") useInMemoryPgpKeys( - System.getenv(Env.SigningKeyId), - System.getenv(Env.SigningKey), - System.getenv(Env.SigningPassword) + Env.SigningKeyId.value, + Env.SigningKey.value, + Env.SigningPassword.value ) } } nexusStaging { packageGroup = Publications.OSSRHProfileGroupId - stagingProfileId = System.getenv(Env.OSSRHProfileId) - username = System.getenv(Env.OSSRHUsername) - password = System.getenv(Env.OSSRHPassword) + stagingProfileId = Env.OSSRHProfileId.valueOrNull + username = Env.OSSRHUsername.valueOrNull + password = Env.OSSRHPassword.valueOrNull } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 29953ea..7454180 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e5338d3..2e6e589 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.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index cccdd3d..76ccb9c 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,129 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright ? 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions á$varâ, á${var}â, á${var:-default}â, á${var+SET}â, +# á${var#prefix}â, á${var%suffix}â, and á$( cmd )â; +# * compound commands having a testable exit status, especially ácaseâ; +# * various built-in commands including ácommandâ, ásetâ, and áulimitâ. +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -89,84 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index e95643d..ac1b06f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/src/commonMain/kotlin/blue/starry/jsonkt/delegation/JsonModel.kt b/src/commonMain/kotlin/blue/starry/jsonkt/delegation/JsonModel.kt index 142002b..af05294 100644 --- a/src/commonMain/kotlin/blue/starry/jsonkt/delegation/JsonModel.kt +++ b/src/commonMain/kotlin/blue/starry/jsonkt/delegation/JsonModel.kt @@ -58,7 +58,7 @@ private fun JsonModel.defaultJsonKeyConverter(property: KProperty<*>): String { buildString { for (c in property.name) { if (c == c.uppercaseChar()) { - if (length > 0) { + if (isNotEmpty()) { append('_') } append(c.lowercaseChar())