From 564aa5533b41d9e732716817a1018e2eaee45589 Mon Sep 17 00:00:00 2001 From: AkYML Date: Mon, 24 Apr 2023 15:16:20 +0530 Subject: [PATCH] fix test core version conflict downgrade test core library --- build-logic/src/main/java/ytemplate/android/KotlinAndroid.kt | 2 +- gradle/libs.versions.toml | 4 ++-- renovate.json | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build-logic/src/main/java/ytemplate/android/KotlinAndroid.kt b/build-logic/src/main/java/ytemplate/android/KotlinAndroid.kt index 465861f..77b7e49 100644 --- a/build-logic/src/main/java/ytemplate/android/KotlinAndroid.kt +++ b/build-logic/src/main/java/ytemplate/android/KotlinAndroid.kt @@ -54,7 +54,7 @@ internal fun Project.configureKotlinAndroid( "-opt-in=kotlin.Experimental", ) - jvmTarget = JavaVersion.VERSION_11.toString() + jvmTarget = JavaVersion.VERSION_17.toString() } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5f04641..a341ede 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ androidGradlePlugin = "8.0.0" androidxComposeBom = "2023.04.01" androidxActivityCompose = "1.7.1" androidxAppCompat = "1.6.1" -androidxComposeCompiler = "1.4.4" +androidxComposeCompiler = "1.4.6" androidxCore = "1.10.0" androidxLifecycle = "2.6.1" androidxNavigation = "2.5.3" @@ -21,7 +21,7 @@ androidxEspresso = "3.5.1" androidxTestRules = "1.5.0" androidxTestRunner = "1.5.2" androidxTestMonitor = "1.6.1" -androidxTestCore = "1.5.0" +androidxTestCore = "1.4.0" androidxTestExt = "1.1.5" #hilt diff --git a/renovate.json b/renovate.json index 6b338aa..e151f40 100644 --- a/renovate.json +++ b/renovate.json @@ -4,7 +4,6 @@ "config:base" ], "baseBranches": [ - "feature/CM-1239-RenovateBotFix", "multi_module" ], "packageRules": [