Update dependencies (#47)

This PR updates all the dependencies in the project: - Android Gradle Plugin 8.6.0. - AndroidX Activity 1.9.1 (was added to replace AndroidX Appcompat). - AndroidX Annotation 1.8.2. - AndroidX Appcomat was removed (only used in the demo app). - AndroidX ConstraintLayout was removed (only used in the demo app). - AndroidX Lifecycle 2.8.4. - AndroidX Paging 3.3.2. - AndroidX Test Ext jUnit 1.2.1. - Compile SDK 34. - Detekt 1.23.6. - JVM target 17. - Kotlin 2.0.20. - KotlinX Serialization 1.7.2. - Material was removed (only used in the demo app). - OkHttp 4.12.0. - Retrofit 2.11.0. - Robolectric 4.13. - Target SDK 34.
SRGSSR · Aug 30, 2024 · ccc76cb · ccc76cb
1 parent bf8419c
commit ccc76cb
Show file tree

Hide file tree

Showing 18 changed files with 84 additions and 132 deletions.
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
@@ -1,6 +1,6 @@
 object Config {
-    const val compileSdk = 33
-    const val targetSdk = 33
+    const val compileSdk = 34
+    const val targetSdk = 34
     const val minSdk = 21
 
     const val major = 0

diff --git a/config/detekt.yml b/config/detekt.yml
@@ -300,7 +300,6 @@ naming:
   BooleanPropertyNaming:
     active: false
     allowedPattern: '^(is|has|are)'
-    ignoreOverridden: true
   ClassNaming:
     active: true
     classPattern: '[A-Z][a-zA-Z0-9]*'
@@ -309,7 +308,6 @@ naming:
     parameterPattern: '[a-z][A-Za-z0-9]*'
     privateParameterPattern: '[a-z][A-Za-z0-9]*'
     excludeClassPattern: '$^'
-    ignoreOverridden: true
   EnumNaming:
     active: true
     enumEntryPattern: '[A-Z][_a-zA-Z0-9]*'
@@ -327,13 +325,11 @@ naming:
     excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**' ]
     functionPattern: '[a-z][a-zA-Z0-9]*'
     excludeClassPattern: '$^'
-    ignoreOverridden: true
     ignoreAnnotated: [ 'Composable' ]
   FunctionParameterNaming:
     active: true
     parameterPattern: '[a-z][A-Za-z0-9]*'
     excludeClassPattern: '$^'
-    ignoreOverridden: true
   InvalidPackageDeclaration:
     active: true
     rootPackage: ''
@@ -375,7 +371,6 @@ naming:
     variablePattern: '[a-z][A-Za-z0-9]*'
     privateVariablePattern: '(_)?[a-z][A-Za-z0-9]*'
     excludeClassPattern: '$^'
-    ignoreOverridden: true
 
 performance:
   active: true
@@ -515,12 +510,11 @@ style:
     includeLineWrapping: false
   ForbiddenComment:
     active: true
-    values:
+    comments:
       - 'FIXME:'
       - 'STOPSHIP:'
       - 'TODO:'
     allowedPatterns: ''
-    customMessage: ''
   ForbiddenImport:
     active: false
     imports: [ ]
@@ -564,7 +558,7 @@ style:
     ignoreRanges: false
     ignoreExtensionFunctions: true
     ignoreAnnotated: [ 'Composable' ]
-  MandatoryBracesIfStatements:
+  BracesOnIfStatements:
     active: false
   MandatoryBracesLoops:
     active: false
@@ -597,7 +591,7 @@ style:
     active: true
   OptionalUnit:
     active: false
-  OptionalWhenBraces:
+  BracesOnWhenStatements:
     active: false
   PreferToOverPairSyntax:
     active: false

diff --git a/data/build.gradle.kts b/data/build.gradle.kts
@@ -11,7 +11,6 @@ android {
 
     defaultConfig {
         minSdk = Config.minSdk
-        targetSdk = Config.targetSdk
         group = Config.maven_group
         version = Config.versionName
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -31,17 +30,18 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
     lint {
         // https://developer.android.com/reference/tools/gradle-api/4.1/com/android/build/api/dsl/LintOptions
         abortOnError = false
         sarifReport = true
         sarifOutput = rootProject.layout.buildDirectory.file("reports/android-lint/${project.name}.sarif").get().asFile
+        targetSdk = Config.targetSdk
     }
     publishing {
         singleVariant("release") {
@@ -54,9 +54,9 @@ android {
 dependencies {
     api(libs.kotlinx.serialization.json)
 
-    testImplementation(libs.robolectric)
+    testRuntimeOnly(libs.robolectric)
     testImplementation(libs.junit)
-    testImplementation(libs.ext.junit)
+    testImplementation(libs.androidx.test.ext.junit)
 }
 
 publishing {

diff --git a/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/DataProviderJson.kt b/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/DataProviderJson.kt
@@ -1,9 +1,7 @@
 package ch.srg.dataProvider.integrationlayer.data
 
-import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
 
-@OptIn(ExperimentalSerializationApi::class)
 val DataProviderJson = Json {
     ignoreUnknownKeys = true
     encodeDefaults = true

diff --git a/dataprovider-paging/build.gradle.kts b/dataprovider-paging/build.gradle.kts
@@ -10,7 +10,6 @@ android {
 
     defaultConfig {
         minSdk = Config.minSdk
-        targetSdk = Config.targetSdk
         group = Config.maven_group
         version = Config.versionName
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -30,17 +29,18 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
     lint {
         // https://developer.android.com/reference/tools/gradle-api/4.1/com/android/build/api/dsl/LintOptions
         abortOnError = false
         sarifReport = true
         sarifOutput = rootProject.layout.buildDirectory.file("reports/android-lint/${project.name}.sarif").get().asFile
+        targetSdk = Config.targetSdk
     }
     publishing {
         singleVariant("release") {
@@ -52,7 +52,7 @@ android {
 
 dependencies {
     api(project(":dataprovider-retrofit"))
-    api(libs.paging.common)
+    api(libs.androidx.paging.common)
 }
 
 publishing {

diff --git a/dataprovider-paging/src/main/java/ch/srgssr/dataprovider/paging/DataProviderPaging.kt b/dataprovider-paging/src/main/java/ch/srgssr/dataprovider/paging/DataProviderPaging.kt
@@ -256,7 +256,9 @@ class DataProviderPaging(
     fun getRadioAlphabeticalShowsByChannelId(bu: Bu, radioChannelId: String, pageSize: Int = DEFAULT_PAGE_SIZE): Flow<PagingData<Show>> {
         return createNextUrlPagingData(
             pageSize = pageSize,
-            initialCall = { ilService.getRadioAlphabeticalShowsByChannelId(bu = bu, channelId = radioChannelId, pageSize = it.toIlPaging()) },
+            initialCall = {
+                ilService.getRadioAlphabeticalShowsByChannelId(bu = bu, channelId = radioChannelId, pageSize = it.toIlPaging())
+            },
             nextCall = { ilService.getShowListNextUrl(it) }
         )
     }

diff --git a/dataprovider-retrofit/build.gradle.kts b/dataprovider-retrofit/build.gradle.kts
@@ -10,7 +10,6 @@ android {
 
     defaultConfig {
         minSdk = Config.minSdk
-        targetSdk = Config.targetSdk
         group = Config.maven_group
         version = Config.versionName
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -30,17 +29,18 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
     lint {
         // https://developer.android.com/reference/tools/gradle-api/4.1/com/android/build/api/dsl/LintOptions
         abortOnError = false
         sarifReport = true
         sarifOutput = rootProject.layout.buildDirectory.file("reports/android-lint/${project.name}.sarif").get().asFile
+        targetSdk = Config.targetSdk
     }
     publishing {
         singleVariant("release") {
@@ -54,12 +54,13 @@ dependencies {
     api(project(":data"))
     api(libs.retrofit)
     compileOnly(libs.androidx.annotation)
-    implementation(libs.retrofit2.kotlinx.serialization.converter)
-    implementation(libs.logging.interceptor)
+    api(platform(libs.retrofit.bom))
+    implementation(libs.retrofit.converter.kotlinx.serialization)
+    implementation(libs.okhttp.logging.interceptor)
 
     testImplementation(libs.junit)
     testRuntimeOnly(libs.robolectric)
-    testImplementation(libs.ext.junit)
+    testImplementation(libs.androidx.test.ext.junit)
 }
 
 publishing {

diff --git a/...rc/main/java/ch/srg/dataProvider/integrationlayer/dependencies/modules/IlServiceModule.kt b/...rc/main/java/ch/srg/dataProvider/integrationlayer/dependencies/modules/IlServiceModule.kt
@@ -4,10 +4,11 @@ import ch.srg.dataProvider.integrationlayer.SRGUrlFactory
 import ch.srg.dataProvider.integrationlayer.data.DataProviderJson
 import ch.srg.dataProvider.integrationlayer.request.IlHost
 import ch.srg.dataProvider.integrationlayer.request.IlService
-import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
+import retrofit2.converter.kotlinx.serialization.asConverterFactory
+import retrofit2.create
 
 /**
  * Copyright (c) SRG SSR. All rights reserved.
@@ -28,6 +29,6 @@ object IlServiceModule {
             .client(httpClient)
             .baseUrl(uri.toString())
             .build()
-            .create(IlService::class.java)
+            .create()
     }
 }
diff --git a/...ava/ch/srg/dataProvider/integrationlayer/dependencies/modules/IlStatisticServiceModule.kt b/...ava/ch/srg/dataProvider/integrationlayer/dependencies/modules/IlStatisticServiceModule.kt
@@ -4,10 +4,11 @@ import ch.srg.dataProvider.integrationlayer.SRGUrlFactory
 import ch.srg.dataProvider.integrationlayer.data.DataProviderJson
 import ch.srg.dataProvider.integrationlayer.request.IlHost
 import ch.srg.dataProvider.integrationlayer.request.IlStatisticService
-import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
+import retrofit2.converter.kotlinx.serialization.asConverterFactory
+import retrofit2.create
 
 object IlStatisticServiceModule {
 
@@ -22,6 +23,6 @@ object IlStatisticServiceModule {
             .client(httpClient)
             .baseUrl(uri.toString())
             .build()
-            .create(IlStatisticService::class.java)
+            .create()
     }
 }
diff --git a/...retrofit/src/main/java/ch/srg/dataProvider/integrationlayer/request/IlStatisticService.kt b/...retrofit/src/main/java/ch/srg/dataProvider/integrationlayer/request/IlStatisticService.kt
@@ -14,10 +14,16 @@ interface IlStatisticService {
     suspend fun getMediaStatisticByUrn(@Path("urn") urn: String): MediaStatisticResult
 
     @POST("2.0/mediaStatistic/byUrn/{urn}/clicked")
-    suspend fun postMediaClicked(@Path("urn") urn: String, @Body mediaStatisticsBody: MediaStatisticPost): MediaStatisticResult
+    suspend fun postMediaClicked(
+        @Path("urn") urn: String,
+        @Body mediaStatisticsBody: MediaStatisticPost
+    ): MediaStatisticResult
 
     @POST("2.0/mediaStatistic/byUrn/{urn}/liked")
-    suspend fun postMediaLiked(@Path("urn") urn: String, @Body mediaStatisticsBody: MediaStatisticPost): MediaStatisticResult
+    suspend fun postMediaLiked(
+        @Path("urn") urn: String,
+        @Body mediaStatisticsBody: MediaStatisticPost
+    ): MediaStatisticResult
 
     @POST("2.0/mediaStatistic/byUrn/{urn}/shared/{service}")
     suspend fun postMediaShared(

diff --git a/dataproviderdemo/build.gradle.kts b/dataproviderdemo/build.gradle.kts
@@ -37,11 +37,11 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
 
     lint {
@@ -57,9 +57,6 @@ android {
 
 dependencies {
     implementation(project(":dataprovider-retrofit"))
-    implementation(libs.appcompat)
-    implementation(libs.material)
-    implementation(libs.constraintlayout)
-    implementation(libs.lifecycle.runtime)
-    implementation(libs.lifecycle.viewmodel)
+    implementation(libs.androidx.activity)
+    implementation(libs.androidx.lifecycle.runtime)
 }
diff --git a/dataproviderdemo/src/main/java/ch/srgssr/dataprovider/demo/MainActivity.kt b/dataproviderdemo/src/main/java/ch/srgssr/dataprovider/demo/MainActivity.kt
@@ -2,7 +2,8 @@ package ch.srgssr.dataprovider.demo
 
 import android.os.Bundle
 import android.util.Log
-import androidx.appcompat.app.AppCompatActivity
+import androidx.activity.ComponentActivity
+import androidx.activity.enableEdgeToEdge
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
@@ -16,14 +17,15 @@ import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.launch
 import okhttp3.OkHttpClient
 
-class MainActivity : AppCompatActivity() {
+class MainActivity : ComponentActivity(R.layout.activity_main) {
 
     private lateinit var okHttp: OkHttpClient
     private lateinit var ilService: IlService
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
+
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
 
         okHttp = OkHttpModule.createOkHttpClient(this)
         ilService = IlServiceModule.createIlService(okHttp, ilHost = IlHost.PROD)

diff --git a/dataproviderdemo/src/main/res/layout/activity_main.xml b/dataproviderdemo/src/main/res/layout/activity_main.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -9,10 +8,6 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+        android:layout_gravity="center"
+        android:text="Hello World!" />
+</FrameLayout>
diff --git a/dataproviderdemo/src/main/res/values-night/themes.xml b/dataproviderdemo/src/main/res/values-night/themes.xml
@@ -1,16 +1,4 @@
 <resources>
     <!-- Base application theme. -->
-    <style name="Theme.SRGDataProvider" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
+    <style name="Theme.SRGDataProvider" parent="android:Theme.Material.NoActionBar" />
 </resources>
diff --git a/dataproviderdemo/src/main/res/values/colors.xml b/dataproviderdemo/src/main/res/values/colors.xml