kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-08-03 02:36:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

#2128 Upgrade Android Gradle Plugin to 4.0 - upgrade wrapper - explictly set ndk - upgrade AGP

Browse Source
This commit is contained in:
Sean Mac Gillicuddy 2020-06-12 14:05:19 +01:00
parent 4ab8dc8946
commit 875aee9373
6 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/coverage.yml vendored
View File

@ -29,6 +29,7 @@ jobs:
with: with:
api-level: ${{ matrix.api-level }} api-level: ${{ matrix.api-level }}
arch: x86_64 arch: x86_64
ndk: 21.1.6352462
script: bash contrib/instrumentation.sh script: bash contrib/instrumentation.sh
- name: Upload screenshot result - name: Upload screenshot result

1
.github/workflows/nightly.yml vendored
View File

@ -25,6 +25,7 @@ jobs:
with: with:
api-level: ${{ matrix.api-level }} api-level: ${{ matrix.api-level }}
arch: x86_64 arch: x86_64
ndk: 21.1.6352462
script: bash contrib/instrumentation_nightly.sh script: bash contrib/instrumentation_nightly.sh
- name: Upload screenshot result - name: Upload screenshot result

2
buildSrc/build.gradle.kts
View File

@ -11,7 +11,7 @@ repositories {
} }
dependencies { dependencies {
implementation("com.android.tools.build:gradle:3.5.3") implementation("com.android.tools.build:gradle:4.0.0")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
implementation("com.hiya:jacoco-android:0.2") 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")

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

@ -34,7 +34,7 @@ object Versions {
const val android_arch_lifecycle_extensions: String = "1.1.1" const val android_arch_lifecycle_extensions: String = "1.1.1"
const val com_android_tools_build_gradle: String = "3.5.3" // available: "4.0.0" const val com_android_tools_build_gradle: String = "4.0.0"
const val de_fayard_buildsrcversions_gradle_plugin: String = "0.7.0" const val de_fayard_buildsrcversions_gradle_plugin: String = "0.7.0"

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

@ -47,7 +47,7 @@ class AllProjectConfigurer {
fun configureBaseExtension(target: Project, path: String) { fun configureBaseExtension(target: Project, path: String) {
target.configureExtension<BaseExtension> { target.configureExtension<BaseExtension> {
setCompileSdkVersion(Config.compileSdk) setCompileSdkVersion(Config.compileSdk)
ndkVersion = "21.1.6352462"
defaultConfig { defaultConfig {
setMinSdkVersion(Config.minSdk) setMinSdkVersion(Config.minSdk)
setTargetSdkVersion(Config.targetSdk) setTargetSdkVersion(Config.targetSdk)
@ -98,6 +98,7 @@ class AllProjectConfigurer {
ignore( ignore(
"SyntheticAccessor", "SyntheticAccessor",
"GoogleAppIndexingApiWarning", "GoogleAppIndexingApiWarning",
"LockedOrientationActivity",
//TODO stop ignoring below this //TODO stop ignoring below this
"CheckResult", "CheckResult",
"LabelFor", "LabelFor",

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-6.0.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip