From 1c0b7125e894a65235cf880c27ea9082f812b5a2 Mon Sep 17 00:00:00 2001 From: Evgeny Dubravin Date: Fri, 22 Mar 2024 20:25:18 +0700 Subject: [PATCH] =?UTF-8?q?feature=20TI-186:=20[Android]=20=D0=9D=D0=B0?= =?UTF-8?q?=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B0=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buildSrc/src/main/kotlin/VersionCatalogLibraries.kt | 10 ++++++++++ buildSrc/src/main/kotlin/VersionCatalogVersions.kt | 7 +++++++ buildSrc/src/main/kotlin/plugins/AndroidAppPlugin.kt | 3 +++ gradle/libs.versions.toml | 3 +++ 4 files changed, 23 insertions(+) create mode 100644 buildSrc/src/main/kotlin/VersionCatalogLibraries.kt create mode 100644 buildSrc/src/main/kotlin/VersionCatalogVersions.kt diff --git a/buildSrc/src/main/kotlin/VersionCatalogLibraries.kt b/buildSrc/src/main/kotlin/VersionCatalogLibraries.kt new file mode 100644 index 0000000..28aea6c --- /dev/null +++ b/buildSrc/src/main/kotlin/VersionCatalogLibraries.kt @@ -0,0 +1,10 @@ +import org.gradle.api.artifacts.MinimalExternalModuleDependency +import org.gradle.api.artifacts.VersionCatalog +import org.gradle.api.provider.Provider + +internal val VersionCatalog.stdlib: Provider + get() = getLibrary("stdLib") + + +private fun VersionCatalog.getLibrary(library: String) = findLibrary(library).get() + diff --git a/buildSrc/src/main/kotlin/VersionCatalogVersions.kt b/buildSrc/src/main/kotlin/VersionCatalogVersions.kt new file mode 100644 index 0000000..10b179f --- /dev/null +++ b/buildSrc/src/main/kotlin/VersionCatalogVersions.kt @@ -0,0 +1,7 @@ +import org.gradle.api.artifacts.VersionCatalog + +val VersionCatalog.sdkCompile: String + get() = findVersion("compileSdk").get().requiredVersion + +val VersionCatalog.sdkMin: String + get() = findVersion("minSdk").get().requiredVersion diff --git a/buildSrc/src/main/kotlin/plugins/AndroidAppPlugin.kt b/buildSrc/src/main/kotlin/plugins/AndroidAppPlugin.kt index 7c2d004..5cb825e 100644 --- a/buildSrc/src/main/kotlin/plugins/AndroidAppPlugin.kt +++ b/buildSrc/src/main/kotlin/plugins/AndroidAppPlugin.kt @@ -2,6 +2,9 @@ package plugins import versioncatalog.androidApplicationPlugin import org.gradle.api.Project +import org.gradle.api.artifacts.VersionCatalog +import org.gradle.api.artifacts.VersionCatalogsExtension +import org.gradle.kotlin.dsl.getByType class AndroidAppPlugin : BaseAndroidPlugin() { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index def2a24..bd969af 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -150,6 +150,9 @@ groupie = { group = "com.github.lisawray.groupie", name = "groupie", version.ref groupie-viewbinding = { group = "com.github.lisawray.groupie", name = "groupie-viewbinding", version.ref = "groupie" } javapoet = { module = "com.squareup:javapoet", version = "javapoet" } +junit = { group = "junit", name = "junit", version.ref = "junit" } +androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext-junit" } +espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" } junit = { group = "junit", name = "junit", version.ref = "junit" } androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext-junit" }