Fix displaying recipe ingredient note twice (#197)

* Update README.md

* Bump version to 35

* Cleanup dependencies

* Bump versions of dependencies

* Save isFood/disableAmount flags to db

* Fix displaying ingredient note twice

* Remove whitespace after note is extracted
This commit is contained in:
Kirill Kamakin
2024-01-14 11:44:21 +01:00
committed by GitHub
parent c8f1f477cc
commit 7c02a8341d
17 changed files with 100 additions and 119 deletions

View File

@@ -1,50 +1,40 @@
[versions]
# https://maven.google.com/web/index.html?q=com.android.tools.build#com.android.tools.build:gradle
androidGradlePlugin = "8.1.2"
androidGradlePlugin = "8.2.1"
# https://github.com/JetBrains/kotlin/releases
kotlin = "1.9.10"
# https://developer.android.com/jetpack/androidx/releases/navigation
googleNavigation = "2.7.4"
kotlin = "1.9.22"
# https://dagger.dev/hilt/gradle-setup
hilt = "2.48.1"
hilt = "2.50"
# https://github.com/protocolbuffers/protobuf/releases
protobuf = "3.24.4"
protobuf = "3.25.2"
# https://github.com/google/protobuf-gradle-plugin/releases
protobufPlugin = "0.9.4"
# https://plugins.gradle.org/plugin/org.sonarqube
sonarqube = "4.4.1.3373"
# https://plugins.gradle.org/plugin/com.guardsquare.appsweep
appsweep = "1.5.2"
appsweep = "1.5.6"
# https://github.com/material-components/material-components-android/releases
material = "1.10.0"
material = "1.11.0"
# https://developer.android.com/kotlin/ktx#core
coreKtx = "1.12.0"
# https://developer.android.com/jetpack/androidx/releases/appcompat
appcompat = "1.6.1"
# https://developer.android.com/jetpack/androidx/releases/constraintlayout
contraintLayout = "2.1.4"
# https://developer.android.com/jetpack/androidx/releases/swiperefreshlayout
swipeRefreshLayout = "1.1.0"
# https://developer.android.com/jetpack/androidx/releases/core
splashScreen = "1.0.1"
# https://developer.android.com/jetpack/androidx/releases/lifecycle
lifecycle = "2.6.2"
lifecycle = "2.7.0"
# https://developer.android.com/jetpack/androidx/releases/arch-core
coreTesting = "2.2.0"
# https://github.com/Kotlin/kotlinx.serialization/releases
kotlinxSerialization = "1.6.0"
kotlinxSerialization = "1.6.2"
# https://github.com/square/okhttp/tags
okhttp = "4.12.0"
# https://developer.android.com/jetpack/androidx/releases/paging
paging = "3.2.1"
# https://developer.android.com/jetpack/androidx/releases/room
room = "2.6.0"
room = "2.6.1"
# https://github.com/Kotlin/kotlinx-datetime/releases
kotlinxDatetime = "0.4.0"
# https://github.com/bumptech/glide/releases
glide = "4.16.0"
# https://github.com/androidbroadcast/ViewBindingPropertyDelegate/releases
viewBindingDelegate = "1.5.9"
kotlinxDatetime = "0.5.0"
# https://developer.android.com/jetpack/androidx/releases/datastore
datastore = "1.0.0"
# https://developer.android.com/jetpack/androidx/releases/security
@@ -54,19 +44,19 @@ junit = "4.13.2"
# https://github.com/Kotlin/kotlinx.coroutines/releases
coroutines = "1.7.3"
# https://github.com/robolectric/robolectric/releases
robolectric = "4.11"
robolectric = "4.11.1"
# https://mvnrepository.com/artifact/com.google.truth/truth
truth = "1.1.5"
truth = "1.2.0"
# https://mockk.io/
mockk = "1.13.8"
mockk = "1.13.9"
# https://github.com/square/leakcanary/releases
leakcanary = "2.12"
leakcanary = "2.13"
# https://github.com/ChuckerTeam/chucker/releases
chucker = "4.0.0"
# https://github.com/google/desugar_jdk_libs/blob/master/CHANGELOG.md
desugar = "2.0.3"
desugar = "2.0.4"
# https://github.com/google/ksp/releases
kspPlugin = "1.9.10-1.0.13"
kspPlugin = "1.9.22-1.0.16"
# https://developer.android.com/jetpack/androidx/releases/sharetarget
shareTarget = "1.2.0"
# https://github.com/KasperskyLab/Kaspresso/releases
@@ -80,17 +70,17 @@ junitKtx = "1.1.5"
# https://mvnrepository.com/artifact/androidx.compose/compose-bom
composeBom = "2023.10.01"
# https://developer.android.com/jetpack/androidx/releases/compose-kotlin
composeKotlinCompilerExtension = "1.5.3"
composeKotlinCompilerExtension = "1.5.8"
# https://google.github.io/accompanist/
accompanistVersion = "0.32.0"
# https://developer.android.com/jetpack/androidx/releases/compose-material
materialCompose = "1.5.4"
# https://github.com/raamcosta/compose-destinations
composeDestinations = "1.9.54"
# https://github.com/raamcosta/compose-destinations/releases
composeDestinations = "1.9.59"
# https://developer.android.com/jetpack/androidx/releases/hilt
androidxHilt = "1.1.0"
# https://github.com/ktorio/ktor/releases
ktor = "2.3.5"
ktor = "2.3.7"
# https://github.com/coil-kt/coil/releases
coil = "2.5.0"
@@ -135,15 +125,8 @@ jetbrains-kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-
jetbrains-kotlinx-coroutinesAndroid = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" }
jetbrains-kotlinx-coroutinesTest = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
androidx-navigation-safeArgsPlugin = { group = "androidx.navigation", name = "navigation-safe-args-gradle-plugin", version.ref = "googleNavigation" }
androidx-navigation-fragmentKtx = { group = "androidx.navigation", name = "navigation-fragment-ktx", version.ref = "googleNavigation" }
androidx-navigation-runtimeKtx = { group = "androidx.navigation", name = "navigation-runtime-ktx", version.ref = "googleNavigation" }
androidx-navigation-uiKtx = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "googleNavigation" }
androidx-coreKtx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
androidx-constraintLayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "contraintLayout" }
androidx-swipeRefreshLayout = { group = "androidx.swiperefreshlayout", name = "swiperefreshlayout", version.ref = "swipeRefreshLayout" }
androidx-splashScreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "splashScreen" }
androidx-coreTesting = { group = "androidx.arch.core", name = "core-testing", version.ref = "coreTesting" }
androidx-shareTarget = { group = "androidx.sharetarget", name = "sharetarget", version.ref = "shareTarget" }
@@ -152,7 +135,6 @@ androidx-paging-runtimeKtx = { group = "androidx.paging", name = "paging-runtime
androidx-paging-commonKtx = { group = "androidx.paging", name = "paging-common-ktx", version.ref = "paging" }
androidx-paging-compose = { group = "androidx.paging", name = "paging-compose", version.ref = "paging" }
androidx-lifecycle-livedataKtx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "lifecycle" }
androidx-lifecycle-viewmodelKtx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
androidx-lifecycle-viewmodelCompose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycle" }
@@ -180,13 +162,6 @@ okhttp3-okhttp = { group = "com.squareup.okhttp3", name = "okhttp" }
okhttp3-loggingInterceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor" }
okhttp3-mockwebserver = { group = "com.squareup.okhttp3", name = "mockwebserver", version.ref = "okhttp" }
bumptech-glide-glide = { group = "com.github.bumptech.glide", name = "glide", version.ref = "glide" }
bumptech-glide-okhttp3 = { group = "com.github.bumptech.glide", name = "okhttp3-integration", version.ref = "glide" }
bumptech-glide-recyclerview = { group = "com.github.bumptech.glide", name = "recyclerview-integration", version.ref = "glide" }
bumptech-glide-ksp = { group = "com.github.bumptech.glide", name = "ksp", version.ref = "glide" }
kirich1409-viewBinding = { group = "com.github.kirich1409", name = "viewbindingpropertydelegate-noreflection", version.ref = "viewBindingDelegate" }
junit = { group = "junit", name = "junit", version.ref = "junit" }
robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" }