chore(stage-pocket): update AGP
This commit is contained in:
@@ -1,12 +1,18 @@
|
||||
val androidMinSdk = rootProject.extra["minSdkVersion"] as Int
|
||||
val androidCompileSdk = rootProject.extra["compileSdkVersion"] as Int
|
||||
val androidTargetSdk = rootProject.extra["targetSdkVersion"] as Int
|
||||
val androidxAppCompatVersion = rootProject.extra["androidxAppCompatVersion"] as String
|
||||
val androidxCoordinatorLayoutVersion = rootProject.extra["androidxCoordinatorLayoutVersion"] as String
|
||||
val coreSplashScreenVersion = rootProject.extra["coreSplashScreenVersion"] as String
|
||||
val junitVersion = rootProject.extra["junitVersion"] as String
|
||||
val androidxJunitVersion = rootProject.extra["androidxJunitVersion"] as String
|
||||
val androidxEspressoCoreVersion = rootProject.extra["androidxEspressoCoreVersion"] as String
|
||||
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||
|
||||
val minSdkVersion: Int by rootProject.extra
|
||||
val compileSdkVersion: Int by rootProject.extra
|
||||
val targetSdkVersion: Int by rootProject.extra
|
||||
val androidxAppCompatVersion: String by rootProject.extra
|
||||
val androidxCoordinatorLayoutVersion: String by rootProject.extra
|
||||
val coreSplashScreenVersion: String by rootProject.extra
|
||||
val junitVersion: String by rootProject.extra
|
||||
val androidxJunitVersion: String by rootProject.extra
|
||||
val androidxEspressoCoreVersion: String by rootProject.extra
|
||||
|
||||
val androidMinSdk = minSdkVersion
|
||||
val androidCompileSdk = compileSdkVersion
|
||||
val androidTargetSdk = targetSdkVersion
|
||||
|
||||
plugins {
|
||||
id("com.android.application")
|
||||
@@ -24,11 +30,6 @@ android {
|
||||
versionCode = 1
|
||||
versionName = "1.0"
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
aaptOptions {
|
||||
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
|
||||
// Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
|
||||
ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~"
|
||||
}
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
@@ -40,9 +41,16 @@ android {
|
||||
)
|
||||
}
|
||||
}
|
||||
androidResources {
|
||||
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
|
||||
// Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
|
||||
ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~"
|
||||
}
|
||||
}
|
||||
|
||||
kotlinOptions {
|
||||
jvmTarget = "21"
|
||||
kotlin {
|
||||
compilerOptions {
|
||||
jvmTarget.set(JvmTarget.JVM_21)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -68,7 +76,7 @@ apply(from = "capacitor.build.gradle")
|
||||
|
||||
try {
|
||||
val servicesJson = file("google-services.json")
|
||||
if (servicesJson.readText().isNotBlank()) {
|
||||
if (servicesJson.isFile && servicesJson.length() > 0) {
|
||||
apply(plugin = "com.google.gms.google-services")
|
||||
}
|
||||
} catch (error: Exception) {
|
||||
|
||||
@@ -9,7 +9,7 @@ buildscript {
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath("com.android.tools.build:gradle:8.13.0")
|
||||
classpath("com.android.tools.build:gradle:8.13.2")
|
||||
classpath("com.google.gms:google-services:4.4.4")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21")
|
||||
|
||||
|
||||
@@ -1,11 +1,3 @@
|
||||
pluginManagement {
|
||||
repositories {
|
||||
google()
|
||||
mavenCentral()
|
||||
gradlePluginPortal()
|
||||
}
|
||||
}
|
||||
|
||||
include(":app")
|
||||
include(":capacitor-cordova-android-plugins")
|
||||
project(":capacitor-cordova-android-plugins").projectDir = file("./capacitor-cordova-android-plugins/")
|
||||
|
||||
@@ -1,16 +1,14 @@
|
||||
extra.apply {
|
||||
set("minSdkVersion", 24)
|
||||
set("compileSdkVersion", 36)
|
||||
set("targetSdkVersion", 36)
|
||||
set("androidxActivityVersion", "1.11.0")
|
||||
set("androidxAppCompatVersion", "1.7.1")
|
||||
set("androidxCoordinatorLayoutVersion", "1.3.0")
|
||||
set("androidxCoreVersion", "1.17.0")
|
||||
set("androidxFragmentVersion", "1.8.9")
|
||||
set("coreSplashScreenVersion", "1.2.0")
|
||||
set("androidxWebkitVersion", "1.14.0")
|
||||
set("junitVersion", "4.13.2")
|
||||
set("androidxJunitVersion", "1.3.0")
|
||||
set("androidxEspressoCoreVersion", "3.7.0")
|
||||
set("cordovaAndroidVersion", "14.0.1")
|
||||
}
|
||||
val minSdkVersion by extra(24)
|
||||
val compileSdkVersion by extra(36)
|
||||
val targetSdkVersion by extra(36)
|
||||
val androidxActivityVersion by extra("1.11.0")
|
||||
val androidxAppCompatVersion by extra("1.7.1")
|
||||
val androidxCoordinatorLayoutVersion by extra("1.3.0")
|
||||
val androidxCoreVersion by extra("1.17.0")
|
||||
val androidxFragmentVersion by extra("1.8.9")
|
||||
val coreSplashScreenVersion by extra("1.2.0")
|
||||
val androidxWebkitVersion by extra("1.14.0")
|
||||
val junitVersion by extra("4.13.2")
|
||||
val androidxJunitVersion by extra("1.3.0")
|
||||
val androidxEspressoCoreVersion by extra("3.7.0")
|
||||
val cordovaAndroidVersion by extra("14.0.1")
|
||||
|
||||
Reference in New Issue
Block a user