From 50c671fd66a51e86cee62afeceab14b82d31acdb Mon Sep 17 00:00:00 2001
From: Peter vR <peter@nefilim.org>
Date: Mon, 24 Jan 2022 08:51:46 -0700
Subject: [PATCH] add claim names #17 and android level to readme #18 (#19)

---
 README.md                                                 | 4 ++++
 .../src/main/kotlin/build-conventions.gradle.kts          | 8 ++++----
 build.gradle.kts                                          | 2 +-
 core/src/main/kotlin/io/github/nefilim/kjwt/JWT.kt        | 2 ++
 gradle/libs.versions.toml                                 | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index b41ca6b..7cc326b 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,10 @@ Please make sure you have [Arrow Core](https://arrow-kt.io/docs/core/#Gradle-kot
 
 For examples see: [JWTSpec.kt](https://github.com/nefilim/kjwt/blob/main/core/src/test/kotlin/io/github/nefilim/kjwt/JWTSpec.kt) 
 
+## Android
+
+The minimum level of support for Android is 26 as [Base64](https://developer.android.com/reference/java/util/Base64) is being used. 
+
 ## Creating a JWT
 
 ```kotlin
diff --git a/build-logic/kotlin-convention/src/main/kotlin/build-conventions.gradle.kts b/build-logic/kotlin-convention/src/main/kotlin/build-conventions.gradle.kts
index 6b10ebd..40daf86 100644
--- a/build-logic/kotlin-convention/src/main/kotlin/build-conventions.gradle.kts
+++ b/build-logic/kotlin-convention/src/main/kotlin/build-conventions.gradle.kts
@@ -10,14 +10,14 @@ semver {
     featureBranchRegex(listOf("[a-zA-Z\\-_0-9]+\\/sc-\\d+\\/[a-zA-Z\\-_0-9]+"))
     findProperty("semver.overrideVersion")?.toString()?.let { overrideVersion(it) }
 
-    main {
-        scope(findProperty("semver.main.scope")?.toString() ?: "patch")
-        stage(findProperty("semver.main.stage")?.toString() ?: "final")
+    currentBranch {
+        scope(findProperty("semver.currentBranch.scope")?.toString())
+        stage(findProperty("semver.currentBranch.stage")?.toString())
     }
 }
 
 group = "io.github.nefilim.kjwt"
-version = semver.version()
+version = semver.version.value
 
 configure<com.adarshr.gradle.testlogger.TestLoggerExtension> {
     theme = com.adarshr.gradle.testlogger.theme.ThemeType.STANDARD
diff --git a/build.gradle.kts b/build.gradle.kts
index 3a57aa3..f2f46f6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -49,7 +49,7 @@ githubRelease {
     // You get this from your user settings > developer settings > Personal Access Tokens
     owner("nefilim") // default is the last part of your group. Eg group: "com.github.breadmoirai" => owner: "breadmoirai"
     repo("kjwt") // by default this is set to your project name
-    tagName(semver.versionTagName()) // by default this is set to "v${project.version}"
+    tagName(semver.versionTagName) // by default this is set to "v${project.version}"
     targetCommitish("main") // by default this is set to "master"
     body(changelog())
     draft(false) // by default this is false
diff --git a/core/src/main/kotlin/io/github/nefilim/kjwt/JWT.kt b/core/src/main/kotlin/io/github/nefilim/kjwt/JWT.kt
index 02ca0ab..67530f3 100644
--- a/core/src/main/kotlin/io/github/nefilim/kjwt/JWT.kt
+++ b/core/src/main/kotlin/io/github/nefilim/kjwt/JWT.kt
@@ -52,6 +52,7 @@ interface JWTClaims {
     fun claimValueAsLong(name: String): Option<Long>
     fun claimValueAsBoolean(name: String): Option<Boolean>
     fun claimValueAsList(name: String): List<String>
+    fun claimNames(): Set<String>
 
     fun keyID(): Option<JWTKeyID>
     fun issuer(): Option<String>
@@ -172,6 +173,7 @@ class JWT<T: JWSAlgorithm> private constructor(
     override fun claimValueAsLong(name: String): Option<Long> = Option.fromNullable(claimSet[name]?.jsonPrimitive?.longOrNull)
     override fun claimValueAsBoolean(name: String): Option<Boolean> = Option.fromNullable(claimSet[name]?.jsonPrimitive?.booleanOrNull)
     override fun claimValueAsList(name: String): List<String> = claimSet[name]?.jsonArray?.mapNotNull { (it as JsonPrimitive).contentOrNull?.trim() } ?: emptyList()
+    override fun claimNames(): Set<String> = claimSet.keys
 
     override fun keyID(): Option<JWTKeyID> = Option.fromNullable(header.keyID)
     override fun issuer(): Option<String> = claimValue("iss")
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9d14077..a84f24c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ google-kms = "0.94.0"
 gradle-github-release = "2.2.12"
 gradle-nexus-publish = "1.1.0"
 gradle-protobuf-plugin = "0.8.18"
-gradle-semver = "0.0.24"
+gradle-semver = "0.0.27"
 gradle-tasktree = "2.1.0"
 gradle-testlogger = "3.1.0"
 gradle-versions = "0.39.0"