kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-14 18:06:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1804 Update gradle version

Browse Source
This commit is contained in:
Yash Khare 2020-02-25 20:17:01 +05:30
parent 09c82179df
commit 88fbb06c4f
8 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.gradle.kts
View File

@ -44,7 +44,6 @@ android {
resValue("string", "app_search_string", "Search Kiwix") resValue("string", "app_search_string", "Search Kiwix")
versionCode = generateVersionCode() versionCode = generateVersionCode()
versionName = generateVersionName() versionName = generateVersionName()
ndkVersion = "21.0.6113669"
} }
lintOptions { lintOptions {

4
buildSrc/build.gradle.kts
View File

@ -11,9 +11,9 @@ repositories {
} }
dependencies { 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("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("org.jlleitschuh.gradle:ktlint-gradle:9.2.1")
implementation("com.google.apis:google-api-services-androidpublisher:v3-rev129-1.25.0") implementation("com.google.apis:google-api-services-androidpublisher:v3-rev129-1.25.0")
implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.5.1") implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.5.1")

2
buildSrc/src/main/kotlin/Libs.kt
View File

@ -263,7 +263,7 @@ object Libs {
*/ */
const val collection_ktx: String = "androidx.collection:collection-ktx:" + Versions.collection_ktx 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 Versions.jacoco_android
/** /**

2
buildSrc/src/main/kotlin/Versions.kt
View File

@ -55,7 +55,7 @@ object Versions {
const val collection_ktx: String = "1.1.0" 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" const val junit_jupiter: String = "5.4.2" // available: "5.6.0"

2
buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
View File

@ -39,7 +39,7 @@ class AllProjectConfigurer {
target.plugins.apply("kotlin-android") target.plugins.apply("kotlin-android")
target.plugins.apply("kotlin-android-extensions") target.plugins.apply("kotlin-android-extensions")
target.plugins.apply("kotlin-kapt") 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("org.jlleitschuh.gradle.ktlint")
target.plugins.apply("io.gitlab.arturbosch.detekt") target.plugins.apply("io.gitlab.arturbosch.detekt")
} }

1
custom/build.gradle.kts
View File

@ -17,7 +17,6 @@ plugins.apply(KiwixConfigurationPlugin::class)
android { android {
defaultConfig { defaultConfig {
applicationId = "org.kiwix" applicationId = "org.kiwix"
ndkVersion = "21.0.6113669"
} }
flavorDimensions("default") flavorDimensions("default")

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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

9
jacoco.gradle
View File

@ -51,10 +51,13 @@ task jacocoInstrumentationTestReport(type: JacocoReport, dependsOn: ['createDebu
includes: ['jacoco/testDebugUnitTest.exec', includes: ['jacoco/testDebugUnitTest.exec',
'outputs/code_coverage/debugAndroidTest/connected/**/*.ec']) 'outputs/code_coverage/debugAndroidTest/connected/**/*.ec'])
} }
sourceDirectories = files([javaSrc, kotlinSrc]) //sourceDirectories = files([javaSrc, kotlinSrc])
classDirectories = files([javaClasses, kotlinClasses]) //classDirectories = files([javaClasses, kotlinClasses])
print execution print execution
executionData = files(execution) //executionData = files(execution)
sourceDirectories.from = files(javaSrc, kotlinSrc)
classDirectories.from = files(javaClasses, kotlinClasses)
executionData.from = files(execution)
doLast() { doLast() {
print "file://${reports.html.destination}/index.html" print "file://${reports.html.destination}/index.html"
} }