Dependencies update (#67)

build.gradle.kts

@@ -1,4 +1,5 @@
 import kotlinx.coroutines.runBlocking
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -27,14 +28,15 @@ subprojects {
     }
 
     tasks.withType<KotlinCompile> {
-        kotlinOptions {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
             allWarningsAsErrors = true
         }
     }
 
     afterEvaluate {
         this.configure<JavaPluginExtension> {
-            targetCompatibility = JavaVersion.VERSION_11
+            targetCompatibility = JavaVersion.VERSION_17
         }
     }
 

buildSrc/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     id("java")
-    kotlin("jvm").version("1.7.22")
+    kotlin("jvm").version("2.0.21")
 }
 
 repositories {

buildSrc/src/main/java/Dependencies.kt

@@ -1,8 +1,8 @@
 object Versions {
-    const val coroutines = "1.5.0"
-    const val kotlin = "1.7.22"
-    const val apollo = "2.5.7"
-    const val okhttp = "3.8.1"
+    const val coroutines = "1.7.3"
+    const val kotlin = "2.0.21"
+    const val apollo = "4.0.1"
+    const val okhttp = "4.12.0"
     const val dokka = "1.4.32"
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,26 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

kinta-cli/build.gradle.kts

@@ -30,6 +30,6 @@ dependencies {
 }
 
 application {
-    mainClassName = "com.dailymotion.kinta.MainKt"
+    mainClass.set("com.dailymotion.kinta.MainKt")
     applicationName = "kinta"
 }

kinta-cli/src/main/kotlin/com/dailymotion/kinta/infra/Constants.kt

@@ -16,7 +16,7 @@ object Constants {
                 .get()
                 .build()
                 .let {
-                    OkHttpClient().newCall(it).execute().body()!!.string()
+                    OkHttpClient().newCall(it).execute().body!!.string()
                 }.let {
                     Version(it)
                 }

kinta-cli/src/main/kotlin/com/dailymotion/kinta/infra/Downloader.kt

@@ -1,6 +1,5 @@
 package com.dailymotion.kinta.infra
 
-import kotlinx.serialization.json.Json
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import java.io.File
@@ -11,7 +10,7 @@ object Downloader {
                 .get()
                 .build()
                 .let {
-                    OkHttpClient().newCall(it).execute().body()!!.byteStream().use {inputStream ->
+                    OkHttpClient().newCall(it).execute().body!!.byteStream().use {inputStream ->
                         output.outputStream().use { outputStream ->
                             inputStream.copyTo(outputStream)
                         }

kinta-cli/src/main/resources/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("org.jetbrains.kotlin.jvm").version("1.7.22")
+    id("org.jetbrains.kotlin.jvm").version("2.0.21")
 }
 
 repositories {

kinta-lib/build.gradle.kts

@@ -14,7 +14,6 @@ dependencies {
 
     implementation(Libs.coroutines)
     implementation(Libs.apollo)
-    implementation(Libs.apolloCoroutinesSupport)
 
     implementation(Libs.nanoHttp)
 
@@ -32,8 +31,9 @@ dependencies {
 }
 
 apollo {
-    generateKotlinModels.set(true)
-    useSemanticNaming.set(false)
+    service("service") {
+        packageName.set("com.dailymotion.kinta")
+    }
 }
 
 

kinta-lib/src/main/kotlin/com/dailymotion/kinta/helper/OkHttpHelper.kt

@@ -17,12 +17,12 @@ fun newOkHttpClient(): OkHttpClient {
 }
 
 fun Request.executeOrFail(
-        errorMessage: String = "Cannot execute ${this.url()}",
+        errorMessage: String = "Cannot execute ${this.url}",
         okHttpClient: OkHttpClient = newOkHttpClient()): ResponseBody {
     val response = okHttpClient.newCall(this).execute()
-    if (response.isSuccessful && response.body() != null) {
-        return response.body()!!
+    if (response.isSuccessful && response.body != null) {
+        return response.body!!
     } else {
-        throw IllegalStateException("$errorMessage :\n${response.body()?.string()}")
+        throw IllegalStateException("$errorMessage :\n${response.body?.string()}")
     }
 }