diff --git a/detekt.yml b/detekt.yml index 6006f3146..9fda1b066 100644 --- a/detekt.yml +++ b/detekt.yml @@ -22,6 +22,8 @@ formatting: indentSize: 2 ImportOrdering: active: false + EnumEntryNameCase: + active: false naming: ConstructorParameterNaming: active: false diff --git a/gradle.properties b/gradle.properties index dd9ec70c5..da029c822 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,4 +11,4 @@ org.gradle.parallel=true # Dependencies ktorVersion=2.2.4 kotestVersion=5.5.5 -detektVersion=1.21.0 +detektVersion=1.22.0 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e5832f..943f0cbfa 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 774fae876..bdc9a83b1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb6c..65dcd68d6 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # 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 +# https://github.com/gradle/gradle/blob/HEAD/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/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/gradlew.bat b/gradlew.bat index f127cfd49..93e3f59f1 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% diff --git a/json-schema/src/main/kotlin/io/bkbn/kompendium/json/schema/handler/SimpleObjectHandler.kt b/json-schema/src/main/kotlin/io/bkbn/kompendium/json/schema/handler/SimpleObjectHandler.kt index 073e08ddb..386e7c6b1 100644 --- a/json-schema/src/main/kotlin/io/bkbn/kompendium/json/schema/handler/SimpleObjectHandler.kt +++ b/json-schema/src/main/kotlin/io/bkbn/kompendium/json/schema/handler/SimpleObjectHandler.kt @@ -34,7 +34,6 @@ object SimpleObjectHandler { schemaConfigurator: SchemaConfigurator, enrichment: TypeEnrichment<*>?, ): JsonSchema { - cache[type.getSlug(enrichment)] = ReferenceDefinition(type.getReferenceSlug(enrichment)) val typeMap = clazz.typeParameters.zip(type.arguments).toMap() @@ -176,6 +175,7 @@ object SimpleObjectHandler { maxItems = maxItems, uniqueItems = uniqueItems, ) + is EnumDefinition -> schema.copy(deprecated = deprecated, description = description) is MapDefinition -> schema.copy(deprecated = deprecated, description = description) is NullableDefinition -> schema.copy(deprecated = deprecated, description = description) diff --git a/locations/src/test/kotlin/io/bkbn/kompendium/locations/util/TestModels.kt b/locations/src/test/kotlin/io/bkbn/kompendium/locations/util/TestModels.kt index be647ca12..f120945a6 100644 --- a/locations/src/test/kotlin/io/bkbn/kompendium/locations/util/TestModels.kt +++ b/locations/src/test/kotlin/io/bkbn/kompendium/locations/util/TestModels.kt @@ -7,6 +7,7 @@ data class Listing(val name: String, val page: Int) data class Type(val name: String) { @Location("/edit") data class Edit(val parent: Type) + @Location("/other/{page}") data class Other(val parent: Type, val page: Int) } diff --git a/resources/src/test/kotlin/io/bkbn/kompendium/resources/util/TestModels.kt b/resources/src/test/kotlin/io/bkbn/kompendium/resources/util/TestModels.kt index b625adae3..c99e70c46 100644 --- a/resources/src/test/kotlin/io/bkbn/kompendium/resources/util/TestModels.kt +++ b/resources/src/test/kotlin/io/bkbn/kompendium/resources/util/TestModels.kt @@ -11,6 +11,7 @@ data class Type(val name: String) { @Serializable @Resource("/edit") data class Edit(val parent: Type) + @Serializable @Resource("/other/{page}") data class Other(val parent: Type, val page: Int)