Merge branch 'project-setup'

Author: johnjohndoe

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Engelsystem changelog
 
+## NEXT
+
+* Not published yet.
+
+### Changes
+
+* Provide good defaults via `SimpleEngelsystemRepository` constructor and `EngelsystemApi#provideEngelsystemService`.
+* Use okhttp v.5.3.2.
+* Use retrofit v.3.0.0.
+* Use threetenbp v.1.7.2.
+* Use dokka v.2.1.0.
+* Use kotlin v.2.2.21 and ksp v.2.3.3.
+
+
 ## [v.10.0.0](https://github.com/johnjohndoe/engelsystem/releases/tag/v.10.0.0)
 
 * Published: 2025-05-10
@@ -22,6 +36,7 @@
 * Use threetenbp v.1.7.1.
 * Fix URL of Apache license.
 
+
 ## [v.9.2.0](https://github.com/johnjohndoe/engelsystem/releases/tag/v.9.2.0)
 
 * Published: 2024-11-12

buildSrc/src/main/kotlin/info/metadude/kotlin/library/engelsystem/Dependencies.kt

@@ -5,10 +5,10 @@ package info.metadude.kotlin.library.engelsystem
 object GradlePlugins {
 
     private object Versions {
-        const val dokka = "2.0.0"
-        const val kotlin = "2.1.20"
-        const val ksp = "2.1.20-2.0.1"
-        const val versions = "0.52.0"
+        const val dokka = "2.1.0"
+        const val kotlin = "2.2.21"
+        const val ksp = "2.3.3"
+        const val versions = "0.53.0"
     }
 
     const val dokka = "org.jetbrains.dokka:dokka-gradle-plugin:${Versions.dokka}"
@@ -20,29 +20,28 @@ object GradlePlugins {
 object Libs {
 
     private object Versions {
-        const val junitJupiter = "5.12.2"
-        const val junitPlatformLauncher = "1.12.2"
+        const val junit = "6.0.1"
         const val kotlinCoroutines = "1.10.2"
-        const val mockitoKotlin = "5.4.0"
+        const val mockitoKotlin = "6.1.0"
         const val moshi = "1.15.2"
-        const val okhttp = "4.12.0"
-        const val retrofit = "2.11.0"
-        const val threetenbp = "1.7.1"
-        const val truth = "1.4.4"
-        const val turbine = "1.2.0"
+        const val okhttp = "5.3.2"
+        const val retrofit = "3.0.0"
+        const val threetenbp = "1.7.2"
+        const val truth = "1.4.5"
+        const val turbine = "1.2.1"
     }
 
-    const val junitJupiterApi = "org.junit.jupiter:junit-jupiter-api:${Versions.junitJupiter}"
-    const val junitJupiterEngine = "org.junit.jupiter:junit-jupiter-engine:${Versions.junitJupiter}"
-    const val junitPlatformLauncher = "org.junit.platform:junit-platform-launcher:${Versions.junitPlatformLauncher}"
+    const val junitJupiterApi = "org.junit.jupiter:junit-jupiter-api:${Versions.junit}"
+    const val junitJupiterEngine = "org.junit.jupiter:junit-jupiter-engine:${Versions.junit}"
+    const val junitPlatformLauncher = "org.junit.platform:junit-platform-launcher:${Versions.junit}"
     const val kotlinCoroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.kotlinCoroutines}"
     const val kotlinCoroutinesTest = "org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.kotlinCoroutines}"
     const val mockitoKotlin = "org.mockito.kotlin:mockito-kotlin:${Versions.mockitoKotlin}"
     const val moshi = "com.squareup.moshi:moshi:${Versions.moshi}"
     const val moshiKotlinCodegen = "com.squareup.moshi:moshi-kotlin-codegen:${Versions.moshi}"
     const val okhttp = "com.squareup.okhttp3:okhttp:${Versions.okhttp}"
     const val okhttpLoggingInterceptor = "com.squareup.okhttp3:logging-interceptor:${Versions.okhttp}"
-    const val okhttpMockWebServer = "com.squareup.okhttp3:mockwebserver:${Versions.okhttp}"
+    const val okhttpMockWebServer = "com.squareup.okhttp3:mockwebserver3-junit5:${Versions.okhttp}"
     const val retrofit = "com.squareup.retrofit2:retrofit:${Versions.retrofit}"
     const val retrofitMoshi = "com.squareup.retrofit2:converter-moshi:${Versions.retrofit}"
     const val threetenbp = "org.threeten:threetenbp:${Versions.threetenbp}"

engelsystem-base/src/main/kotlin/info/metadude/kotlin/library/engelsystem/EngelsystemApi.kt

@@ -1,12 +1,13 @@
 package info.metadude.kotlin.library.engelsystem
 
 import okhttp3.Call
+import okhttp3.OkHttpClient
 
 interface EngelsystemApi {
 
     fun provideEngelsystemService(
         baseUrl: String,
-        callFactory: Call.Factory,
+        callFactory: Call.Factory = OkHttpClient.Builder().build(),
     ): EngelsystemService
 
 }

engelsystem-repositories/src/main/kotlin/info/metadude/kotlin/library/engelsystem/repositories/simple/SimpleEngelsystemRepository.kt

@@ -1,5 +1,6 @@
 package info.metadude.kotlin.library.engelsystem.repositories.simple
 
+import info.metadude.kotlin.library.engelsystem.Api
 import info.metadude.kotlin.library.engelsystem.EngelsystemApi
 import info.metadude.kotlin.library.engelsystem.repositories.EngelsystemRepository
 import info.metadude.kotlin.library.engelsystem.repositories.models.GetShiftsState
@@ -9,10 +10,11 @@ import info.metadude.kotlin.library.engelsystem.repositories.models.GetShiftsSta
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import okhttp3.Call
+import okhttp3.OkHttpClient
 
 class SimpleEngelsystemRepository(
-    private val callFactory: Call.Factory,
-    private val api: EngelsystemApi,
+    private val callFactory: Call.Factory = OkHttpClient.Builder().build(),
+    private val api: EngelsystemApi = Api,
 ) : EngelsystemRepository {
 
     private companion object {

engelsystem-repositories/src/test/kotlin/info/metadude/kotlin/library/engelsystem/services/simple/SimpleEngelsystemRepositoryHttpStatusCodeTest.kt

@@ -13,10 +13,10 @@ import info.metadude.kotlin.library.engelsystem.repositories.models.GetShiftsSta
 import info.metadude.kotlin.library.engelsystem.repositories.simple.SimpleEngelsystemRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.test.runTest
+import mockwebserver3.MockResponse
+import mockwebserver3.MockWebServer
 import okhttp3.Call
 import okhttp3.OkHttpClient
-import okhttp3.mockwebserver.MockResponse
-import okhttp3.mockwebserver.MockWebServer
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
@@ -96,7 +96,7 @@ class SimpleEngelsystemRepositoryHttpStatusCodeTest {
 
     @AfterEach
     fun tearDown() {
-        mockWebServer.shutdown()
+        mockWebServer.close()
     }
 
     @Test
@@ -235,10 +235,11 @@ class SimpleEngelsystemRepositoryHttpStatusCodeTest {
         responseHttpStatusCode: Int,
         responseBody: String
     ): Flow<GetShiftsState> {
-        val shiftsResponse = MockResponse()
+        val shiftsResponse = MockResponse.Builder()
             .addHeader("Content-Type", "application/json")
-            .setResponseCode(responseHttpStatusCode)
-            .setBody(responseBody)
+            .code(responseHttpStatusCode)
+            .body(responseBody)
+            .build()
         mockWebServer.enqueue(shiftsResponse)
         return getShiftsState(
             requestETag = "",

gradle/wrapper/gradle-wrapper.jar

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=efe9a3d147d948d7528a9887fa35abcf24ca1a43ad06439996490f77569b02d1
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
+distributionSha256Sum=f86344275d1b194688dd330abf9f6f2344cd02872ffee035f2d1ea2fd60cf7f3
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME