Merge pull request #928 from radixdlt/chore/update-libraries

Update libraries

app/build.gradle

@@ -1,4 +1,5 @@
 plugins {
+ alias libs.plugins.compose.compiler
  alias libs.plugins.android.application
  alias libs.plugins.kotlin.android
  alias libs.plugins.hilt
@@ -144,9 +145,6 @@ android {
  buildFeatures {
  compose true
  }
- composeOptions {
- kotlinCompilerExtensionVersion rootProject.ext.kotlinCompilerExtensionVersion
- }
  packagingOptions {
  resources {
  excludes += "/META-INF/{AL2.0,LGPL2.1}"
@@ -178,6 +176,10 @@ sonarqube {
  }
 }
 
+composeCompiler {
+ enableStrongSkippingMode = true
+}
+
 dependencies {
  implementation project(path: ':core')
 

build.gradle

@@ -6,14 +6,14 @@ buildscript {
  compileSdk = 34
  targetSdk = 33
  internalVersionName = "babylon"
- kotlinCompilerExtensionVersion = "1.5.8"
  }
  dependencies {
- classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.5"
- classpath "org.jacoco:org.jacoco.core:0.8.11"
+ classpath libs.detektGradlePlugin
+ classpath libs.orgJacocoCore
  }
 }// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
+ alias libs.plugins.compose.compiler apply false
  alias libs.plugins.android.application apply false
  alias libs.plugins.android.library apply false
  alias libs.plugins.kotlin.android apply false
@@ -27,14 +27,6 @@ plugins {
  alias libs.plugins.ksp apply false
 }
 
-versionCatalogUpdate {
- sortByKey = false
- versionCatalogs {
- libraries {
- catalogFile = file("./gradle/libraries.versions.toml")
- }
- }
-}
 allprojects {
  apply from: "$rootDir/config/detekt.gradle"
  tasks.withType(Detekt).configureEach {

designsystem/build.gradle

@@ -1,4 +1,5 @@
 plugins {
+ alias libs.plugins.compose.compiler
  alias libs.plugins.android.library
  alias libs.plugins.kotlin.android
 }
@@ -32,9 +33,6 @@ android {
  buildFeatures {
  compose true
  }
- composeOptions {
- kotlinCompilerExtensionVersion rootProject.ext.kotlinCompilerExtensionVersion
- }
 }
 
 dependencies {

gradle/libraries.versions.toml → gradle/libs.versions.toml

@@ -1,77 +1,79 @@
 [versions]
-androidxCore = "1.12.0"
-androidx-lifecycle-runtime-ktx = "2.7.0"
-androidx-lifecycle-viewmodel-ktx = "2.7.0"
-lifecycleViewModelCompose = "2.7.0"
-lifecycelRuntimeCompose = "2.7.0"
-compose = "1.6.2"
+androidxCore = "1.13.1"
+androidx-lifecycle-runtime-ktx = "2.8.2"
+androidx-lifecycle-viewmodel-ktx = "2.8.2"
+detektGradlePlugin = "1.23.6"
+lifecycleViewModelCompose = "2.8.2"
+lifecycelRuntimeCompose = "2.8.2"
+compose = "1.6.8"
 composeConstraintLayout = "1.1.0-alpha13"
-composeActivity = "1.8.2"
+composeActivity = "1.9.0"
 composeNavigation = "2.7.7"
-material = "1.11.0"
-composeMaterial3 = "1.2.0"
-material3WindowSizeClass = "1.1.2"
+material = "1.12.0"
+composeMaterial3 = "1.2.1"
+material3WindowSizeClass = "1.2.1"
+orgJacocoCore = "0.8.12"
 splash = "1.0.1"
 immutableCollections = "0.3.7"
-accompanist = "0.32.0"
-datastorePreferences = "1.1.0-alpha06"
-hilt = "2.51"
+accompanist = "0.34.0"
+datastorePreferences = "1.1.1"
+hilt = "2.51.1"
 hiltNavigation = "1.2.0"
 biometricKtx = "1.2.0-alpha05"
-coilCompose = "2.5.0"
-kotlinxSerialization = "1.6.2"
+coilCompose = "2.6.0"
+kotlinxSerialization = "1.7.0"
 sargon = "1.0.16-1df72e17"
-okhttpBom = "5.0.0-alpha.11"
-retrofit = "2.9.0"
+okhttpBom = "5.0.0-alpha.14"
+retrofit = "2.11.0"
 retrofitKoltinxConverter = "1.0.0"
 timber = "5.0.1"
 barcode = "17.2.0"
-cameraCore = "1.4.0-alpha02"
-camera2 = "1.4.0-alpha02"
-cameraLifecycle = "1.4.0-alpha02"
-cameraView = "1.4.0-alpha02"
+cameraCore = "1.4.0-beta02"
+camera2 = "1.4.0-beta02"
+cameraLifecycle = "1.4.0-beta02"
+cameraView = "1.4.0-beta02"
 rootCheck = "0.1.0"
 room = "2.6.1"
 junit = "4.13.2"
-mockk = "1.13.9"
+mockk = "1.13.11"
 coroutinesTest = "1.7.3"
-mockitoKotlin = "5.1.0"
+mockitoKotlin = "5.3.1"
 mockitoInline = "5.2.0"
 androidXJunit = "1.1.5"
-kotlinTestJunit = "1.9.22"
+kotlinTestJunit = "2.0.0"
 espresso = "3.5.1"
-composeUiTestJunit = "1.6.2"
-composeUiTooling = "1.6.2"
-ktor = "2.3.6"
-slf4j = "2.0.9"
-turbine = "1.0.0"
-zxing = "3.5.2"
-apacheCommonsValidator = "1.7"
+composeUiTestJunit = "1.6.8"
+composeUiTooling = "1.6.8"
+ktor = "2.3.11"
+slf4j = "2.0.13"
+turbine = "1.1.0"
+zxing = "3.5.3"
+apacheCommonsValidator = "1.9.0"
 jsonAssert = "1.5.1"
-firebaseCrashlytics = "18.5.1"
-appsFlyer = "6.13.0"
+firebaseCrashlytics = "19.0.1"
+appsFlyer = "6.14.2"
 installReferrer = "2.2"
-playServicesAuth = "21.1.1"
+playServicesAuth = "21.2.0"
 googleApiClient = "2.3.0"
 googleApiServicesDrive = "v3-rev20240123-2.0.0"
 workManagerRuntimeKtx = "2.9.0"
 androidXHiltWorker = "1.2.0"
-
-androidApplicationPlugin = "8.2.2"
-androidLibraryPlugin = "8.2.2"
-kotlinAndroidPlugin = "1.9.22"
-kotlinSerializationPlugin = "1.9.22"
-kotlinJvmPlugin = "1.9.22"
+androidApplicationPlugin = "8.5.0"
+androidLibraryPlugin = "8.5.0"
+kotlinSerializationPlugin = "2.0.0"
+kotlinJvmPlugin = "2.0.0"
 benManesVersionsPlugin = "0.51.0"
 versionCatalogUpdatePlugin = "0.8.4"
-googleServicesPlugin = "4.4.1"
-firebaseCrashlyticsPlugin = "2.9.9"
-hiltPlugin = "2.50"
-sonarqubePlugin = "4.4.1.3373"
-kspPlugin = "1.9.22-1.0.17"
+googleServicesPlugin = "4.4.2"
+firebaseCrashlyticsPlugin = "3.0.1"
+hiltPlugin = "2.51.1"
+sonarqubePlugin = "5.0.0.4638"
+kspPlugin = "2.0.0-1.0.22"
+kotlin = "2.0.0"
 
 [libraries]
 androidxCore = { module = "androidx.core:core-ktx", version.ref = "androidxCore" }
+detektGradlePlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detektGradlePlugin" }
 lifecycleRuntimeKtx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle-runtime-ktx" }
 lifecycleViewmodelKtx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-viewmodel-ktx" }
 lifecycleViewModelCompose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycleViewModelCompose" }
@@ -87,6 +89,7 @@ material = { module = "com.google.android.material:material", version.ref = "mat
 composeMaterial = { module = "androidx.compose.material:material", version.ref = "compose" }
 composeMaterial3 = { module = "androidx.compose.material3:material3", version.ref = "composeMaterial3" }
 material3WindowSizeClass = { module = "androidx.compose.material3:material3-window-size-class", version.ref = "material3WindowSizeClass" }
+orgJacocoCore = { module = "org.jacoco:org.jacoco.core", version.ref = "orgJacocoCore" }
 splash = { module = "androidx.core:core-splashscreen", version.ref = "splash" }
 immutableCollections = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "immutableCollections" }
 accompanistPagerIndicators = { module = "com.google.accompanist:accompanist-pager-indicators", version.ref = "accompanist" }
@@ -151,13 +154,13 @@ playServicesAuth = { module = "com.google.android.gms:play-services-auth", versi
 googleApiClient = { module = "com.google.api-client:google-api-client-android", version.ref = "googleApiClient" }
 googleApiServicesDrive = { module = "com.google.apis:google-api-services-drive", version.ref = "googleApiServicesDrive" }
 workManagerRuntimeKtx = { module = "androidx.work:work-runtime-ktx", version.ref = "workManagerRuntimeKtx" }
-androidXHiltWorker= { module = "androidx.hilt:hilt-work", version.ref = "androidXHiltWorker" }
-androidXHiltCompiler= { module = "androidx.hilt:hilt-compiler", version.ref = "androidXHiltWorker" }
+androidXHiltWorker = { module = "androidx.hilt:hilt-work", version.ref = "androidXHiltWorker" }
+androidXHiltCompiler = { module = "androidx.hilt:hilt-compiler", version.ref = "androidXHiltWorker" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidApplicationPlugin" }
 android-library = { id = "com.android.library", version.ref = "androidLibraryPlugin" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinAndroidPlugin" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlinSerializationPlugin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlinJvmPlugin" }
 ben-manes-versions = { id = "com.github.ben-manes.versions", version.ref = "benManesVersionsPlugin" }
@@ -166,4 +169,5 @@ google-services = { id = "com.google.gms.google-services", version.ref = "google
 firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebaseCrashlyticsPlugin" }
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "hiltPlugin" }
 sonarqube = { id = "org.sonarqube", version.ref = "sonarqubePlugin" }
-ksp = { id = "com.google.devtools.ksp", version.ref = "kspPlugin" }
+ksp = { id = "com.google.devtools.ksp", version.ref = "kspPlugin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Feb 05 11:22:31 CET 2024
+#Wed Jun 19 16:29:17 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

profile/src/main/java/rdx/works/profile/cloudbackup/data/DriveClient.kt

@@ -9,9 +9,6 @@ import com.radixdlt.sargon.extensions.toJson
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.withContext
-import okhttp3.internal.http.HTTP_FORBIDDEN
-import okhttp3.internal.http.HTTP_NOT_FOUND
-import okhttp3.internal.http.HTTP_UNAUTHORIZED
 import rdx.works.core.domain.cloudbackup.GoogleDriveFileId
 import rdx.works.core.domain.cloudbackup.LastCloudBackupEvent
 import rdx.works.core.mapError
@@ -25,6 +22,9 @@ import rdx.works.profile.domain.backup.CloudBackupFileEntity
 import rdx.works.profile.domain.backup.toCloudBackupProperties
 import timber.log.Timber
 import java.io.ByteArrayOutputStream
+import java.net.HttpURLConnection.HTTP_FORBIDDEN
+import java.net.HttpURLConnection.HTTP_NOT_FOUND
+import java.net.HttpURLConnection.HTTP_UNAUTHORIZED
 import javax.inject.Inject
 
 interface DriveClient {

settings.gradle

@@ -21,11 +21,6 @@ dependencyResolutionManagement {
  }
  maven { url 'https://jitpack.io' }
  }
- versionCatalogs {
- create("libs") {
- from(files("./gradle/libraries.versions.toml"))
- }
- }
 }
 rootProject.name = "BabylonWallet"
 include ':app'