From 4812a5047817d7cb7fb8ad3639ecb71c69e2d4e3 Mon Sep 17 00:00:00 2001
From: Andrea De Bellis <spiralprojectss@gmail.com>
Date: Sat, 27 Apr 2024 17:25:48 +0200
Subject: [PATCH] prepare for ktor's 3.0.0 release + fix java toolchain
 resolution

---
 buildSrc/src/main/kotlin/Deps.kt                              | 4 ++--
 .../src/test/kotlin/BleedingEdgeReleaseTest.kt                | 3 ++-
 .../src/main/kotlin/it/skrape/fetcher/Extensions.kt           | 2 +-
 .../src/main/kotlin/it/skrape/fetcher/extensions.kt           | 2 +-
 ktor-extension/build.gradle.kts                               | 2 +-
 settings.gradle.kts                                           | 4 ++++
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt
index 4fe00617..b1679978 100644
--- a/buildSrc/src/main/kotlin/Deps.kt
+++ b/buildSrc/src/main/kotlin/Deps.kt
@@ -1,7 +1,7 @@
 object Versions {
     const val kotlin = "1.9.10"
     const val coroutines = "1.6.1"
-    const val ktor = "2.0.3"
+    const val ktor = "3.0.0-beta-1"
     const val serialization = "1.0.1"
     const val jsoup = "1.13.1"
     const val htmlUnit = "2.63.0"
@@ -59,7 +59,7 @@ object Deps {
         val serverNetty = dependency("ktor-server-netty")
         val serverTestHost = dependency("ktor-server-test-host")
         val freemarker = dependency("ktor-server-freemarker")
-        val locations = dependency("ktor-server-locations")
+        val resources = dependency("ktor-server-resources")
     }
 
     object KotlinX {
diff --git a/examples/use-pre-release-version/src/test/kotlin/BleedingEdgeReleaseTest.kt b/examples/use-pre-release-version/src/test/kotlin/BleedingEdgeReleaseTest.kt
index 44c06bb9..ddaa98a3 100644
--- a/examples/use-pre-release-version/src/test/kotlin/BleedingEdgeReleaseTest.kt
+++ b/examples/use-pre-release-version/src/test/kotlin/BleedingEdgeReleaseTest.kt
@@ -4,6 +4,7 @@ import it.skrape.selects.html5.span
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.Test
 import strikt.api.expectThat
+import strikt.assertions.contains
 import strikt.assertions.isEqualTo
 import strikt.assertions.isGreaterThanOrEqualTo
 
@@ -48,7 +49,7 @@ class BleedingEdgeReleaseTest {
             }
         }
 
-        expectThat(title).isEqualTo("Introduction - skrape{it}")
+        expectThat(title).contains("Introduction").contains("skrape{it}")
     }
 
     @Test
diff --git a/fetcher/async-fetcher/src/main/kotlin/it/skrape/fetcher/Extensions.kt b/fetcher/async-fetcher/src/main/kotlin/it/skrape/fetcher/Extensions.kt
index 0f0d0713..2cc9c7e8 100644
--- a/fetcher/async-fetcher/src/main/kotlin/it/skrape/fetcher/Extensions.kt
+++ b/fetcher/async-fetcher/src/main/kotlin/it/skrape/fetcher/Extensions.kt
@@ -66,7 +66,7 @@ internal fun io.ktor.http.Cookie.toDomainCookie(origin: String): Cookie {
         else -> Domain(domainUrl.urlOrigin, true)
     }
     val sameSite = this.extensions["SameSite"].toSameSite()
-    val maxAge = this.maxAge.toMaxAge()
+    val maxAge = this.maxAge?.toMaxAge()
 
     return Cookie(this.name, this.value, expires, maxAge, domain, path, sameSite, this.secure, this.httpOnly)
 }
diff --git a/fetcher/http-fetcher/src/main/kotlin/it/skrape/fetcher/extensions.kt b/fetcher/http-fetcher/src/main/kotlin/it/skrape/fetcher/extensions.kt
index 3de0a54c..a8722387 100644
--- a/fetcher/http-fetcher/src/main/kotlin/it/skrape/fetcher/extensions.kt
+++ b/fetcher/http-fetcher/src/main/kotlin/it/skrape/fetcher/extensions.kt
@@ -67,7 +67,7 @@ private fun io.ktor.http.Cookie.toDomainCookie(origin: String): Cookie {
         else -> Domain(domainUrl.urlOrigin, true)
     }
     val sameSite = this.extensions["SameSite"].toSameSite()
-    val maxAge = this.maxAge.toMaxAge()
+    val maxAge = this.maxAge?.toMaxAge()
 
     return Cookie(this.name, this.value, expires, maxAge, domain, path, sameSite, this.secure, this.httpOnly)
 }
diff --git a/ktor-extension/build.gradle.kts b/ktor-extension/build.gradle.kts
index 235d7a3b..9a02bea9 100644
--- a/ktor-extension/build.gradle.kts
+++ b/ktor-extension/build.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
     provided(Deps.Ktor.serverTestHost)
     provided(Deps.Ktor.serverNetty)
     provided(Deps.Ktor.freemarker)
-    provided(Deps.Ktor.locations)
+    provided(Deps.Ktor.resources)
 }
 
 // TODO: use https://github.com/nebula-plugins/gradle-extra-configurations-plugin to get provided configuration in gradle
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 24ec0a0d..0a9d7cc0 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -25,4 +25,8 @@ dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version ("0.4.0")
+}
+
 // Gradle Plugin versions are defined in ./buildSrc/build.gradle.kts