Skip to content

Commit e03542f

Browse files
Migrate Gradle DSL on Android
Signed-off-by: huynguyennovem <huynguyennovem@gmail.com>
1 parent af176fa commit e03542f

3 files changed

Lines changed: 33 additions & 36 deletions

File tree

android/app/build.gradle

Lines changed: 10 additions & 15 deletions
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 GradleException("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,18 +22,14 @@ 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"
27-
2825
def keystoreProperties = new Properties()
2926
def keystorePropertiesFile = rootProject.file('key.properties')
3027
if (keystorePropertiesFile.exists()) {
3128
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
3229
}
3330

3431
android {
35-
compileSdkVersion 33
32+
compileSdkVersion 34
3633
ndkVersion flutter.ndkVersion
3734

3835
compileOptions {
@@ -53,7 +50,7 @@ android {
5350
applicationId "com.app.netshare"
5451
// You can update the following values to match your application needs.
5552
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
56-
minSdkVersion 20
53+
minSdkVersion flutter.minSdkVersion
5754
targetSdkVersion flutter.targetSdkVersion
5855
versionCode flutterVersionCode.toInteger()
5956
versionName flutterVersionName
@@ -72,14 +69,12 @@ android {
7269
// signingConfig signingConfigs.debug
7370

7471
signingConfig signingConfigs.release
72+
shrinkResources true
73+
minifyEnabled true
7574
}
7675
}
7776
}
7877

7978
flutter {
8079
source '../..'
8180
}
82-
83-
dependencies {
84-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
85-
}

android/build.gradle

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
buildscript {
2-
ext.kotlin_version = '1.8.0'
3-
repositories {
4-
google()
5-
mavenCentral()
6-
}
7-
8-
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.3.1'
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11-
}
12-
}
13-
141
allprojects {
152
repositories {
163
google()

android/settings.gradle

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,26 @@
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+
}
9+
settings.ext.flutterSdkPath = flutterSdkPath()
210

3-
def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
4-
def properties = new Properties()
11+
includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
512

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

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"
20+
plugins {
21+
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
22+
id "com.android.application" version "7.3.0" apply false
23+
id "org.jetbrains.kotlin.android" version "2.0.0" apply false
24+
}
25+
26+
include ":app"

0 commit comments

Comments
 (0)