Update Android API 35 (#3874)

This commit is contained in:
Dat Dang
2025-07-18 10:15:25 +07:00
committed by GitHub
parent 6f87058459
commit 78cb93ef1c
19 changed files with 191 additions and 128 deletions
+4 -3
View File
@@ -34,7 +34,7 @@ if (keystorePropertiesFile.exists()) {
}
android {
compileSdk 34
compileSdk 35
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
@@ -43,7 +43,7 @@ android {
defaultConfig {
applicationId "com.linagora.android.teammail"
minSdkVersion flutterMinSdkVersion.toInteger()
targetSdkVersion 34
targetSdkVersion 35
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
// The number of method references in a .dex file cannot exceed 64K
@@ -85,6 +85,7 @@ android {
execution "ANDROIDX_TEST_ORCHESTRATOR"
}
namespace "com.linagora.android.tmail"
}
flutter {
@@ -92,7 +93,7 @@ flutter {
}
dependencies {
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'
implementation 'androidx.work:work-runtime-ktx:2.7.0'
implementation 'com.android.support:multidex:1.0.3'
implementation 'androidx.window:window:1.0.0'
+1 -2
View File
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.linagora.android.tmail">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
+1 -2
View File
@@ -1,6 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.linagora.android.tmail">
xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28"/>
+1 -2
View File
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.linagora.android.tmail">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
+25
View File
@@ -3,6 +3,31 @@ allprojects {
google()
mavenCentral()
}
subprojects {
afterEvaluate { project ->
if (project.hasProperty('android')) {
project.android {
if (namespace == null) {
namespace project.group
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
compileSdk 35
}
}
}
}
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
kotlinOptions {
jvmTarget = "17"
}
}
}
rootProject.buildDir = '../build'
+4 -1
View File
@@ -1,4 +1,7 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
android.jetifier.ignorelist=bcprov-jdk15on-1.68.jar
android.jetifier.ignorelist=bcprov-jdk15on-1.68.jar
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
+1 -1
View File
@@ -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-7.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+1 -1
View File
@@ -18,7 +18,7 @@ pluginManagement {
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version '7.1.3' apply false
id "com.android.application" version '8.4.1' apply false
id "org.jetbrains.kotlin.android" version "1.9.21" apply false
id "com.google.gms.google-services" version "4.3.10" apply false
}