From ac72e5cf5481d88c2d94b821c0d4d005494a8dc9 Mon Sep 17 00:00:00 2001 From: Jakub Porzuczek Date: Fri, 28 Jun 2024 09:31:42 +0200 Subject: [PATCH 1/3] Revert "Merge pull request #928 from radixdlt/chore/update-libraries" This reverts commit bc1e4e6655a8a890a6b5b69d6677ae45554a8c16, reversing changes made to d8729de5e95aad76028b062b93514b593daab149. --- app/build.gradle | 8 +- build.gradle | 14 ++- designsystem/build.gradle | 4 +- ....versions.toml => libraries.versions.toml} | 100 +++++++++--------- gradle/wrapper/gradle-wrapper.properties | 4 +- .../profile/cloudbackup/data/DriveClient.kt | 6 +- settings.gradle | 5 + 7 files changed, 75 insertions(+), 66 deletions(-) rename gradle/{libs.versions.toml => libraries.versions.toml} (84%) diff --git a/app/build.gradle b/app/build.gradle index 27cf731e6a..9d22448cc2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,4 @@ plugins { - alias libs.plugins.compose.compiler alias libs.plugins.android.application alias libs.plugins.kotlin.android alias libs.plugins.hilt @@ -146,6 +145,9 @@ android { buildFeatures { compose true } + composeOptions { + kotlinCompilerExtensionVersion rootProject.ext.kotlinCompilerExtensionVersion + } packagingOptions { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" @@ -177,10 +179,6 @@ sonarqube { } } -composeCompiler { - enableStrongSkippingMode = true -} - dependencies { implementation project(path: ':core') diff --git a/build.gradle b/build.gradle index 9e8b3694cc..c0ce1cab4e 100644 --- a/build.gradle +++ b/build.gradle @@ -6,14 +6,14 @@ buildscript { compileSdk = 34 targetSdk = 33 internalVersionName = "babylon" + kotlinCompilerExtensionVersion = "1.5.8" } dependencies { - classpath libs.detektGradlePlugin - classpath libs.orgJacocoCore + classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.5" + classpath "org.jacoco:org.jacoco.core:0.8.11" } }// 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,6 +27,14 @@ 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 { diff --git a/designsystem/build.gradle b/designsystem/build.gradle index e678e373cf..04b4daeec0 100644 --- a/designsystem/build.gradle +++ b/designsystem/build.gradle @@ -1,5 +1,4 @@ plugins { - alias libs.plugins.compose.compiler alias libs.plugins.android.library alias libs.plugins.kotlin.android } @@ -33,6 +32,9 @@ android { buildFeatures { compose true } + composeOptions { + kotlinCompilerExtensionVersion rootProject.ext.kotlinCompilerExtensionVersion + } } dependencies { diff --git a/gradle/libs.versions.toml b/gradle/libraries.versions.toml similarity index 84% rename from gradle/libs.versions.toml rename to gradle/libraries.versions.toml index f492ceed64..e0c955ee4b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libraries.versions.toml @@ -1,80 +1,78 @@ [versions] -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" +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" composeConstraintLayout = "1.1.0-alpha13" -composeActivity = "1.9.0" +composeActivity = "1.8.2" composeNavigation = "2.7.7" -material = "1.12.0" -composeMaterial3 = "1.2.1" -material3WindowSizeClass = "1.2.1" -orgJacocoCore = "0.8.12" +material = "1.11.0" +composeMaterial3 = "1.2.0" +material3WindowSizeClass = "1.1.2" splash = "1.0.1" immutableCollections = "0.3.7" -accompanist = "0.34.0" -datastorePreferences = "1.1.1" -hilt = "2.51.1" +accompanist = "0.32.0" +datastorePreferences = "1.1.0-alpha06" +hilt = "2.51" hiltNavigation = "1.2.0" biometricKtx = "1.2.0-alpha05" -coilCompose = "2.6.0" -kotlinxSerialization = "1.7.0" +coilCompose = "2.5.0" +kotlinxSerialization = "1.6.2" sargon = "1.0.15-b7ddec52" okhttpBom = "5.0.0-alpha.12" -retrofit = "2.11.0" +retrofit = "2.9.0" retrofitKoltinxConverter = "1.0.0" timber = "5.0.1" barcode = "17.2.0" -cameraCore = "1.4.0-beta02" -camera2 = "1.4.0-beta02" -cameraLifecycle = "1.4.0-beta02" -cameraView = "1.4.0-beta02" +cameraCore = "1.4.0-alpha02" +camera2 = "1.4.0-alpha02" +cameraLifecycle = "1.4.0-alpha02" +cameraView = "1.4.0-alpha02" rootCheck = "0.1.0" room = "2.6.1" junit = "4.13.2" -mockk = "1.13.11" +mockk = "1.13.9" coroutinesTest = "1.7.3" -mockitoKotlin = "5.3.1" +mockitoKotlin = "5.1.0" mockitoInline = "5.2.0" androidXJunit = "1.1.5" -kotlinTestJunit = "2.0.0" +kotlinTestJunit = "1.9.22" espresso = "3.5.1" espressoIntents = "3.5.1" -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" +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" jsonAssert = "1.5.1" -firebaseCrashlytics = "19.0.2" -appsFlyer = "6.14.2" +firebaseCrashlytics = "18.5.1" +appsFlyer = "6.13.0" installReferrer = "2.2" -playServicesAuth = "21.2.0" +playServicesAuth = "21.1.1" googleApiClient = "2.3.0" googleApiServicesDrive = "v3-rev20240123-2.0.0" workManagerRuntimeKtx = "2.9.0" androidXHiltWorker = "1.2.0" -androidApplicationPlugin = "8.5.0" -androidLibraryPlugin = "8.5.0" -kotlinSerializationPlugin = "2.0.0" -kotlinJvmPlugin = "2.0.0" + +androidApplicationPlugin = "8.2.2" +androidLibraryPlugin = "8.2.2" +kotlinAndroidPlugin = "1.9.22" +kotlinSerializationPlugin = "1.9.22" +kotlinJvmPlugin = "1.9.22" benManesVersionsPlugin = "0.51.0" versionCatalogUpdatePlugin = "0.8.4" -googleServicesPlugin = "4.4.2" -firebaseCrashlyticsPlugin = "3.0.2" -hiltPlugin = "2.51.1" -sonarqubePlugin = "5.0.0.4638" -kspPlugin = "2.0.0-1.0.22" -kotlin = "2.0.0" +googleServicesPlugin = "4.4.1" +firebaseCrashlyticsPlugin = "2.9.9" +hiltPlugin = "2.50" +sonarqubePlugin = "4.4.1.3373" +kspPlugin = "1.9.22-1.0.17" [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" } @@ -90,7 +88,6 @@ 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" } @@ -155,13 +152,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 = "kotlin" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinAndroidPlugin" } 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" } @@ -170,5 +167,4 @@ 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" } -compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } +ksp = { id = "com.google.devtools.ksp", version.ref = "kspPlugin" } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dac237ecff..452a152e8f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jun 19 16:29:17 CEST 2024 +#Mon Feb 05 11:22:31 CET 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/profile/src/main/java/rdx/works/profile/cloudbackup/data/DriveClient.kt b/profile/src/main/java/rdx/works/profile/cloudbackup/data/DriveClient.kt index 58b40c4b44..30253345c1 100644 --- a/profile/src/main/java/rdx/works/profile/cloudbackup/data/DriveClient.kt +++ b/profile/src/main/java/rdx/works/profile/cloudbackup/data/DriveClient.kt @@ -9,6 +9,9 @@ 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 @@ -22,9 +25,6 @@ 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 { diff --git a/settings.gradle b/settings.gradle index 595491e502..f2c70ccacd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -21,6 +21,11 @@ dependencyResolutionManagement { } maven { url 'https://jitpack.io' } } + versionCatalogs { + create("libs") { + from(files("./gradle/libraries.versions.toml")) + } + } } rootProject.name = "BabylonWallet" include ':app' From ce614db0fc164dc90a3548ce28a2a633293d136b Mon Sep 17 00:00:00 2001 From: Jakub Porzuczek Date: Fri, 28 Jun 2024 10:04:44 +0200 Subject: [PATCH 2/3] partial library update --- build.gradle | 8 --- ...aries.versions.toml => libs.versions.toml} | 54 +++++++++---------- settings.gradle | 5 -- 3 files changed, 27 insertions(+), 40 deletions(-) rename gradle/{libraries.versions.toml => libs.versions.toml} (93%) diff --git a/build.gradle b/build.gradle index c0ce1cab4e..e8c1f6ad28 100644 --- a/build.gradle +++ b/build.gradle @@ -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 { diff --git a/gradle/libraries.versions.toml b/gradle/libs.versions.toml similarity index 93% rename from gradle/libraries.versions.toml rename to gradle/libs.versions.toml index e0c955ee4b..156590d43e 100644 --- a/gradle/libraries.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -androidxCore = "1.12.0" +androidxCore = "1.13.1" androidx-lifecycle-runtime-ktx = "2.7.0" androidx-lifecycle-viewmodel-ktx = "2.7.0" lifecycleViewModelCompose = "2.7.0" @@ -13,46 +13,46 @@ composeMaterial3 = "1.2.0" material3WindowSizeClass = "1.1.2" 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" +coilCompose = "2.6.0" kotlinxSerialization = "1.6.2" sargon = "1.0.15-b7ddec52" okhttpBom = "5.0.0-alpha.12" -retrofit = "2.9.0" +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" +androidXJunit = "1.2.1" kotlinTestJunit = "1.9.22" -espresso = "3.5.1" -espressoIntents = "3.5.1" +espresso = "3.6.1" +espressoIntents = "3.6.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" +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.2" +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" @@ -65,10 +65,10 @@ kotlinSerializationPlugin = "1.9.22" kotlinJvmPlugin = "1.9.22" benManesVersionsPlugin = "0.51.0" versionCatalogUpdatePlugin = "0.8.4" -googleServicesPlugin = "4.4.1" -firebaseCrashlyticsPlugin = "2.9.9" -hiltPlugin = "2.50" -sonarqubePlugin = "4.4.1.3373" +googleServicesPlugin = "4.4.2" +firebaseCrashlyticsPlugin = "3.0.2" +hiltPlugin = "2.51.1" +sonarqubePlugin = "5.0.0.4638" kspPlugin = "1.9.22-1.0.17" [libraries] diff --git a/settings.gradle b/settings.gradle index f2c70ccacd..595491e502 100644 --- a/settings.gradle +++ b/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' From d56120a3716daf28cd157a95fe192ff2cf7c5e14 Mon Sep 17 00:00:00 2001 From: Jakub Porzuczek Date: Fri, 28 Jun 2024 10:19:15 +0200 Subject: [PATCH 3/3] update sargon version --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 156590d43e..83c4e5366c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,7 +20,7 @@ hiltNavigation = "1.2.0" biometricKtx = "1.2.0-alpha05" coilCompose = "2.6.0" kotlinxSerialization = "1.6.2" -sargon = "1.0.15-b7ddec52" +sargon = "1.0.19-adaddc1a" okhttpBom = "5.0.0-alpha.12" retrofit = "2.11.0" retrofitKoltinxConverter = "1.0.0"