From 88fbb06c4fe2c8150aeb3a70e794cb1ecafa6c0e Mon Sep 17 00:00:00 2001 From: Yash Khare Date: Tue, 25 Feb 2020 20:17:01 +0530 Subject: [PATCH] Fix #1804 Update gradle version --- app/build.gradle.kts | 1 - buildSrc/build.gradle.kts | 4 ++-- buildSrc/src/main/kotlin/Libs.kt | 2 +- buildSrc/src/main/kotlin/Versions.kt | 2 +- buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt | 2 +- custom/build.gradle.kts | 1 - gradle/wrapper/gradle-wrapper.properties | 2 +- jacoco.gradle | 9 ++++++--- 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index aea956a36..08110bb95 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -44,7 +44,6 @@ android { resValue("string", "app_search_string", "Search Kiwix") versionCode = generateVersionCode() versionName = generateVersionName() - ndkVersion = "21.0.6113669" } lintOptions { diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index f01ceba1e..caea9142d 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -11,9 +11,9 @@ repositories { } dependencies { - implementation("com.android.tools.build:gradle:3.6.0") + implementation("com.android.tools.build:gradle:3.5.3") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61") - implementation("com.dicedmelon.gradle:jacoco-android:0.1.4") + implementation("com.hiya:jacoco-android:0.2") implementation("org.jlleitschuh.gradle:ktlint-gradle:9.2.1") implementation("com.google.apis:google-api-services-androidpublisher:v3-rev129-1.25.0") implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.5.1") diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt index 838ef769a..527e5e000 100644 --- a/buildSrc/src/main/kotlin/Libs.kt +++ b/buildSrc/src/main/kotlin/Libs.kt @@ -263,7 +263,7 @@ object Libs { */ const val collection_ktx: String = "androidx.collection:collection-ktx:" + Versions.collection_ktx - const val jacoco_android: String = "com.dicedmelon.gradle:jacoco-android:" + + const val jacoco_android: String = "com.hiya:jacoco-android:" + Versions.jacoco_android /** diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 2f7ea3b22..e3f00f941 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -55,7 +55,7 @@ object Versions { const val collection_ktx: String = "1.1.0" - const val jacoco_android: String = "0.1.4" + const val jacoco_android: String = "0.2" const val junit_jupiter: String = "5.4.2" // available: "5.6.0" diff --git a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt index 44b649ea7..fbbe3b5b7 100644 --- a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt +++ b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt @@ -39,7 +39,7 @@ class AllProjectConfigurer { target.plugins.apply("kotlin-android") target.plugins.apply("kotlin-android-extensions") target.plugins.apply("kotlin-kapt") - target.plugins.apply("jacoco-android") + target.plugins.apply("com.hiya.jacoco-android") target.plugins.apply("org.jlleitschuh.gradle.ktlint") target.plugins.apply("io.gitlab.arturbosch.detekt") } diff --git a/custom/build.gradle.kts b/custom/build.gradle.kts index 21d135665..d30e8f6ae 100644 --- a/custom/build.gradle.kts +++ b/custom/build.gradle.kts @@ -17,7 +17,6 @@ plugins.apply(KiwixConfigurationPlugin::class) android { defaultConfig { applicationId = "org.kiwix" - ndkVersion = "21.0.6113669" } flavorDimensions("default") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 91e6cc95d..439df2ca0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip diff --git a/jacoco.gradle b/jacoco.gradle index 96a103288..492051d6d 100644 --- a/jacoco.gradle +++ b/jacoco.gradle @@ -51,10 +51,13 @@ task jacocoInstrumentationTestReport(type: JacocoReport, dependsOn: ['createDebu includes: ['jacoco/testDebugUnitTest.exec', 'outputs/code_coverage/debugAndroidTest/connected/**/*.ec']) } - sourceDirectories = files([javaSrc, kotlinSrc]) - classDirectories = files([javaClasses, kotlinClasses]) + //sourceDirectories = files([javaSrc, kotlinSrc]) + //classDirectories = files([javaClasses, kotlinClasses]) print execution - executionData = files(execution) + //executionData = files(execution) + sourceDirectories.from = files(javaSrc, kotlinSrc) + classDirectories.from = files(javaClasses, kotlinClasses) + executionData.from = files(execution) doLast() { print "file://${reports.html.destination}/index.html" }