From 43a5852113e3b743b26d1ef045f0c56a264fd19e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Rychnovsk=C3=BD?= Date: Mon, 22 Jul 2024 14:38:19 +0200 Subject: [PATCH] Improve org.jetbrains:markdown dependency (#1527) - Added Gradle sync issue to known issues --- README.md | 3 +++ build-conventions-secant/build.gradle.kts | 2 +- gradle.properties | 1 + settings.gradle.kts | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 14a3fe2e..f85d04c4 100644 --- a/README.md +++ b/README.md @@ -69,3 +69,6 @@ the project, these steps are not necessary.) 1. Adding the `espresso-contrib` dependency will cause builds to fail, due to conflicting classes. This is a [known issue](https://github.com/Electric-Coin-Company/zcash-android-wallet-sdk/issues/306) with the Zcash Android SDK. 1. Android Studio will warn about the Gradle checksum. This is a [known issue](https://github.com/gradle/gradle/issues/9361) and can be safely ignored. 1. During app first launch, the following exception starting with `AndroidKeysetManager: keyset not found, will generate a new one` is printed twice. This exception is not an error, and the code is not being invoked twice. +1. While syncing Gradle files, build error with `org.jetbrains:markdown` dependency locking might occur. It is a + filed [known issue](https://github.com/Electric-Coin-Company/zashi-android/issues/1526) that does not block building + the project. diff --git a/build-conventions-secant/build.gradle.kts b/build-conventions-secant/build.gradle.kts index a15d366d..11f14c44 100644 --- a/build-conventions-secant/build.gradle.kts +++ b/build-conventions-secant/build.gradle.kts @@ -52,7 +52,7 @@ dependencies { "org.jetbrains.kotlinx.kover:org.jetbrains.kotlinx.kover.gradle.plugin:" + rootProperties.getProperty("KOVER_VERSION") ) - implementation("org.jetbrains:markdown:0.7.3") + implementation("org.jetbrains:markdown:${rootProperties.getProperty("MARKDOWN_VERSION")}") } // A slightly gross way to use the root gradle.properties as the single source of truth for version numbers diff --git a/gradle.properties b/gradle.properties index a1ae9560..7f8b883d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -194,6 +194,7 @@ KOTLINX_DATETIME_VERSION=0.5.0 KOTLINX_IMMUTABLE_COLLECTIONS_VERSION=0.3.7 KOTLINX_SERIALIZABLE_JSON_VERSION=1.6.3 KOVER_VERSION=0.7.3 +MARKDOWN_VERSION=0.7.3 PLAY_APP_UPDATE_VERSION=2.1.0 PLAY_APP_UPDATE_KTX_VERSION=2.1.0 PLAY_PUBLISHER_API_VERSION=v3-rev20231030-2.0.0 diff --git a/settings.gradle.kts b/settings.gradle.kts index b724fd55..d61e6fa0 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -176,6 +176,7 @@ dependencyResolutionManagement { val kotlinxCoroutinesVersion = extra["KOTLINX_COROUTINES_VERSION"].toString() val kotlinxImmutableCollectionsVersion = extra["KOTLINX_IMMUTABLE_COLLECTIONS_VERSION"].toString() val kotlinxSerializableJsonVersion = extra["KOTLINX_SERIALIZABLE_JSON_VERSION"].toString() + val markdownVersion = extra["MARKDOWN_VERSION"].toString() val playAppUpdateVersion = extra["PLAY_APP_UPDATE_VERSION"].toString() val playAppUpdateKtxVersion = extra["PLAY_APP_UPDATE_KTX_VERSION"].toString() val zcashBip39Version = extra["ZCASH_BIP39_VERSION"].toString() @@ -231,6 +232,7 @@ dependencyResolutionManagement { library("kotlinx-datetime", "org.jetbrains.kotlinx:kotlinx-datetime:$kotlinxDateTimeVersion") library("kotlinx-immutable", "org.jetbrains.kotlinx:kotlinx-collections-immutable:$kotlinxImmutableCollectionsVersion") library("kotlinx-serializable-json", "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinxSerializableJsonVersion") + library("markdown", "org.jetbrains:markdown:$markdownVersion") library("play-update", "com.google.android.play:app-update:$playAppUpdateVersion") library("play-update-ktx", "com.google.android.play:app-update-ktx:$playAppUpdateKtxVersion") library("zcash-sdk", "cash.z.ecc.android:zcash-android-sdk:$zcashSdkVersion")