From edfdc90c84df3a6e49f2c7900028ce60e562cc53 Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Sun, 6 Jun 2021 03:19:24 +0200
Subject: [PATCH] Update dependencies
---
build.gradle.kts | 13 ++++++++-----
gradle.properties | 2 +-
.../protocol/features/QuasselFeatureName.kt | 3 ++-
.../libquassel/protocol/models/ids/BufferId.kt | 3 ++-
.../libquassel/protocol/models/ids/IdentityId.kt | 3 ++-
.../libquassel/protocol/models/ids/MsgId.kt | 3 ++-
.../libquassel/protocol/models/ids/NetworkId.kt | 3 ++-
.../protocol/syncables/state/NetworkState.kt | 10 +++++-----
.../libquassel/protocol/util/irc/IrcCaseMapper.kt | 8 ++++----
9 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/build.gradle.kts b/build.gradle.kts
index 7c47020..096a024 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,17 +17,20 @@ plugins {
id("org.jetbrains.dokka") version "1.4.32"
}
-subprojects {
- apply(plugin = "org.jetbrains.kotlin.jvm")
- apply(plugin = "org.jlleitschuh.gradle.ktlint")
- apply(plugin = "jacoco")
- apply(plugin = "de.justjanne.jacoco-cobertura-converter")
+allprojects {
apply(plugin = "org.jetbrains.dokka")
repositories {
mavenCentral()
google()
}
+}
+
+subprojects {
+ apply(plugin = "org.jetbrains.kotlin.jvm")
+ apply(plugin = "org.jlleitschuh.gradle.ktlint")
+ apply(plugin = "jacoco")
+ apply(plugin = "de.justjanne.jacoco-cobertura-converter")
dependencies {
val implementation by configurations
diff --git a/gradle.properties b/gradle.properties
index f1ce9c2..c1b78d2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,7 +14,7 @@ kotlinPoetVersion=1.8.0
kspVersion=1.5.10-1.0.0-beta01
GROUP=de.justjanne.libquassel
-VERSION_NAME=0.4.0
+VERSION_NAME=0.4.1
POM_URL=https://git.kuschku.de/justJanne/libquassel
POM_SCM_URL=https://git.kuschku.de/justJanne/libquassel
diff --git a/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/features/QuasselFeatureName.kt b/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/features/QuasselFeatureName.kt
index 42270b6..5d71270 100644
--- a/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/features/QuasselFeatureName.kt
+++ b/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/features/QuasselFeatureName.kt
@@ -15,7 +15,8 @@ import de.justjanne.libquassel.annotations.Generated
* Inline class encapsulating a quassel feature name
*/
@Generated
-inline class QuasselFeatureName(
+@JvmInline
+value class QuasselFeatureName(
/**
* Standardized name of the feature
*/
diff --git a/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/ids/BufferId.kt b/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/ids/BufferId.kt
index 7ef839a..4e33d6c 100644
--- a/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/ids/BufferId.kt
+++ b/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/ids/BufferId.kt
@@ -14,7 +14,8 @@ private typealias BufferIdType = SignedIdType
/**
* A [SignedId] for a chat/buuffer
*/
-inline class BufferId(
+@JvmInline
+value class BufferId(
/**
* Native value
*/
diff --git a/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/ids/IdentityId.kt b/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/ids/IdentityId.kt
index bf50408..8b49eb5 100644
--- a/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/ids/IdentityId.kt
+++ b/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/ids/IdentityId.kt
@@ -13,7 +13,8 @@ private typealias IdentityIdType = SignedIdType
/**
* A [SignedId] for an identity object
*/
-inline class IdentityId(
+@JvmInline
+value class IdentityId(
/**
* Native value
*/
diff --git a/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/ids/MsgId.kt b/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/ids/MsgId.kt
index adbd50c..6fafc34 100644
--- a/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/ids/MsgId.kt
+++ b/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/ids/MsgId.kt
@@ -15,7 +15,8 @@ private typealias MsgIdType = SignedId64Type
* A [SignedId] for an individual message
* Warning: this is the only id which can be backed by a 64-bit value
*/
-inline class MsgId(
+@JvmInline
+value class MsgId(
/**
* Native value
*/
diff --git a/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/ids/NetworkId.kt b/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/ids/NetworkId.kt
index 62368a4..53b29fc 100644
--- a/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/ids/NetworkId.kt
+++ b/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/ids/NetworkId.kt
@@ -14,7 +14,8 @@ private typealias NetworkIdType = SignedIdType
/**
* A [SignedId] for an irc network
*/
-inline class NetworkId(
+@JvmInline
+value class NetworkId(
/**
* Native value
*/
diff --git a/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/state/NetworkState.kt b/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/state/NetworkState.kt
index c8cd134..bc84461 100644
--- a/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/state/NetworkState.kt
+++ b/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/state/NetworkState.kt
@@ -72,12 +72,12 @@ data class NetworkState(
fun identifier() = "${networkId.id}"
fun caseMapper() = IrcCaseMapper[supportValue(IrcISupport.CASEMAPPING)]
- fun supports(key: String) = supports.containsKey(key.toUpperCase(Locale.ROOT))
- fun supportValue(key: String) = supports[key.toUpperCase(Locale.ROOT)]
+ fun supports(key: String) = supports.containsKey(key.uppercase(Locale.ROOT))
+ fun supportValue(key: String) = supports[key.uppercase(Locale.ROOT)]
- fun capAvailable(capability: String) = caps.containsKey(capability.toLowerCase(Locale.ROOT))
- fun capEnabled(capability: String) = capsEnabled.contains(capability.toLowerCase(Locale.ROOT))
- fun capValue(capability: String) = caps[capability.toLowerCase(Locale.ROOT)] ?: ""
+ fun capAvailable(capability: String) = caps.containsKey(capability.lowercase(Locale.ROOT))
+ fun capEnabled(capability: String) = capsEnabled.contains(capability.lowercase(Locale.ROOT))
+ fun capValue(capability: String) = caps[capability.lowercase(Locale.ROOT)] ?: ""
fun isSaslSupportLikely(mechanism: String): Boolean {
if (!capAvailable(IrcCapability.SASL)) {
diff --git a/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/util/irc/IrcCaseMapper.kt b/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/util/irc/IrcCaseMapper.kt
index cf12f6d..9ce7a21 100644
--- a/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/util/irc/IrcCaseMapper.kt
+++ b/protocol/src/main/kotlin/de/justjanne/libquassel/protocol/util/irc/IrcCaseMapper.kt
@@ -35,10 +35,10 @@ abstract class IrcCaseMapper {
a.equals(b, ignoreCase = true)
override fun toLowerCase(value: String): String =
- value.toLowerCase(Locale.ENGLISH)
+ value.lowercase(Locale.ROOT)
override fun toUpperCase(value: String): String =
- value.toUpperCase(Locale.ENGLISH)
+ value.uppercase(Locale.ROOT)
}
object Rfc1459 : IrcCaseMapper() {
@@ -46,13 +46,13 @@ abstract class IrcCaseMapper {
toLowerCase(a) == toLowerCase(b) || toUpperCase(a) == toUpperCase(b)
override fun toLowerCase(value: String): String =
- value.toLowerCase(Locale.ROOT)
+ value.lowercase(Locale.ROOT)
.replace('[', '{')
.replace(']', '}')
.replace('\\', '|')
override fun toUpperCase(value: String): String =
- value.toUpperCase(Locale.ROOT)
+ value.uppercase(Locale.ROOT)
.replace('{', '[')
.replace('}', ']')
.replace('|', '\\')
--
GitLab