Skip to content

Commit ec6a512

Browse files
wangwillian0wangwillian0
committed
Update flutter
1 parent 87fb589 commit ec6a512

File tree

5 files changed

+71
-77
lines changed

5 files changed

+71
-77
lines changed

‎android/app/build.gradle‎

Lines changed: 6 additions & 13 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 keystorePropertiesFile = rootProject.file("key.properties")
28
def keystoreProperties = new Properties()
39
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
@@ -10,11 +16,6 @@ if (localPropertiesFile.exists()) {
1016
}
1117
}
1218

13-
def flutterRoot = localProperties.getProperty('flutter.sdk')
14-
if (flutterRoot == null) {
15-
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
16-
}
17-
1819
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1920
if (flutterVersionCode == null) {
2021
flutterVersionCode = '1'
@@ -25,10 +26,6 @@ if (flutterVersionName == null) {
2526
flutterVersionName = '1.0'
2627
}
2728

28-
apply plugin: 'com.android.application'
29-
apply plugin: 'kotlin-android'
30-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
31-
3229
android {
3330
compileSdkVersion 34
3431

@@ -74,10 +71,6 @@ flutter {
7471
source '../..'
7572
}
7673

77-
dependencies {
78-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
79-
}
80-
8174
[
8275
Debug: null,
8376
Profile: '--release',

‎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.20'
3-
repositories {
4-
google()
5-
mavenCentral()
6-
}
7-
8-
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.4.2'
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11-
}
12-
}
13-
141
allprojects {
152
repositories {
163
google()

‎android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Fri Apr 28 22:51:27 BRT 2023
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

‎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.4.2" apply false
22+
id "org.jetbrains.kotlin.android" version "1.8.20" apply false
23+
}
24+
25+
include ":app"

‎pubspec.lock‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@ packages:
2121
dependency: transitive
2222
description:
2323
name: async
24-
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
24+
sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
2525
url: "https://pub.dev"
2626
source: hosted
27-
version: "2.11.0"
27+
version: "2.12.0"
2828
boolean_selector:
2929
dependency: transitive
3030
description:
3131
name: boolean_selector
32-
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
32+
sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
3333
url: "https://pub.dev"
3434
source: hosted
35-
version: "2.1.1"
35+
version: "2.1.2"
3636
build_cli_annotations:
3737
dependency: transitive
3838
description:
@@ -45,10 +45,10 @@ packages:
4545
dependency: transitive
4646
description:
4747
name: characters
48-
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
48+
sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
4949
url: "https://pub.dev"
5050
source: hosted
51-
version: "1.3.0"
51+
version: "1.4.0"
5252
checked_yaml:
5353
dependency: transitive
5454
description:
@@ -69,18 +69,18 @@ packages:
6969
dependency: transitive
7070
description:
7171
name: clock
72-
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
72+
sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
7373
url: "https://pub.dev"
7474
source: hosted
75-
version: "1.1.1"
75+
version: "1.1.2"
7676
collection:
7777
dependency: transitive
7878
description:
7979
name: collection
80-
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
80+
sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
8181
url: "https://pub.dev"
8282
source: hosted
83-
version: "1.18.0"
83+
version: "1.19.1"
8484
convert:
8585
dependency: transitive
8686
description:
@@ -109,10 +109,10 @@ packages:
109109
dependency: transitive
110110
description:
111111
name: fake_async
112-
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
112+
sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
113113
url: "https://pub.dev"
114114
source: hosted
115-
version: "1.3.1"
115+
version: "1.3.2"
116116
ffi:
117117
dependency: "direct main"
118118
description:
@@ -404,26 +404,26 @@ packages:
404404
dependency: transitive
405405
description:
406406
name: leak_tracker
407-
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
407+
sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
408408
url: "https://pub.dev"
409409
source: hosted
410-
version: "10.0.0"
410+
version: "10.0.8"
411411
leak_tracker_flutter_testing:
412412
dependency: transitive
413413
description:
414414
name: leak_tracker_flutter_testing
415-
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
415+
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
416416
url: "https://pub.dev"
417417
source: hosted
418-
version: "2.0.1"
418+
version: "3.0.9"
419419
leak_tracker_testing:
420420
dependency: transitive
421421
description:
422422
name: leak_tracker_testing
423-
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
423+
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
424424
url: "https://pub.dev"
425425
source: hosted
426-
version: "2.0.1"
426+
version: "3.0.1"
427427
lints:
428428
dependency: transitive
429429
description:
@@ -487,26 +487,26 @@ packages:
487487
dependency: transitive
488488
description:
489489
name: matcher
490-
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
490+
sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
491491
url: "https://pub.dev"
492492
source: hosted
493-
version: "0.12.16+1"
493+
version: "0.12.17"
494494
material_color_utilities:
495495
dependency: transitive
496496
description:
497497
name: material_color_utilities
498-
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
498+
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
499499
url: "https://pub.dev"
500500
source: hosted
501-
version: "0.8.0"
501+
version: "0.11.1"
502502
meta:
503503
dependency: transitive
504504
description:
505505
name: meta
506-
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
506+
sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
507507
url: "https://pub.dev"
508508
source: hosted
509-
version: "1.11.0"
509+
version: "1.16.0"
510510
mime:
511511
dependency: transitive
512512
description:
@@ -535,10 +535,10 @@ packages:
535535
dependency: transitive
536536
description:
537537
name: path
538-
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
538+
sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
539539
url: "https://pub.dev"
540540
source: hosted
541-
version: "1.9.0"
541+
version: "1.9.1"
542542
path_provider:
543543
dependency: "direct main"
544544
description:
@@ -751,15 +751,15 @@ packages:
751751
dependency: transitive
752752
description: flutter
753753
source: sdk
754-
version: "0.0.99"
754+
version: "0.0.0"
755755
source_span:
756756
dependency: transitive
757757
description:
758758
name: source_span
759-
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
759+
sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
760760
url: "https://pub.dev"
761761
source: hosted
762-
version: "1.10.0"
762+
version: "1.10.1"
763763
sprintf:
764764
dependency: transitive
765765
description:
@@ -772,42 +772,42 @@ packages:
772772
dependency: transitive
773773
description:
774774
name: stack_trace
775-
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
775+
sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
776776
url: "https://pub.dev"
777777
source: hosted
778-
version: "1.11.1"
778+
version: "1.12.1"
779779
stream_channel:
780780
dependency: transitive
781781
description:
782782
name: stream_channel
783-
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
783+
sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
784784
url: "https://pub.dev"
785785
source: hosted
786-
version: "2.1.2"
786+
version: "2.1.4"
787787
string_scanner:
788788
dependency: transitive
789789
description:
790790
name: string_scanner
791-
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
791+
sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
792792
url: "https://pub.dev"
793793
source: hosted
794-
version: "1.2.0"
794+
version: "1.4.1"
795795
term_glyph:
796796
dependency: transitive
797797
description:
798798
name: term_glyph
799-
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
799+
sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
800800
url: "https://pub.dev"
801801
source: hosted
802-
version: "1.2.1"
802+
version: "1.2.2"
803803
test_api:
804804
dependency: transitive
805805
description:
806806
name: test_api
807-
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
807+
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
808808
url: "https://pub.dev"
809809
source: hosted
810-
version: "0.6.1"
810+
version: "0.7.4"
811811
tuple:
812812
dependency: transitive
813813
description:
@@ -908,10 +908,10 @@ packages:
908908
dependency: transitive
909909
description:
910910
name: vm_service
911-
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
911+
sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
912912
url: "https://pub.dev"
913913
source: hosted
914-
version: "13.0.0"
914+
version: "14.3.1"
915915
web:
916916
dependency: transitive
917917
description:
@@ -969,5 +969,5 @@ packages:
969969
source: hosted
970970
version: "2.2.0"
971971
sdks:
972-
dart: ">=3.3.0 <4.0.0"
972+
dart: ">=3.7.0-0 <4.0.0"
973973
flutter: ">=3.19.0"

0 commit comments

Comments
 (0)