Skip to content

Commit 8746080

Browse files
tddang-linagorahoangdat
authored andcommittedMar 18, 2025·
TF-3533 Migrate gradle plugins
1 parent a5679b3 commit 8746080

File tree

3 files changed

+29
-32
lines changed

3 files changed

+29
-32
lines changed
 

‎android/app/build.gradle

+6-10
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'
@@ -26,10 +27,6 @@ if (flutterMinSdkVersion == null) {
2627
flutterMinSdkVersion = '21'
2728
}
2829

29-
apply plugin: 'com.android.application'
30-
apply plugin: 'kotlin-android'
31-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
32-
3330
def keystoreProperties = new Properties()
3431
def keystorePropertiesFile = rootProject.file('key.properties')
3532
if (keystorePropertiesFile.exists()) {
@@ -96,7 +93,6 @@ flutter {
9693

9794
dependencies {
9895
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
99-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
10096
implementation 'androidx.work:work-runtime-ktx:2.7.0'
10197
implementation 'com.android.support:multidex:1.0.3'
10298
implementation 'androidx.window:window:1.0.0'

‎android/build.gradle

-14
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,3 @@
1-
buildscript {
2-
ext.kotlin_version = '1.9.21'
3-
repositories {
4-
google()
5-
mavenCentral()
6-
}
7-
8-
dependencies {
9-
classpath 'com.google.gms:google-services:4.3.10'
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11-
classpath 'com.android.tools.build:gradle:7.1.3'
12-
}
13-
}
14-
151
allprojects {
162
repositories {
173
google()

‎android/settings.gradle

+23-8
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+
}()
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.21" apply false
23+
id "com.google.gms.google-services" version "4.3.10" apply false
24+
}
25+
26+
include ":app"

0 commit comments

Comments
 (0)
Please sign in to comment.