From d4bfa8e6604c9c73481b4e8ed18a5c457496aefd Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 6 Jul 2022 21:29:23 +0530 Subject: gradle: reformat version catalog --- gradle/libs.versions.toml | 49 ++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2690aaa1..819d7883 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,7 @@ [versions] agp = "7.2.1" androidx_activity = "1.5.0-rc01" +bouncycastle = "1.71" compose = "1.2.0-alpha08" coroutines = "1.6.3" flowbinding = "1.2.0" @@ -9,9 +10,6 @@ kotlin = "1.7.0" leakcanary = "2.9.1" lifecycle = "2.5.0-rc01" -[plugins] -hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } - [libraries] android-desugarJdkLibs = "com.android.tools:desugar_jdk_libs:1.1.5" androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx_activity" } @@ -34,10 +32,8 @@ androidx-recyclerview = "androidx.recyclerview:recyclerview:1.3.0-alpha02" androidx-recyclerviewSelection = "androidx.recyclerview:recyclerview-selection:1.2.0-alpha01" androidx-security = "androidx.security:security-crypto:1.1.0-alpha03" androidx-swiperefreshlayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01" - aps-sublimeFuzzy = "com.github.android-password-store:sublime-fuzzy:2.2.0" aps-zxingAndroidEmbedded = "com.github.android-password-store:zxing-android-embedded:4.2.1" - build-agp = { module = "com.android.tools.build:gradle", version.ref = "agp" } build-binarycompat = "org.jetbrains.kotlinx:binary-compatibility-validator:0.10.1" build-download = "de.undercouch:gradle-download-task:5.1.0" @@ -49,11 +45,6 @@ build-sentry = "io.sentry.android.gradle:io.sentry.android.gradle.gradle.plugin: build-spotless = "com.diffplug.spotless:spotless-plugin-gradle:6.8.0" build-vcu = "nl.littlerobots.version-catalog-update:nl.littlerobots.version-catalog-update.gradle.plugin:0.5.1" build-versions = "com.github.ben-manes:gradle-versions-plugin:0.42.0" - -dagger-hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" } -dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" } -dagger-hilt-core = { module = "com.google.dagger:hilt-core", version.ref = "hilt" } - compose-animation = { module = "androidx.compose.animation:animation", version.ref = "compose" } compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "compose" } compose-foundation-core = { module = "androidx.compose.foundation:foundation", version.ref = "compose" } @@ -67,37 +58,47 @@ compose-ui-test = { module = "androidx.compose.ui:ui-test-junit4", version.ref = compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" } compose-ui-util = { module = "androidx.compose.ui:ui-util", version.ref = "compose" } compose-ui-viewbinding = { module = "androidx.compose.ui:ui-viewbinding", version.ref = "compose" } - +dagger-hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" } +dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" } +dagger-hilt-core = { module = "com.google.dagger:hilt-core", version.ref = "hilt" } kotlin-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" } kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } - -thirdparty-bouncycastle-bcprov = "org.bouncycastle:bcprov-jdk15to18:1.71" -thirdparty-bouncycastle-bcpkix = "org.bouncycastle:bcpkix-jdk15to18:1.71" +testing-junit = "junit:junit:4.13.2" +testing-kotlintest-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } +testing-robolectric = "org.robolectric:robolectric:4.8.1" +testing-sharedPrefsMock = "com.github.android-password-store:shared-preferences-fake:2.0.0" +testing-turbine = "app.cash.turbine:turbine:0.8.0" +thirdparty-bouncycastle-bcpkix = { module = "org.bouncycastle:bcpkix-jdk15to18", version.ref = "bouncycastle" } +thirdparty-bouncycastle-bcprov = { module = "org.bouncycastle:bcprov-jdk15to18", version.ref = "bouncycastle" } thirdparty-commons_codec = "commons-codec:commons-codec:1.14" thirdparty-eddsa = "net.i2p.crypto:eddsa:0.3.0" thirdparty-fastscroll = "me.zhanghai.android.fastscroll:library:1.1.8" thirdparty-flowbinding-android = { module = "io.github.reactivecircus.flowbinding:flowbinding-android", version.ref = "flowbinding" } thirdparty-jgit = "org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r" thirdparty-kotlinResult = "com.michael-bull.kotlin-result:kotlin-result:1.1.16" -thirdparty-leakcanary = { module = "com.squareup.leakcanary:leakcanary-android-startup", version.ref="leakcanary" } -thirdparty-plumber = { module = "com.squareup.leakcanary:plumber-android-startup", version.ref="leakcanary" } +thirdparty-leakcanary = { module = "com.squareup.leakcanary:leakcanary-android-startup", version.ref = "leakcanary" } thirdparty-logcat = "com.squareup.logcat:logcat:0.1" thirdparty-modernAndroidPrefs = "de.maxr1998:modernandroidpreferences:2.3.1" thirdparty-nonfree-googlePlayAuthApiPhone = "com.google.android.gms:play-services-auth-api-phone:18.0.1" thirdparty-nonfree-sentry = "io.sentry:sentry-android:6.1.4" thirdparty-pgpainless = "org.pgpainless:pgpainless-core:1.3.1" +thirdparty-plumber = { module = "com.squareup.leakcanary:plumber-android-startup", version.ref = "leakcanary" } thirdparty-sshauth = "com.github.open-keychain.open-keychain:sshauthentication-api:5.7.5" # TODO: Remove the explicit bcpkix dependency when upgrading this to a BC 1.71 compatible version thirdparty-sshj = "com.hierynomus:sshj:0.33.0" thirdparty-whatthestack = "com.github.haroldadmin:WhatTheStack:0.3.1" -testing-junit = "junit:junit:4.13.2" -testing-kotlintest-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } -testing-robolectric = "org.robolectric:robolectric:4.8.1" -testing-sharedPrefsMock = "com.github.android-password-store:shared-preferences-fake:2.0.0" -testing-turbine = "app.cash.turbine:turbine:0.8.0" - [bundles] -androidxLifecycle = ["androidx-lifecycle-common", "androidx-lifecycle-livedataKtx", "androidx-lifecycle-viewmodelKtx"] -testDependencies = ["testing-junit", "testing-kotlintest-junit"] +androidxLifecycle = [ + "androidx-lifecycle-common", + "androidx-lifecycle-livedataKtx", + "androidx-lifecycle-viewmodelKtx", +] +testDependencies = [ + "testing-junit", + "testing-kotlintest-junit", +] + +[plugins] +hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } -- cgit v1.2.3