Skip to content

Commit 283b91d

Browse files
monfadevmonfadev
committed
feat: deprecated imperative apply of Flutter's Gradle plugins
1 parent 10fef72 commit 283b91d

File tree

6 files changed

+120
-60
lines changed

6 files changed

+120
-60
lines changed

‎analysis_options.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ linter:
99
- avoid_print
1010
- avoid_redundant_argument_values
1111
- avoid_relative_lib_imports
12-
- avoid_returning_null_for_future
1312
- avoid_type_to_string
1413
- avoid_void_async
1514
- cancel_subscriptions

‎example/android/app/build.gradle

Lines changed: 10 additions & 14 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,12 +22,9 @@ 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
android {
29-
compileSdkVersion 33
26+
namespace "com.mix1009.example"
27+
compileSdk 34
3028
ndkVersion flutter.ndkVersion
3129

3230
compileOptions {
@@ -45,7 +43,7 @@ android {
4543
defaultConfig {
4644
applicationId "com.mix1009.example"
4745
minSdkVersion 21
48-
targetSdkVersion 33
46+
targetSdkVersion 34
4947
versionCode flutterVersionCode.toInteger()
5048
versionName flutterVersionName
5149
}
@@ -61,6 +59,4 @@ flutter {
6159
source '../..'
6260
}
6361

64-
dependencies {
65-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
66-
}
62+
dependencies {}

‎example/android/build.gradle

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

2916
tasks.register("clean", Delete) {
3017
delete rootProject.buildDir
31-
}
18+
}

‎example/android/settings.gradle

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,25 @@
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.3.0" apply false
22+
id "org.jetbrains.kotlin.android" version "1.9.10" apply false
23+
}
24+
25+
include ":app"

‎example/pubspec.lock

Lines changed: 47 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -112,30 +112,54 @@ packages:
112112
url: "https://pub.dev"
113113
source: hosted
114114
version: "4.0.2"
115+
leak_tracker:
116+
dependency: transitive
117+
description:
118+
name: leak_tracker
119+
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
120+
url: "https://pub.dev"
121+
source: hosted
122+
version: "10.0.0"
123+
leak_tracker_flutter_testing:
124+
dependency: transitive
125+
description:
126+
name: leak_tracker_flutter_testing
127+
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
128+
url: "https://pub.dev"
129+
source: hosted
130+
version: "2.0.1"
131+
leak_tracker_testing:
132+
dependency: transitive
133+
description:
134+
name: leak_tracker_testing
135+
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
136+
url: "https://pub.dev"
137+
source: hosted
138+
version: "2.0.1"
115139
matcher:
116140
dependency: transitive
117141
description:
118142
name: matcher
119-
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
143+
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
120144
url: "https://pub.dev"
121145
source: hosted
122-
version: "0.12.16"
146+
version: "0.12.16+1"
123147
material_color_utilities:
124148
dependency: transitive
125149
description:
126150
name: material_color_utilities
127-
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
151+
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
128152
url: "https://pub.dev"
129153
source: hosted
130-
version: "0.5.0"
154+
version: "0.8.0"
131155
meta:
132156
dependency: transitive
133157
description:
134158
name: meta
135-
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
159+
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
136160
url: "https://pub.dev"
137161
source: hosted
138-
version: "1.10.0"
162+
version: "1.11.0"
139163
package_info_plus:
140164
dependency: transitive
141165
description:
@@ -156,10 +180,10 @@ packages:
156180
dependency: transitive
157181
description:
158182
name: path
159-
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
183+
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
160184
url: "https://pub.dev"
161185
source: hosted
162-
version: "1.8.3"
186+
version: "1.9.0"
163187
plugin_platform_interface:
164188
dependency: transitive
165189
description:
@@ -233,10 +257,10 @@ packages:
233257
dependency: transitive
234258
description:
235259
name: url_launcher
236-
sha256: e9aa5ea75c84cf46b3db4eea212523591211c3cf2e13099ee4ec147f54201c86
260+
sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e"
237261
url: "https://pub.dev"
238262
source: hosted
239-
version: "6.2.2"
263+
version: "6.2.6"
240264
url_launcher_android:
241265
dependency: transitive
242266
description:
@@ -249,10 +273,10 @@ packages:
249273
dependency: transitive
250274
description:
251275
name: url_launcher_ios
252-
sha256: bba3373219b7abb6b5e0d071b0fe66dfbe005d07517a68e38d4fc3638f35c6d3
276+
sha256: "9149d493b075ed740901f3ee844a38a00b33116c7c5c10d7fb27df8987fb51d5"
253277
url: "https://pub.dev"
254278
source: hosted
255-
version: "6.2.1"
279+
version: "6.2.5"
256280
url_launcher_linux:
257281
dependency: transitive
258282
description:
@@ -307,7 +331,15 @@ packages:
307331
path: ".."
308332
relative: true
309333
source: path
310-
version: "0.7.1"
334+
version: "0.7.2"
335+
vm_service:
336+
dependency: transitive
337+
description:
338+
name: vm_service
339+
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
340+
url: "https://pub.dev"
341+
source: hosted
342+
version: "13.0.0"
311343
web:
312344
dependency: transitive
313345
description:
@@ -325,5 +357,5 @@ packages:
325357
source: hosted
326358
version: "5.0.9"
327359
sdks:
328-
dart: ">=3.2.0 <4.0.0"
329-
flutter: ">=3.16.0"
360+
dart: ">=3.2.3 <4.0.0"
361+
flutter: ">=3.16.6"

‎pubspec.lock

Lines changed: 40 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,30 @@ packages:
112112
url: "https://pub.dev"
113113
source: hosted
114114
version: "4.0.2"
115+
leak_tracker:
116+
dependency: transitive
117+
description:
118+
name: leak_tracker
119+
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
120+
url: "https://pub.dev"
121+
source: hosted
122+
version: "10.0.0"
123+
leak_tracker_flutter_testing:
124+
dependency: transitive
125+
description:
126+
name: leak_tracker_flutter_testing
127+
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
128+
url: "https://pub.dev"
129+
source: hosted
130+
version: "2.0.1"
131+
leak_tracker_testing:
132+
dependency: transitive
133+
description:
134+
name: leak_tracker_testing
135+
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
136+
url: "https://pub.dev"
137+
source: hosted
138+
version: "2.0.1"
115139
lints:
116140
dependency: transitive
117141
description:
@@ -124,26 +148,26 @@ packages:
124148
dependency: transitive
125149
description:
126150
name: matcher
127-
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
151+
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
128152
url: "https://pub.dev"
129153
source: hosted
130-
version: "0.12.16"
154+
version: "0.12.16+1"
131155
material_color_utilities:
132156
dependency: transitive
133157
description:
134158
name: material_color_utilities
135-
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
159+
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
136160
url: "https://pub.dev"
137161
source: hosted
138-
version: "0.5.0"
162+
version: "0.8.0"
139163
meta:
140164
dependency: transitive
141165
description:
142166
name: meta
143-
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
167+
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
144168
url: "https://pub.dev"
145169
source: hosted
146-
version: "1.10.0"
170+
version: "1.11.0"
147171
package_info_plus:
148172
dependency: "direct main"
149173
description:
@@ -164,10 +188,10 @@ packages:
164188
dependency: transitive
165189
description:
166190
name: path
167-
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
191+
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
168192
url: "https://pub.dev"
169193
source: hosted
170-
version: "1.8.3"
194+
version: "1.9.0"
171195
plugin_platform_interface:
172196
dependency: transitive
173197
description:
@@ -309,6 +333,14 @@ packages:
309333
url: "https://pub.dev"
310334
source: hosted
311335
version: "2.1.4"
336+
vm_service:
337+
dependency: transitive
338+
description:
339+
name: vm_service
340+
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
341+
url: "https://pub.dev"
342+
source: hosted
343+
version: "13.0.0"
312344
web:
313345
dependency: transitive
314346
description:

0 commit comments

Comments
 (0)