diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 8e2dfa8a..9b8a3346 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -265,6 +265,8 @@ if (firebaseTestLabKeyPath.isNotBlank()) { mapOf("model" to "Nexus6", "version" to minSdkVersion), mapOf("model" to "Pixel2", "version" to targetSdkVersion) ) + + flankVersion.set(libs.versions.flank.get()) } } } diff --git a/build.gradle.kts b/build.gradle.kts index d3e47052..5cdea438 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -84,6 +84,8 @@ if (firebaseTestLabKeyPath.isNotBlank()) { } else { useOrchestrator.set(false) } + + flankVersion.set(libs.versions.flank.get()) } } diff --git a/gradle.properties b/gradle.properties index 8b524633..c897cd24 100644 --- a/gradle.properties +++ b/gradle.properties @@ -64,11 +64,12 @@ ANDROID_NDK_VERSION=23.0.7599858 ANDROID_GRADLE_PLUGIN_VERSION=7.1.2 DETEKT_VERSION=1.19.0 -FULLADLE_VERSION_MATCHER=0.17.3 +FLANK_VERSION=22.03.0 +FULLADLE_VERSION=0.17.3 GRADLE_VERSIONS_PLUGIN_VERSION=0.39.0 KTLINT_VERSION=0.45.1 JGIT_VERSION=6.1.0.202203080745-r -PLAY_PUBLISHER_PLUGIN_VERSION_MATCHER=3.7.0 +PLAY_PUBLISHER_PLUGIN_VERSION=3.7.0 ANDROIDX_ACTIVITY_VERSION=1.4.0 ANDROIDX_ANNOTATION_VERSION=1.3.0 diff --git a/settings.gradle.kts b/settings.gradle.kts index 8843e79f..2f1ee667 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -33,10 +33,10 @@ pluginManagement { plugins { val androidGradlePluginVersion = extra["ANDROID_GRADLE_PLUGIN_VERSION"].toString() val detektVersion = extra["DETEKT_VERSION"].toString() - val fulladleVersion = extra["FULLADLE_VERSION_MATCHER"].toString() + val fulladleVersion = extra["FULLADLE_VERSION"].toString() val gradleVersionsPluginVersion = extra["GRADLE_VERSIONS_PLUGIN_VERSION"].toString() val kotlinVersion = extra["KOTLIN_VERSION"].toString() - val playPublisherVersion = extra["PLAY_PUBLISHER_PLUGIN_VERSION_MATCHER"].toString() + val playPublisherVersion = extra["PLAY_PUBLISHER_PLUGIN_VERSION"].toString() id("com.android.application") version (androidGradlePluginVersion) apply (false) id("com.android.library") version (androidGradlePluginVersion) apply (false) @@ -109,6 +109,7 @@ dependencyResolutionManagement { val androidxUiAutomatorVersion = extra["ANDROIDX_UI_AUTOMATOR_VERSION"].toString() val androidxWorkManagerVersion = extra["ANDROIDX_WORK_MANAGER_VERSION"].toString() val coreLibraryDesugaringVersion = extra["CORE_LIBRARY_DESUGARING_VERSION"].toString() + val flankVersion = extra["FLANK_VERSION"].toString() val jacocoVersion = extra["JACOCO_VERSION"].toString() val javaVersion = extra["ANDROID_JVM_TARGET"].toString() val kotlinVersion = extra["KOTLIN_VERSION"].toString() @@ -118,6 +119,7 @@ dependencyResolutionManagement { val zxingVersion = extra["ZXING_VERSION"].toString() // Standalone versions + version("flank", flankVersion) version("jacoco", jacocoVersion) version("java", javaVersion)