Feature/upgrade dependencies for gradle9

app/build.gradle

@@ -60,15 +60,9 @@ dependencies {
     // Kotlin dependencies
     implementation kotlinDependencies.kotlinStdLib
     implementation kotlinDependencies.androidKtx
-    implementation kotlinDependencies.kotlinReflect
-
-    // Rx + Coroutines
-    implementation dataDependencies.rxJava
-    implementation dataDependencies.rxAndroid
-    implementation dataDependencies.rxKotlin
 
     implementation dataDependencies.room
-    implementation dataDependencies.roomRxJava
+    implementation dataDependencies.roomKtx
     kapt dataDependencies.roomCompiler
 
     implementation supportDependencies.appCompat
@@ -77,12 +71,12 @@ dependencies {
     implementation supportDependencies.constraintLayout
 
     implementation dataDependencies.threeten
-    implementation dataDependencies.gson
     implementation dataDependencies.okHttp
     implementation dataDependencies.okHttpInterceptor
     implementation dataDependencies.retrofit
-    implementation dataDependencies.retrofitGsonConverter
-    implementation dataDependencies.retrofitRxJavaAdapter
+    implementation dataDependencies.retrofitScalarsConverter
+    implementation dataDependencies.retrofitKotlinxConverter
+    implementation dataDependencies.kotlinxSerializationJson
 
     implementation developmentDependencies.timber
     debugImplementation developmentDependencies.leakCanary

build.gradle

@@ -4,7 +4,7 @@ apply from: 'dependencies.gradle'
 apply plugin: 'com.github.ben-manes.versions'
 
 buildscript {
-    ext.kotlin_version = "2.0.21"
+    ext.kotlin_version = "2.2.0"
     repositories {
         google()
         mavenCentral()
@@ -13,8 +13,10 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.2'
+        classpath 'com.android.tools.build:gradle:8.9.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+        classpath 'com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:2.2.0-2.0.2'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.50.0'
 
         // NOTE: Do not place your application dependencies here; they belong

dependencies.gradle

@@ -7,14 +7,14 @@ ext {
     testersMails = '.ci/internal/beta_distribution_emails.txt'
 
     // Kotlin
-    kotlinVer = '1.9.22'
-    coroutineVer = '1.7.3'
-    androidKtxVer = '1.9.0'
+    kotlinVer = '2.2.0'
+    coroutineVer = '1.10.2'
+    androidKtxVer = '1.16.0'
     koinVer = '2.1.6'
 
     // AndroidX
-    appCompatVer = '1.6.0'
-    fragmentVersion = '1.6.2'
+    appCompatVer = '1.7.1'
+    fragmentVersion = '1.8.2'
     materialVer = '1.9.0'
     cardViewVer = '1.0.0'
     mediaVer = '1.0.1'
@@ -31,33 +31,22 @@ ext {
     firestoreVer = '21.6.0'
 
     // Architecture components
-    roomVer = '2.6.1'
-    lifecycleVer = "2.6.2"
+    roomVer = '2.8.4'
+    lifecycleVer = "2.9.1"
     coreRuntimeVer = "2.0.1"
 
-    // Redux
-    rxReduxVer = '1.0.0'
-
     // MultiDex
     multiDexVer = '2.0.0'
 
     // Dagger
-    daggerVer = '2.50'
-
-    // Reactive Extensions
-    rxJava2Ver = '2.2.21'
-    rxAndroid2Ver = '2.1.1'
-    rxBinding2Ver = '2.2.0'
-    rxKotlinVer = '2.4.0'
-
+    daggerVer = '2.56.2'
 
     // Networking
-    okHttpVer = '4.12.0'
-    retrofitVer = '2.9.0'
-    coroutinesAdapterVer = '0.9.2'
+    okHttpVer = '5.1.0'
+    retrofitVer = '3.0.0'
 
-    // Gson
-    gsonVer = '2.8.6'
+    // kotlinx-serialization
+    kotlinxSerializationVer = '1.9.0'
 
     autoValueVer = '1.6.5'
 
@@ -82,7 +71,7 @@ ext {
 
     // Billing Client
     billingClientVer = '8.0.0'
-    billingKtxVer = '1.0.0'
+    billingKtxVer = '1.1.0-RC2'
 
     // Developer-related
     timberVer = '5.0.1'
@@ -111,12 +100,12 @@ ext {
 
     // Unit-tests
     jUnitVer = '4.13.2'
-    jupiterVer = '5.7.1'
+    jupiterVer = '5.13.3'
     mockitoVer = '3.8.0'
     mockitoKotlinVer = '2.1.0'
     mockitoAndroidVer = '2.28.2'
     jacocoVer = '0.1.2'
-    assertJVer = '3.12.2'
+    assertJVer = '3.27.3'
     dataProviderVer = '2.4'
     androidXTestCore = '1.2.0'
 
@@ -127,8 +116,6 @@ ext {
     coreTestingVer = '2.0.0-alpha1'
     extJUnitVer = '1.1.1'
     extTruthVer = '1.2.0'
-    rxIdlerVer = '0.9.0'
-
     // Dependencies
     supportDependencies = [
             appCompat       : "androidx.appcompat:appcompat:$appCompatVer",
@@ -145,7 +132,7 @@ ext {
     ]
 
     kotlinDependencies = [
-            kotlinStdLib : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVer",
+            kotlinStdLib : "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVer",
             kotlinReflect: "org.jetbrains.kotlin:kotlin-reflect:$kotlinVer",
             androidKtx   : "androidx.core:core-ktx:$androidKtxVer"
     ]
@@ -172,20 +159,14 @@ ext {
     dataDependencies = [
             dagger                   : "com.google.dagger:dagger:$daggerVer",
             daggerCompiler           : "com.google.dagger:dagger-compiler:$daggerVer",
-            rxJava                   : "io.reactivex.rxjava2:rxjava:$rxJava2Ver",
-            rxKotlin                 : "io.reactivex.rxjava2:rxkotlin:$rxKotlinVer",
-            rxAndroid                : "io.reactivex.rxjava2:rxandroid:$rxAndroid2Ver",
-            rxBinding                : "com.jakewharton.rxbinding2:rxbinding:$rxBinding2Ver",
-            gson                     : "com.google.code.gson:gson:$gsonVer",
             okHttp                   : "com.squareup.okhttp3:okhttp:$okHttpVer",
             okHttpInterceptor        : "com.squareup.okhttp3:logging-interceptor:$okHttpVer",
             retrofit                 : "com.squareup.retrofit2:retrofit:$retrofitVer",
-            retrofitGsonConverter    : "com.squareup.retrofit2:converter-gson:$retrofitVer",
-            retrofitRxJavaAdapter    : "com.squareup.retrofit2:adapter-rxjava2:$retrofitVer",
             retrofitScalarsConverter : "com.squareup.retrofit2:converter-scalars:$retrofitVer",
-            retrofitCoroutinesAdapter: "com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:$coroutinesAdapterVer",
+            retrofitKotlinxConverter : "com.squareup.retrofit2:converter-kotlinx-serialization:$retrofitVer",
+            kotlinxSerializationJson : "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinxSerializationVer",
             room                     : "androidx.room:room-runtime:$roomVer",
-            roomRxJava               : "androidx.room:room-rxjava2:$roomVer",
+            roomKtx                  : "androidx.room:room-ktx:$roomVer",
             roomCompiler             : "androidx.room:room-compiler:$roomVer",
             billingKtx               : "com.github.AppSci:billing-ktx:$billingKtxVer",
             billingClient            : "com.android.billingclient:billing-ktx:$billingClientVer",
@@ -194,12 +175,11 @@ ext {
 
     coroutineDependencies = [
             "core"   : "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVer",
-            "rx2"    : "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$coroutineVer",
             "android": "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutineVer",
             "test"   : "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutineVer"
     ]
 
-    mockKVer = '1.13.8'
+    mockKVer = '1.14.2'
 
     testDependencies = [
             jUnit             : "junit:junit:$jUnitVer",
@@ -225,7 +205,6 @@ ext {
             espressoIntents   : "androidx.test.espresso:espresso-intents:$espressoCoreVer",
             extJUnit          : "androidx.test.ext:junit:$extJUnitVer",
             extTruth          : "androidx.test.ext:truth:$extTruthVer",
-            rxIdler           : "com.squareup.rx.idler:rx2-idler:$rxIdlerVer",
             testRules         : "androidx.test:rules:$runnerVer",
             supportAnnotations: "androidx.annotation:annotation:$annotationsVer",
             testRoom          : "androidx.room:room-testing:$roomVer",

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Wed Dec 27 16:22:23 EET 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

sdk/build.gradle

@@ -2,6 +2,8 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlinx-serialization'
+apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'maven-publish'
 
 android {
@@ -20,13 +22,6 @@ android {
         buildConfigField "String", "PANDA_ENDPOINT_PROD", "\"https://api.panda.boosters.company/\""
         buildConfigField "String", "PANDA_ENDPOINT_STAGE", "\"https://api.panda-stage.boosters.company/\""
 
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
-//                includeCompileClasspath = true
-            }
-        }
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }
@@ -52,6 +47,9 @@ android {
             useJUnitPlatform()
         }
     }
+    ksp {
+        arg("room.schemaLocation", "$projectDir/schemas")
+    }
     buildFeatures {
         viewBinding true
         buildConfig true
@@ -72,7 +70,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.github.AppSci'
                 artifactId = 'panda-sdk-android'
-                version = '1.8.0'
+                version = '1.9.0-RC2'
             }
         }
 
@@ -95,7 +93,6 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
 
     implementation presentationDependencies.lifecycleRuntime
-    kapt presentationDependencies.lifecycleCompiler
     implementation presentationDependencies.fragment
     implementation presentationDependencies.fragmentKtx
 
@@ -108,30 +105,22 @@ dependencies {
     // Kotlin dependencies
     implementation kotlinDependencies.kotlinStdLib
     implementation kotlinDependencies.androidKtx
-    implementation kotlinDependencies.kotlinReflect
-
-    // Rx + Coroutines
-    implementation dataDependencies.rxJava
-    implementation dataDependencies.rxAndroid
-    implementation dataDependencies.rxKotlin
-    implementation dataDependencies.rxBinding
 
     implementation dataDependencies.room
-    implementation dataDependencies.roomRxJava
-    kapt dataDependencies.roomCompiler
+    implementation dataDependencies.roomKtx
+    ksp dataDependencies.roomCompiler
 
     implementation dataDependencies.threeten
-    implementation dataDependencies.gson
     implementation dataDependencies.okHttp
     implementation dataDependencies.okHttpInterceptor
     implementation dataDependencies.retrofit
-    implementation dataDependencies.retrofitGsonConverter
-    implementation dataDependencies.retrofitRxJavaAdapter
     implementation dataDependencies.retrofitScalarsConverter
+    implementation dataDependencies.retrofitKotlinxConverter
+    implementation dataDependencies.kotlinxSerializationJson
 
-    implementation platform('com.google.firebase:firebase-bom:32.7.0')
-    implementation 'com.google.firebase:firebase-messaging-ktx'
-    implementation 'com.google.firebase:firebase-analytics-ktx'
+    implementation platform('com.google.firebase:firebase-bom:33.16.0')
+    implementation 'com.google.firebase:firebase-messaging'
+    implementation 'com.google.firebase:firebase-analytics'
 
     // Billing
     implementation dataDependencies.billingKtx
@@ -141,12 +130,12 @@ dependencies {
 
     implementation coroutineDependencies.core
     implementation coroutineDependencies.android
-    implementation coroutineDependencies.rx2
 
 
     testImplementation testDependencies.jupiterApi
     testImplementation testDependencies.jupiterEngine
     testImplementation testDependencies.jupiterParams
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.3'
     testImplementation testDependencies.mockK
     testImplementation testDependencies.assertJ
     testImplementation coroutineDependencies.test