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

Upgraded Gradle to 8.1.3 * Added the namespace property in the build.gradle file because, in the newer Gradle version, it is necessary to specify the namespace in the build.gradle file instead of declaring it in the manifest file.

Browse Source
This commit is contained in:
MohitMali 2023-11-20 18:56:36 +05:30 committed by Kelson
parent 2b8f7300f6
commit f314e70d0c
7 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle.kts
View File

@ -20,7 +20,7 @@ fun generateVersionName() = "${Config.versionMajor}.${Config.versionMinor}.${Con
val apkPrefix get() = System.getenv("TAG") ?: "kiwix" val apkPrefix get() = System.getenv("TAG") ?: "kiwix"
android { android {
namespace = "org.kiwix.kiwixmobile"
defaultConfig { defaultConfig {
base.archivesName.set(apkPrefix) base.archivesName.set(apkPrefix)
resValue("string", "app_name", "Kiwix") resValue("string", "app_name", "Kiwix")

3
app/src/main/AndroidManifest.xml
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools">
package="org.kiwix.kiwixmobile">
<uses-permission <uses-permission
android:name="android.permission.ACCESS_FINE_LOCATION" android:name="android.permission.ACCESS_FINE_LOCATION"

2
buildSrc/build.gradle.kts
View File

@ -11,7 +11,7 @@ repositories {
} }
dependencies { dependencies {
implementation("com.android.tools.build:gradle:7.4.2") implementation("com.android.tools.build:gradle:8.1.3")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0")
implementation("org.jacoco:org.jacoco.core:0.8.8") implementation("org.jacoco:org.jacoco.core:0.8.8")
implementation("org.jlleitschuh.gradle:ktlint-gradle:10.3.0") implementation("org.jlleitschuh.gradle:ktlint-gradle:10.3.0")

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

@ -44,7 +44,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 = "7.4.2" const val com_android_tools_build_gradle: String = "8.1.3"
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

@ -45,6 +45,7 @@ class AllProjectConfigurer {
fun configureBaseExtension(target: Project) { fun configureBaseExtension(target: Project) {
target.configureExtension<BaseExtension> { target.configureExtension<BaseExtension> {
namespace = ""
setCompileSdkVersion(Config.compileSdk) setCompileSdkVersion(Config.compileSdk)
defaultConfig { defaultConfig {
minSdk = Config.minSdk minSdk = Config.minSdk
@ -115,7 +116,7 @@ class AllProjectConfigurer {
} }
fun configureCommonExtension(target: Project) { fun configureCommonExtension(target: Project) {
target.configureExtension<CommonExtension<*, *, *, *>> { target.configureExtension<CommonExtension<*, *, *, *, *>> {
lint { lint {
abortOnError = true abortOnError = true
checkAllWarnings = true checkAllWarnings = true

1
core/src/main/AndroidManifest.xml
View File

@ -1,6 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="org.kiwix.kiwixmobile.core"
android:installLocation="auto"> android:installLocation="auto">
<uses-permission <uses-permission

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

@ -1,6 +1,6 @@
#Mon Dec 19 16:13:45 IST 2022 #Mon Dec 19 16:13:45 IST 2022
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME