Apply ktlint.

Author: atholbro

build.gradle.kts

@@ -7,8 +7,10 @@ plugins {
     `version-catalog`
 
     alias(libs.plugins.kotlin.jvm)
-    alias(libs.plugins.versions)
-    alias(libs.plugins.versions.filter)
+    alias(libs.plugins.kotlinter)
+    alias(libs.plugins.gradleVersions)
+    alias(libs.plugins.gradleVersions.filter)
+    alias(libs.plugins.gradleVersions.update)
 }
 
 repositories {
@@ -18,6 +20,7 @@ repositories {
 
 allprojects {
     apply(plugin = "java")
+    apply(plugin = "org.jmailen.kotlinter")
 
     repositories {
         mavenLocal()
@@ -79,5 +82,4 @@ tasks.register<JacocoReport>("codeCoverageReport") {
         html.required.set(false)
         csv.required.set(false)
     }
-
 }

gradle/libs.versions.toml

@@ -1,33 +1,39 @@
 [versions]
-clikt = "5.1.0"
-kotlin = "2.3.0"
 bouncycastle = "1.82"
-kotlinx-serialization = "1.10.0"
-mockk = "1.14.9"
-kotest = "6.1.2"
-junit-jupiter = "6.0.1"
-junit-platform = "6.0.1"
+clikt = "5.1.0"
+gradleFilterVersions = "0.1.16"
+gradleUpdateVersions = "1.1.0"
+gradleVersions = "0.53.0"
 # @keep used manually for jacoco config, see build.gradle.kts
 jacoco = "0.8.14"
+junit-jupiter = "6.0.1"
+junit-platform = "6.0.1"
 # @keep jvm target
 jvm = "17"
+kotest = "6.1.2"
+kotlin = "2.3.0"
+kotlinter = "5.4.2"
+kotlinx-serialization = "1.10.0"
+mockk = "1.14.9"
 nmcp = "1.4.4"
 
 [libraries]
 bouncycastle = { module = "org.bouncycastle:bcprov-jdk18on", version.ref = "bouncycastle" }
 clikt = { module = "com.github.ajalt.clikt:clikt", version.ref = "clikt" }
-kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
-mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
-kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" }
 junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit-jupiter" }
-junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit-jupiter" }
 junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit-jupiter" }
+junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit-jupiter" }
 junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform" }
+kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" }
+kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
+mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
 
 [plugins]
+gradleVersions = { id = "com.github.ben-manes.versions", version.ref = "gradleVersions" }
+gradleVersions-filter = { id = "se.ascp.gradle.gradle-versions-filter", version.ref = "gradleFilterVersions" }
+gradleVersions-update = { id = "nl.littlerobots.version-catalog-update", version.ref = "gradleUpdateVersions" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-versions = { id = "com.github.ben-manes.versions", version = "0.52.0" }
-versions-filter = { id = "se.ascp.gradle.gradle-versions-filter", version = "0.1.16" }
+kotlinter = { id = "org.jmailen.kotlinter", version.ref = "kotlinter" }
 nmcp = { id = "com.gradleup.nmcp", version.ref = "nmcp" }
 nmcp-aggregation = { id = "com.gradleup.nmcp.aggregation", version.ref = "nmcp" }

justfile

@@ -0,0 +1,62 @@
+#!/usr/bin/env just --justfile
+
+VERSION := env_var_or_default("VERSION", "")
+
+# Gradle Variables
+in_ci := env_var_or_default("GITHUB_ACTIONS", "")
+gradlew_local := justfile_directory() + '/gradlew -p ' + justfile_directory()
+gradlew_ci := 'TERM=dumb ' + gradlew_local + ' -q'
+gradlew := if in_ci == "" { gradlew_local } else { gradlew_ci }
+
+# Print a list of available recipes
+_default:
+  @just --justfile {{justfile()}} --list --unsorted
+
+
+# Build
+build:
+    {{gradlew}} -configuration-cache build -x check --warning-mode all
+
+# Deletes all build outputs & artifacts
+clean:
+    {{gradlew}} -configuration-cache clean
+
+# Build and publish to maven central
+publish version=(VERSION):
+    VERSION="{{version}}" {{gradlew}} lintKotlin test publishAggregationToCentralPortal
+
+# Build and publish to local maven repository (~/.m2)
+publish-local version=(VERSION):
+    VERSION="{{version}}" {{gradlew}} lintKotlin test nmcpPublishAggregationToMavenLocal
+
+# Run unit tests (when all="true" all tests will run, otherwise only outdated tests run)
+test all="false":
+    {{gradlew}} -configuration-cache {{ if all == "true" { "cleanTest test" } else { "test" } }}
+
+# Run Gradle checks (lint, test, complexity).
+check:
+    {{gradlew}} -configuration-cache check
+
+# Generate a code coverage report (via Jacoco).
+coverage:
+    {{gradlew}} -configuration-cache codeCoverageReport
+
+# Verify source code style.
+lint:
+    {{gradlew}} -configuration-cache lintKotlin
+
+# Format the source code.
+format:
+    {{gradlew}} -configuration-cache versionCatalogFormat formatKotlin
+
+# Calculates code complexity.
+complexity:
+    {{gradlew}} -configuration-cache detekt
+
+# Checks for library updates.
+update-check:
+    {{gradlew}} dependencyUpdates -Drevision=release
+
+# Automatically updates all dependencies in the version catalog.
+update-apply:
+    {{gradlew}} versionCatalogUpdate

paseto/src/main/kotlin/net/aholbrook/paseto/Claims.kt

@@ -26,7 +26,7 @@ sealed interface ClaimElement {
     val doubleOrNull: Double? get() = null
 }
 
-inline fun <reified T> ClaimElement.asType(): T? = when(T::class) {
+inline fun <reified T> ClaimElement.asType(): T? = when (T::class) {
     String::class -> primitiveOrNull?.stringOrNull as? T
     Boolean::class -> primitiveOrNull?.booleanOrNull as? T
     Int::class -> primitiveOrNull?.intOrNull as? T
@@ -42,18 +42,20 @@ object ClaimNull : ClaimElement
 @JvmInline
 @Suppress("JavaDefaultMethodsNotOverriddenByDelegation")
 value class ClaimArray internal constructor(private val content: List<ClaimElement>) :
-    ClaimElement, List<ClaimElement> by content {
+    ClaimElement,
+    List<ClaimElement> by content {
 
     internal constructor(jsonArray: JsonArray) : this(jsonArray.map { it.toClaim() })
 }
 
 @JvmInline
 value class ClaimObject internal constructor(private val content: Map<String, ClaimElement>) :
-    ClaimElement, Map<String, ClaimElement> by content {
+    ClaimElement,
+    Map<String, ClaimElement> by content {
 
     internal constructor() : this(emptyMap())
     internal constructor(jsonObject: JsonObject) : this(
-        content = jsonObject.mapValues { it.value.toClaim() }
+        content = jsonObject.mapValues { it.value.toClaim() },
     )
 }
 

paseto/src/main/kotlin/net/aholbrook/paseto/Serde.kt

@@ -30,8 +30,7 @@ internal object PasetoTokenSerializer : KSerializer<PasetoToken> {
 
         fun take(name: String) = obj[name]?.jsonPrimitive?.contentOrNull
 
-        fun takeInstant(name: String): Instant? =
-            obj[name]?.jsonPrimitive?.contentOrNull?.let { Instant.parse(it) }
+        fun takeInstant(name: String): Instant? = obj[name]?.jsonPrimitive?.contentOrNull?.let { Instant.parse(it) }
 
         val claims = buildJsonObject {
             obj.filterNot { it.key in reserved }.forEach { put(it.key, it.value) }

paseto/src/main/kotlin/net/aholbrook/paseto/Token.kt

@@ -53,6 +53,7 @@ inline fun pasetoToken(clock: Clock = Clock.systemUTC(), init: PasetoTokenBuilde
 }
 
 sealed interface PasetoFooter
+
 @JvmInline
 value class StringFooter internal constructor(val value: String) : PasetoFooter
 
@@ -77,6 +78,7 @@ class ClaimFooterBuilder @PublishedApi internal constructor() {
 }
 
 fun pasetoFooter(footer: String) = StringFooter(footer)
+
 @OptIn(ExperimentalContracts::class)
 inline fun pasetoFooter(init: ClaimFooterBuilder.() -> Unit): ClaimFooter {
     contract { callsInPlace(init, InvocationKind.EXACTLY_ONCE) }

paseto/src/main/kotlin/net/aholbrook/paseto/TokenService.kt

@@ -88,11 +88,7 @@ internal class LocalTokenService internal constructor(
         return paseto.encrypt(encoded, keyProvider(), encodedFooter, implicitAssertion)
     }
 
-    override fun decode(
-        token: String,
-        footer: PasetoFooter?,
-        implicitAssertion: String?
-    ): PasetoToken {
+    override fun decode(token: String, footer: PasetoFooter?, implicitAssertion: String?): PasetoToken {
         if (!implicitAssertion.isNullOrEmpty() && !paseto.supportsImplicitAssertion) {
             throw ImplicitAssertionsNotSupportedException(paseto.version)
         }
@@ -105,7 +101,8 @@ internal class LocalTokenService internal constructor(
         return decoded
     }
 
-    override fun insecureGetFooter(token: String): TaintedPasetoFooter? = json.decodeFooter(extractFooter(token)).taint()
+    override fun insecureGetFooter(token: String): TaintedPasetoFooter? =
+        json.decodeFooter(extractFooter(token)).taint()
 }
 
 internal class PublicTokenService internal constructor(
@@ -124,15 +121,13 @@ internal class PublicTokenService internal constructor(
         val encoded = json.encodeToString(PasetoTokenSerializer, token)
         val encodedFooter = json.encodeFooter(token.footer)
         val keyPair = keyProvider()
-        if (keyPair.secretKey == null) { throw CannotSignWithoutSecretKey() }
+        if (keyPair.secretKey == null) {
+            throw CannotSignWithoutSecretKey()
+        }
         return paseto.sign(encoded, keyPair.secretKey, encodedFooter, implicitAssertion)
     }
 
-    override fun decode(
-        token: String,
-        footer: PasetoFooter?,
-        implicitAssertion: String?
-    ): PasetoToken {
+    override fun decode(token: String, footer: PasetoFooter?, implicitAssertion: String?): PasetoToken {
         // TODO expand service-test-vectors for v4 with implicit assertions
         if (!implicitAssertion.isNullOrEmpty() && !paseto.supportsImplicitAssertion) {
             throw ImplicitAssertionsNotSupportedException(paseto.version)
@@ -146,7 +141,8 @@ internal class PublicTokenService internal constructor(
         return decoded
     }
 
-    override fun insecureGetFooter(token: String): TaintedPasetoFooter? = json.decodeFooter(extractFooter(token)).taint()
+    override fun insecureGetFooter(token: String): TaintedPasetoFooter? =
+        json.decodeFooter(extractFooter(token)).taint()
 }
 
 private fun Json.encodeFooter(footer: PasetoFooter?): String? = footer?.let { footer ->

paseto/src/main/kotlin/net/aholbrook/paseto/crypto/ConstantTimeEquals.kt

@@ -27,7 +27,7 @@ internal fun ByteArray.constantTimeEquals(expected: ByteArray): Boolean {
         for (i in indices) {
             result = result or (this[i].toInt() xor expected[i].toInt())
         }
-        return result==0
+        return result == 0
     }
 }