From c965020ade9f53befdaeb48e5560cced8bbb1348 Mon Sep 17 00:00:00 2001 From: MohitMaliFtechiz Date: Thu, 16 Mar 2023 18:48:18 +0530 Subject: [PATCH] Upgraded android gradle version to 8.0 --- buildSrc/build.gradle.kts | 4 ++-- buildSrc/src/main/kotlin/Versions.kt | 2 +- buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- jacoco.gradle | 2 +- lintConfig.xml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 4f1a3fdd6..991e12ecc 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -11,9 +11,9 @@ repositories { } dependencies { - implementation("com.android.tools.build:gradle:7.3.1") + implementation("com.android.tools.build:gradle:7.4.2") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0") - implementation("com.dicedmelon.gradle:jacoco-android:0.1.5") + implementation("org.jacoco:org.jacoco.core:0.8.8") implementation("org.jlleitschuh.gradle:ktlint-gradle:10.3.0") implementation("com.google.apis:google-api-services-androidpublisher:v3-rev129-1.25.0") implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.20.0") diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 7d59b469a..b19dcf2ce 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -46,7 +46,7 @@ object Versions { const val android_arch_lifecycle_extensions: String = "1.1.1" - const val com_android_tools_build_gradle: String = "7.3.1" + const val com_android_tools_build_gradle: String = "7.4.2" const val de_fayard_buildsrcversions_gradle_plugin: String = "0.7.0" diff --git a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt index 379751630..69f8cd400 100644 --- a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt +++ b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt @@ -36,7 +36,7 @@ class AllProjectConfigurer { target.plugins.apply("kotlin-android") target.plugins.apply("kotlin-kapt") target.plugins.apply("kotlin-parcelize") - target.plugins.apply("com.dicedmelon.gradle.jacoco-android") + target.plugins.apply("jacoco") target.plugins.apply("org.jlleitschuh.gradle.ktlint") target.plugins.apply("io.gitlab.arturbosch.detekt") target.plugins.apply("androidx.navigation.safeargs") @@ -141,7 +141,7 @@ class AllProjectConfigurer { resolutionStrategy { eachDependency { if ("org.jacoco" == this.requested.group) { - useVersion("0.8.7") + useVersion("0.8.8") } } } @@ -150,7 +150,7 @@ class AllProjectConfigurer { fun configurePlugins(target: Project) { target.run { - configureExtension { toolVersion = "0.8.7" } + configureExtension { toolVersion = "0.8.8" } configureExtension { android.set(true) } configureExtension { buildUponDefaultConfig = true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 10926f61a..3ba89c3ec 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Dec 19 16:13:45 IST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/jacoco.gradle b/jacoco.gradle index 22130a022..ae2588e10 100644 --- a/jacoco.gradle +++ b/jacoco.gradle @@ -19,7 +19,7 @@ apply plugin: 'jacoco' jacoco { - toolVersion = "0.8.7" + toolVersion = "0.8.8" } tasks.withType(Test) { diff --git a/lintConfig.xml b/lintConfig.xml index bfd6f433b..ab038e334 100644 --- a/lintConfig.xml +++ b/lintConfig.xml @@ -34,7 +34,7 @@ - +