Merge branch 'project-updates'

Author: johnjohndoe

CHANGELOG.md

@@ -6,7 +6,16 @@
 
 ### Changes
 
-* Fix `SimpleRoomStatesRepository#callFactory` property name.
+* Use publish:0.35.0.
+  * Switch from discontinued "Sonatype OSSRH" to "Central Portal".
+* Provide good defaults via `SimpleRoomStatesRepository` constructor and `RoomStatesApi#provideRoomStatesService`.
+* Use kotlin:2.2.21.
+* Use kotlinx-serialization-json:1.9.0.
+* Use kotlinx-coroutines:1.10.2.
+* Use okhttp:5.3.2.
+* Use retrofit-adapters-result:1.1.0.
+* Use retrofit:3.0.0.
+* **Breaking change:** Fix `SimpleRoomStatesRepository#callFactory` property name.
 
 
 ## [v.1.0.1](https://github.com/EventFahrplan/roomstates/releases/tag/v.1.0.1)

build.gradle

@@ -2,3 +2,5 @@ plugins {
     alias(libs.plugins.mavenPublish) apply false
     alias(libs.plugins.versions)
 }
+
+apply from: "gradle/gradle-versions.gradle"

gradle.properties

@@ -7,7 +7,7 @@ org.gradle.caching=true
 org.gradle.configuration-cache=true
 kotlin.code.style=official
 # Maven Central
-SONATYPE_HOST=DEFAULT
+SONATYPE_HOST=CENTRAL_PORTAL
 RELEASE_SIGNING_ENABLED=true
 # Dummy properties so that anyone can compile the library
 mavenCentralUsername=""

gradle/libs.versions.toml

@@ -1,17 +1,16 @@
 [versions]
-kotlin = "2.1.10"
-kotlinxSerializationJson = "1.8.0"
-kotlinxCoroutines = "1.10.1"
-junitJupiterParams = "5.11.4"
-mavenPublish = "0.30.0"
-mockitoKotlin = "5.4.0"
-okhttp = "4.12.0"
-retrofit = "2.11.0"
-retrofitAdaptersResult = "1.0.13"
-retrofitConverterKotlinxSerialization = "2.11.0"
-truth = "1.4.4"
-turbine = "1.2.0"
-versions = "0.52.0"
+kotlin = "2.2.21"
+kotlinxSerializationJson = "1.9.0"
+kotlinxCoroutines = "1.10.2"
+junitJupiterParams = "6.0.1"
+mavenPublish = "0.35.0"
+mockitoKotlin = "6.1.0"
+okhttp = "5.3.2"
+retrofit = "3.0.0"
+retrofitAdaptersResult = "1.1.0"
+truth = "1.4.5"
+turbine = "1.2.1"
+versions = "0.53.0"
 
 [libraries]
 kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
@@ -20,7 +19,7 @@ kotlinxCoroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core",
 
 retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofitAdaptersResult = { module = "com.github.skydoves:retrofit-adapters-result", version.ref = "retrofitAdaptersResult" }
-retrofitConverterKotlinxSerialization = { module = "com.squareup.retrofit2:converter-kotlinx-serialization", version.ref = "retrofitConverterKotlinxSerialization" }
+retrofitConverterKotlinxSerialization = { module = "com.squareup.retrofit2:converter-kotlinx-serialization", version.ref = "retrofit" }
 
 okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 okhttpMockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" }

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,12 +1,13 @@
 package info.metadude.kotlin.library.roomstates.base
 
 import okhttp3.Call
+import okhttp3.OkHttpClient
 
 interface RoomStatesApi {
 
     fun provideRoomStatesService(
         baseUrl: String,
-        callFactory: Call.Factory,
+        callFactory: Call.Factory = OkHttpClient.Builder().build(),
     ): RoomStatesService
 
 }

gradlew

@@ -1,17 +1,19 @@
 package info.metadude.kotlin.library.roomstates.repositories.simple
 
+import info.metadude.kotlin.library.roomstates.base.Api
 import info.metadude.kotlin.library.roomstates.base.RoomStatesApi
 import info.metadude.kotlin.library.roomstates.base.models.Room
 import info.metadude.kotlin.library.roomstates.repositories.RoomStatesRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import okhttp3.Call
+import okhttp3.OkHttpClient
 
 class SimpleRoomStatesRepository(
     private val url: String,
     private val path: String,
-    private val callFactory: Call.Factory,
-    private val api: RoomStatesApi,
+    private val callFactory: Call.Factory = OkHttpClient.Builder().build(),
+    private val api: RoomStatesApi = Api,
 ) : RoomStatesRepository {
 
     override suspend fun getRooms(): Flow<Result<List<Room>>> {