From d3c03325c9d1fc22b9af2d83aeecf17fd47d0232 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Tue, 2 Jan 2024 14:52:31 +0200 Subject: [PATCH] [Build] Properly setup the version of Apache commons-text dependency Versions of external libraries should be listed in version catalog, not directly in a build file --- gradle/libs.versions.toml | 1 + gradle/versions.properties | 1 + libraries/tools/abi-comparator/build.gradle.kts | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a424f5923eb..f168a0f60ba 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,6 +25,7 @@ junit-platform = "1.10.0" android-gradle-plugin = "7.1.3" android-tools = "30.3.1" gradle-node = "7.0.1" +commons-text="1.10.0" [libraries] dexMemberList = { module = "com.jakewharton.dex:dex-member-list", version.ref = "dexMemberList" } diff --git a/gradle/versions.properties b/gradle/versions.properties index f56a7b2233f..b1ec9a80e97 100644 --- a/gradle/versions.properties +++ b/gradle/versions.properties @@ -23,6 +23,7 @@ versions.stax2-api=4.2.1 versions.streamex=0.7.2 versions.trove4j=1.0.20200330 versions.lombok=1.18.16 +versions.commons-text=1.10.0 versions.android=2.3.1 versions.ant=1.10.7 diff --git a/libraries/tools/abi-comparator/build.gradle.kts b/libraries/tools/abi-comparator/build.gradle.kts index d86931df545..8fe959d8273 100644 --- a/libraries/tools/abi-comparator/build.gradle.kts +++ b/libraries/tools/abi-comparator/build.gradle.kts @@ -5,7 +5,7 @@ plugins { dependencies { implementation(commonDependency("org.jetbrains.intellij.deps:asm-all")) - implementation("org.apache.commons:commons-text:1.10.0") + implementation(commonDependency("org.apache.commons:commons-text")) implementation(project(":tools:kotlinp")) implementation(project(":kotlinx-metadata-jvm"))