Skip to content

Commit c7b9e08

Browse files
committed
chore: update Android gradle configuration style to the recommendation
1 parent dc5cac1 commit c7b9e08

File tree

4 files changed

+31
-36
lines changed

4 files changed

+31
-36
lines changed

android/app/build.gradle

+9-11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
plugins {
2+
id "com.android.application"
3+
id "kotlin-android"
4+
id "dev.flutter.flutter-gradle-plugin"
5+
}
6+
17
def localProperties = new Properties()
28
def localPropertiesFile = rootProject.file('local.properties')
39
if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
612
}
713
}
814

9-
def flutterRoot = localProperties.getProperty('flutter.sdk')
10-
if (flutterRoot == null) {
11-
throw new Exception("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12-
}
13-
1415
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1516
if (flutterVersionCode == null) {
1617
flutterVersionCode = '1'
@@ -21,16 +22,13 @@ if (flutterVersionName == null) {
2122
flutterVersionName = '1.0'
2223
}
2324

24-
apply plugin: 'com.android.application'
25-
apply plugin: 'kotlin-android'
26-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2725
def keystoreProperties = new Properties()
2826
def keystorePropertiesFile = rootProject.file('key.properties')
2927
if (keystorePropertiesFile.exists()) {
3028
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
3129
}
3230

33-
// Skip Crashlytics upload. It breaks the procesmicof building.
31+
// Skip Crashlytics upload. It breaks the process of building.
3432
gradle.taskGraph.whenReady {
3533
tasks.each { task ->
3634
if (task.name.contains("uploadCrashlyticsMappingFileRelease")) {
@@ -41,7 +39,7 @@ gradle.taskGraph.whenReady {
4139
android {
4240
compileSdkVersion 34
4341

44-
ndkVersion "25.1.8937393"
42+
ndkVersion "26.2.11394342"
4543

4644
sourceSets {
4745
main.java.srcDirs += 'src/main/kotlin'
@@ -83,6 +81,6 @@ flutter {
8381
}
8482

8583
dependencies {
86-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
84+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.22"
8785
implementation 'com.google.android.material:material:1.11.0'
8886
}

android/build.gradle

-16
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,7 @@
1-
buildscript {
2-
ext.kotlin_version = '1.9.22'
3-
repositories {
4-
google()
5-
mavenCentral()
6-
}
7-
8-
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.1.3'
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11-
}
12-
}
13-
141
allprojects {
152
repositories {
163
google()
174
mavenCentral()
18-
// maven { url 'https://maven.aliyun.com/repository/google' }
19-
// maven { url 'https://maven.aliyun.com/repository/jcenter' }
20-
// maven { url 'https://maven.aliyun.com/repository/public' }
215
}
226
}
237

android/gradle.properties

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
android.useAndroidX=true
22
android.enableJetifier=true
3-
android.enableR8=true
43
org.gradle.jvmargs=-Xmx4096M -XX:MaxNewSize=3G
54
org.gradle.parallel=true
65
org.gradle.caching=true

android/settings.gradle

+22-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,28 @@
1-
include ':app'
1+
pluginManagement {
2+
def flutterSdkPath = {
3+
def properties = new Properties()
4+
file("local.properties").withInputStream { properties.load(it) }
5+
def flutterSdkPath = properties.getProperty("flutter.sdk")
6+
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
7+
return flutterSdkPath
8+
}()
29

3-
def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
4-
def properties = new Properties()
10+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
511

6-
assert localPropertiesFile.exists()
7-
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
12+
repositories {
13+
google()
14+
mavenCentral()
15+
gradlePluginPortal()
16+
}
17+
}
818

9-
def flutterSdkPath = properties.getProperty("flutter.sdk")
10-
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
11-
apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
19+
plugins {
20+
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21+
id "com.android.application" version "7.1.3" apply false
22+
id "org.jetbrains.kotlin.android" version "1.9.22" apply false
23+
}
24+
25+
include ":app"
1226

1327
// >>> Required by git_info to unignore .git directory
1428
import org.apache.tools.ant.DirectoryScanner

0 commit comments

Comments
 (0)