From 26d93081987075944de014165e202ffd128627a4 Mon Sep 17 00:00:00 2001
From: schlaubi <mik@Michaels-PC>
Date: Tue, 30 Jan 2024 00:56:50 +0100
Subject: [PATCH] Update to published cache library

---
 build.gradle.kts                                       | 2 +-
 core/src/commonMain/kotlin/Kord.kt                     | 3 ---
 core/src/commonMain/kotlin/builder/kord/KordBuilder.kt | 2 +-
 gradle/libs.versions.toml                              | 3 +--
 samples/build.gradle.kts                               | 7 +++++--
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 8bbf38fe3ce4..4f9622b25575 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 allprojects {
     repositories {
         // TODO: Remove wants https://github.com/ktorio/ktor/pull/3950 lands
-        mavenLocal()
+        maven("https://europe-west3-maven.pkg.dev/mik-music/kord")
         mavenCentral()
         maven("https://oss.sonatype.org/content/repositories/snapshots/")
     }
diff --git a/core/src/commonMain/kotlin/Kord.kt b/core/src/commonMain/kotlin/Kord.kt
index 1e14ac8ea2f4..b44b09474f72 100644
--- a/core/src/commonMain/kotlin/Kord.kt
+++ b/core/src/commonMain/kotlin/Kord.kt
@@ -39,9 +39,6 @@ import kotlin.contracts.contract
 import kotlin.coroutines.CoroutineContext
 import kotlinx.coroutines.channels.Channel as CoroutineChannel
 
-@Deprecated("Use your own logger instead, this will be removed in the future.", level = DeprecationLevel.ERROR)
-public val kordLogger: mu.KLogger = mu.KotlinLogging.logger { }
-
 private val logger = KotlinLogging.logger { }
 
 @PublishedApi
diff --git a/core/src/commonMain/kotlin/builder/kord/KordBuilder.kt b/core/src/commonMain/kotlin/builder/kord/KordBuilder.kt
index 934e9a71c264..32657e9d00e3 100644
--- a/core/src/commonMain/kotlin/builder/kord/KordBuilder.kt
+++ b/core/src/commonMain/kotlin/builder/kord/KordBuilder.kt
@@ -50,7 +50,7 @@ public abstract class BaseKordBuilder internal constructor(public val token: Str
             shards.map {
                 DefaultGateway {
                     // Workaround for: https://github.com/ktorio/ktor/pull/3950#issuecomment-1909088751
-                    // client = resources.httpClient
+                    client = resources.httpClient
                     identifyRateLimiter = rateLimiter
                 }
             }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 457f5269654f..33d42618849d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -8,8 +8,7 @@ kotlinx-serialization = "1.6.2" # https://github.com/Kotlin/kotlinx.serializatio
 kotlinx-datetime = "0.5.0" # https://github.com/Kotlin/kotlinx-datetime
 kotlin-logging = "6.0.1" # https://github.com/oshai/kotlin-logging
 kotlin-logging-old = "3.0.5" # TODO remove after dependency is removed in rest, gateway, voice and core
-# This is the specific release supporting native, until we setup CI
-kord-cache = "0.5.x-20230806.144015-3" # https://github.com/kordlib/cache
+kord-cache = "0.5.0-SNAPSHOT" # https://github.com/kordlib/cache
 
 # implementation dependencies
 kotlin-node = "18.16.12-pre.619" # https://github.com/JetBrains/kotlin-wrappers
diff --git a/samples/build.gradle.kts b/samples/build.gradle.kts
index 44344065abfa..cf0112239c14 100644
--- a/samples/build.gradle.kts
+++ b/samples/build.gradle.kts
@@ -1,5 +1,6 @@
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
+import org.jetbrains.kotlin.konan.target.KonanTarget
 
 plugins {
     `kord-internal-multiplatform-module`
@@ -22,8 +23,10 @@ kotlin {
     }
 
     targets.withType<KotlinNativeTarget> {
-        binaries.executable {
-            entryPoint = "dev.kord.voice.test.main"
+        if (konanTarget != KonanTarget.MINGW_X64) {
+            binaries.executable {
+                entryPoint = "dev.kord.voice.test.main"
+            }
         }
     }