From db89678f5b66b35143ec99ba94dbb7f6c48e9807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Tue, 19 Mar 2024 17:34:31 +0100 Subject: [PATCH] Update dependencies --- .../sdk/hebe/repository/RepositoryManager.kt | 2 +- sdk-scrapper/api/sdk-scrapper.api | 4 ---- .../sdk/scrapper/service/ServiceManager.kt | 2 +- .../github/wulkanowy/sdk/scrapper/BaseLocalTest.kt | 2 +- settings.gradle | 13 ++++++------- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/sdk-hebe/src/main/kotlin/io/github/wulkanowy/sdk/hebe/repository/RepositoryManager.kt b/sdk-hebe/src/main/kotlin/io/github/wulkanowy/sdk/hebe/repository/RepositoryManager.kt index 9fd84270..fc5ad890 100644 --- a/sdk-hebe/src/main/kotlin/io/github/wulkanowy/sdk/hebe/repository/RepositoryManager.kt +++ b/sdk-hebe/src/main/kotlin/io/github/wulkanowy/sdk/hebe/repository/RepositoryManager.kt @@ -1,6 +1,5 @@ package io.github.wulkanowy.sdk.hebe.repository -import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory import io.github.wulkanowy.sdk.hebe.interceptor.ErrorInterceptor import io.github.wulkanowy.sdk.hebe.interceptor.SignInterceptor import kotlinx.serialization.ExperimentalSerializationApi @@ -10,6 +9,7 @@ import okhttp3.MediaType.Companion.toMediaType import okhttp3.OkHttpClient import okhttp3.logging.HttpLoggingInterceptor import retrofit2.Retrofit +import retrofit2.converter.kotlinx.serialization.asConverterFactory import retrofit2.converter.scalars.ScalarsConverterFactory import retrofit2.create diff --git a/sdk-scrapper/api/sdk-scrapper.api b/sdk-scrapper/api/sdk-scrapper.api index 7dbac86f..a3c48881 100644 --- a/sdk-scrapper/api/sdk-scrapper.api +++ b/sdk-scrapper/api/sdk-scrapper.api @@ -126,10 +126,6 @@ public final class io/github/wulkanowy/sdk/scrapper/UtilsKt { public static final fun getNormalizedSymbol (Ljava/lang/String;)Ljava/lang/String; } -public synthetic class io/github/wulkanowy/sdk/scrapper/UtilsKt$EntriesMappings { - public static final synthetic field entries$0 Lkotlin/enums/EnumEntries; -} - public final class io/github/wulkanowy/sdk/scrapper/attendance/Absent { public fun (Ljava/time/LocalDateTime;Ljava/lang/Integer;)V public final fun component1 ()Ljava/time/LocalDateTime; diff --git a/sdk-scrapper/src/main/kotlin/io/github/wulkanowy/sdk/scrapper/service/ServiceManager.kt b/sdk-scrapper/src/main/kotlin/io/github/wulkanowy/sdk/scrapper/service/ServiceManager.kt index 5429d0eb..c6073ac4 100644 --- a/sdk-scrapper/src/main/kotlin/io/github/wulkanowy/sdk/scrapper/service/ServiceManager.kt +++ b/sdk-scrapper/src/main/kotlin/io/github/wulkanowy/sdk/scrapper/service/ServiceManager.kt @@ -1,6 +1,5 @@ package io.github.wulkanowy.sdk.scrapper.service -import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory import io.github.wulkanowy.sdk.scrapper.CookieJarCabinet import io.github.wulkanowy.sdk.scrapper.OkHttpClientBuilderFactory import io.github.wulkanowy.sdk.scrapper.Scrapper @@ -25,6 +24,7 @@ import okhttp3.OkHttpClient import okhttp3.logging.HttpLoggingInterceptor import pl.droidsonroids.retrofit2.JspoonConverterFactory import retrofit2.Retrofit +import retrofit2.converter.kotlinx.serialization.asConverterFactory import retrofit2.converter.scalars.ScalarsConverterFactory import retrofit2.create import java.security.KeyStore diff --git a/sdk-scrapper/src/test/kotlin/io/github/wulkanowy/sdk/scrapper/BaseLocalTest.kt b/sdk-scrapper/src/test/kotlin/io/github/wulkanowy/sdk/scrapper/BaseLocalTest.kt index bc6cc9bc..41214e39 100644 --- a/sdk-scrapper/src/test/kotlin/io/github/wulkanowy/sdk/scrapper/BaseLocalTest.kt +++ b/sdk-scrapper/src/test/kotlin/io/github/wulkanowy/sdk/scrapper/BaseLocalTest.kt @@ -1,6 +1,5 @@ package io.github.wulkanowy.sdk.scrapper -import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory import io.github.wulkanowy.sdk.scrapper.adapter.ObjectSerializer import io.github.wulkanowy.sdk.scrapper.interceptor.AutoLoginInterceptor import io.github.wulkanowy.sdk.scrapper.interceptor.ErrorInterceptor @@ -27,6 +26,7 @@ import org.jsoup.nodes.Document import org.junit.After import pl.droidsonroids.retrofit2.JspoonConverterFactory import retrofit2.Retrofit +import retrofit2.converter.kotlinx.serialization.asConverterFactory import retrofit2.converter.scalars.ScalarsConverterFactory import java.net.URL diff --git a/settings.gradle b/settings.gradle index 8241b603..fd8401e7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,18 +5,17 @@ include 'sdk' dependencyResolutionManagement { versionCatalogs { libs { - def kotlin = '1.9.21' + def kotlin = '1.9.23' version('kotlin', kotlin) - version('coroutines', '1.7.3') - version('retrofit', '2.10.0-SNAPSHOT') - version('retrofit-kotlinx-serialization', '1.0.0') - version('ksp', "${kotlin}-1.0.15") + version('coroutines', '1.8.0') + version('retrofit', '2.10.0') + version('ksp', "${kotlin}-1.0.19") plugin('kotlin', 'org.jetbrains.kotlin.jvm').versionRef('kotlin') plugin('ksp', 'com.google.devtools.ksp').versionRef('ksp') plugin('serialization', 'org.jetbrains.kotlin.plugin.serialization').versionRef('kotlin') - plugin('validator', 'org.jetbrains.kotlinx.binary-compatibility-validator').version('0.13.2') + plugin('validator', 'org.jetbrains.kotlinx.binary-compatibility-validator').version('0.14.0') library('coroutines-core', 'org.jetbrains.kotlinx', 'kotlinx-coroutines-core').versionRef('coroutines') library('coroutines-test', 'org.jetbrains.kotlinx', 'kotlinx-coroutines-test').versionRef('coroutines') @@ -25,7 +24,7 @@ dependencyResolutionManagement { library('retrofit-scalars', 'com.squareup.retrofit2', 'converter-scalars').versionRef('retrofit') library('retrofit-moshi', 'com.squareup.retrofit2', 'converter-moshi').versionRef('retrofit') library('retrofit-mock', 'com.squareup.retrofit2', 'retrofit-mock').versionRef('retrofit') - library('retrofit-serialization', 'com.jakewharton.retrofit', 'retrofit2-kotlinx-serialization-converter').versionRef('retrofit-kotlinx-serialization') + library('retrofit-serialization', 'com.squareup.retrofit2', 'converter-kotlinx-serialization').versionRef('retrofit') library('okhttp-bom', 'com.squareup.okhttp3:okhttp-bom:4.12.0') }