Skip to content
Snippets Groups Projects
Verified Commit 33c2313c authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

fix: correct deprecations

parent 87a2bc69
No related branches found
No related tags found
No related merge requests found
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionSha256Szm=23b89f8eac363f5f4b8336e0530c7295c55b728a9caa5268fdd4a532610d5392 distributionSha256Szm=8cc27038d5dbd815759851ba53e70cf62e481b87494cc97cfd97982ada5ba634
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
import gradle.kotlin.dsl.accessors._5ee02a09f3b6dcc9700f8e51e448c252.implementation
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
...@@ -9,7 +8,7 @@ plugins { ...@@ -9,7 +8,7 @@ plugins {
} }
dependencies { dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.10") "implementation"("org.jetbrains.kotlin:kotlin-stdlib:1.6.10")
} }
tasks.withType<KotlinCompile> { tasks.withType<KotlinCompile> {
......
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionSha256Szm=23b89f8eac363f5f4b8336e0530c7295c55b728a9caa5268fdd4a532610d5392 distributionSha256Szm=8cc27038d5dbd815759851ba53e70cf62e481b87494cc97cfd97982ada5ba634
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
...@@ -113,7 +113,7 @@ enum class QtType(val id: kotlin.Int, val serializer: Serializer<*>? = null) { ...@@ -113,7 +113,7 @@ enum class QtType(val id: kotlin.Int, val serializer: Serializer<*>? = null) {
get() = if (name.startsWith("Q")) { get() = if (name.startsWith("Q")) {
name name
} else { } else {
name.toLowerCase(Locale.ENGLISH) name.lowercase(Locale.ENGLISH)
} }
companion object { companion object {
......
...@@ -27,7 +27,8 @@ typealias SignedId64 = Long ...@@ -27,7 +27,8 @@ typealias SignedId64 = Long
typealias MsgId_Type = SignedId64 typealias MsgId_Type = SignedId64
inline class MsgId(val id: MsgId_Type) : Comparable<MsgId>, Serializable { @JvmInline
value class MsgId(val id: MsgId_Type) : Comparable<MsgId>, Serializable {
override fun compareTo(other: MsgId) = id.compareTo(other.id) override fun compareTo(other: MsgId) = id.compareTo(other.id)
inline fun isValidId() = id > 0 inline fun isValidId() = id > 0
...@@ -43,7 +44,8 @@ inline class MsgId(val id: MsgId_Type) : Comparable<MsgId>, Serializable { ...@@ -43,7 +44,8 @@ inline class MsgId(val id: MsgId_Type) : Comparable<MsgId>, Serializable {
typealias NetworkId_Type = SignedId typealias NetworkId_Type = SignedId
inline class NetworkId(val id: NetworkId_Type) : Comparable<NetworkId>, Serializable { @JvmInline
value class NetworkId(val id: NetworkId_Type) : Comparable<NetworkId>, Serializable {
override fun compareTo(other: NetworkId) = id.compareTo(other.id) override fun compareTo(other: NetworkId) = id.compareTo(other.id)
inline fun isValidId() = id > 0 inline fun isValidId() = id > 0
...@@ -59,7 +61,8 @@ inline class NetworkId(val id: NetworkId_Type) : Comparable<NetworkId>, Serializ ...@@ -59,7 +61,8 @@ inline class NetworkId(val id: NetworkId_Type) : Comparable<NetworkId>, Serializ
typealias BufferId_Type = SignedId typealias BufferId_Type = SignedId
inline class BufferId(val id: BufferId_Type) : Comparable<BufferId>, Serializable { @JvmInline
value class BufferId(val id: BufferId_Type) : Comparable<BufferId>, Serializable {
override fun compareTo(other: BufferId) = id.compareTo(other.id) override fun compareTo(other: BufferId) = id.compareTo(other.id)
inline fun isValidId() = id > 0 inline fun isValidId() = id > 0
...@@ -75,7 +78,8 @@ inline class BufferId(val id: BufferId_Type) : Comparable<BufferId>, Serializabl ...@@ -75,7 +78,8 @@ inline class BufferId(val id: BufferId_Type) : Comparable<BufferId>, Serializabl
typealias IdentityId_Type = SignedId typealias IdentityId_Type = SignedId
inline class IdentityId(val id: IdentityId_Type) : Comparable<IdentityId>, Serializable { @JvmInline
value class IdentityId(val id: IdentityId_Type) : Comparable<IdentityId>, Serializable {
override fun compareTo(other: IdentityId) = id.compareTo(other.id) override fun compareTo(other: IdentityId) = id.compareTo(other.id)
inline fun isValidId() = id > 0 inline fun isValidId() = id > 0
......
...@@ -48,25 +48,25 @@ object IrcCaseMappers { ...@@ -48,25 +48,25 @@ object IrcCaseMappers {
} }
override fun toLowerCase(value: String): String { override fun toLowerCase(value: String): String {
return value.toLowerCase(Locale.ROOT) return value.lowercase(Locale.ROOT)
} }
override fun toUpperCase(value: String): String { override fun toUpperCase(value: String): String {
return value.toUpperCase(Locale.ROOT) return value.uppercase(Locale.ROOT)
} }
} }
internal class ClassicalIrcCaseMapper : internal class ClassicalIrcCaseMapper :
IrcCaseMapper { IrcCaseMapper {
override fun toLowerCase(value: String): String { override fun toLowerCase(value: String): String {
return value.toLowerCase(Locale.ROOT) return value.lowercase(Locale.ROOT)
.replace('[', '{') .replace('[', '{')
.replace(']', '}') .replace(']', '}')
.replace('^', '~') .replace('^', '~')
} }
override fun toUpperCase(value: String): String { override fun toUpperCase(value: String): String {
return value.toUpperCase(Locale.ROOT) return value.uppercase(Locale.ROOT)
.replace('{', '[') .replace('{', '[')
.replace('}', ']') .replace('}', ']')
.replace('~', '^') .replace('~', '^')
......
...@@ -25,7 +25,7 @@ import java.util.* ...@@ -25,7 +25,7 @@ import java.util.*
object SenderColorUtil { object SenderColorUtil {
fun senderColor(nick: String): Int { fun senderColor(nick: String): Int {
return 0xf and CRCUtils.qChecksum( return 0xf and CRCUtils.qChecksum(
nick.trimEnd('_').toLowerCase(Locale.ROOT).toByteArray(Charsets.ISO_8859_1) nick.trimEnd('_').lowercase(Locale.ROOT).toByteArray(Charsets.ISO_8859_1)
) )
} }
} }
...@@ -23,7 +23,8 @@ import java.io.Serializable ...@@ -23,7 +23,8 @@ import java.io.Serializable
typealias AccountId_Type = Long typealias AccountId_Type = Long
inline class AccountId(val id: AccountId_Type) : Comparable<AccountId>, Serializable { @JvmInline
value class AccountId(val id: AccountId_Type) : Comparable<AccountId>, Serializable {
override fun compareTo(other: AccountId) = id.compareTo(other.id) override fun compareTo(other: AccountId) = id.compareTo(other.id)
inline fun isValidId() = id >= 0 inline fun isValidId() = id >= 0
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment