Skip to content

Commit d215afc

Browse files
upgrade flutter and dependencies (#51)
* upgrade flutter and dependencies * fix android build * fix android build
1 parent 6cc3466 commit d215afc

8 files changed

Lines changed: 92 additions & 68 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
java-version: '11'
2020
- uses: subosito/flutter-action@v2
2121
with:
22-
flutter-version: '3.16.9'
22+
flutter-version: '3.19.0'
2323
- name: Install dependencies
2424
run: flutter pub get
2525
- name: Generate l10n
@@ -54,7 +54,7 @@ jobs:
5454
- uses: actions/checkout@v3
5555
- uses: subosito/flutter-action@v2
5656
with:
57-
flutter-version: '3.16.9'
57+
flutter-version: '3.19.0'
5858
channel: 'stable'
5959
- name: Flutter doctor
6060
run: flutter doctor

android/app/build.gradle

Lines changed: 7 additions & 9 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,10 +22,6 @@ 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 {
2926
namespace "com.example.run_flutter_run"
3027
compileSdkVersion 33
@@ -68,5 +65,6 @@ flutter {
6865
}
6966

7067
dependencies {
68+
ext.kotlin_version = '1.9.20'
7169
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
7270
}

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.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()

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 "1.9.20" apply false
24+
}
25+
26+
include ":app"

ios/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,4 @@ SPEC CHECKSUMS:
8888

8989
PODFILE CHECKSUM: 2442f0b84dc733c75ff32e76bcf04626a168288b
9090

91-
COCOAPODS: 1.11.3
91+
COCOAPODS: 1.15.2

ios/Runner.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
97C146E61CF9000F007C117D /* Project object */ = {
157157
isa = PBXProject;
158158
attributes = {
159-
LastUpgradeCheck = 1430;
159+
LastUpgradeCheck = 1510;
160160
ORGANIZATIONNAME = "";
161161
TargetAttributes = {
162162
97C146ED1CF9000F007C117D = {

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

pubspec.lock

Lines changed: 57 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ packages:
55
dependency: transitive
66
description:
77
name: _fe_analyzer_shared
8-
sha256: eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051
8+
sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7"
99
url: "https://pub.dev"
1010
source: hosted
11-
version: "64.0.0"
11+
version: "67.0.0"
1212
analyzer:
1313
dependency: transitive
1414
description:
1515
name: analyzer
16-
sha256: "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893"
16+
sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d"
1717
url: "https://pub.dev"
1818
source: hosted
19-
version: "6.2.0"
19+
version: "6.4.1"
2020
archive:
2121
dependency: transitive
2222
description:
@@ -205,10 +205,10 @@ packages:
205205
dependency: transitive
206206
description:
207207
name: ffi
208-
sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
208+
sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21"
209209
url: "https://pub.dev"
210210
source: hosted
211-
version: "2.1.0"
211+
version: "2.1.2"
212212
file:
213213
dependency: transitive
214214
description:
@@ -274,10 +274,10 @@ packages:
274274
dependency: "direct main"
275275
description:
276276
name: flutter_hooks
277-
sha256: "09f64db63fee3b2ab8b9038a1346be7d8986977fae3fec601275bf32455ccfc0"
277+
sha256: cde36b12f7188c85286fba9b38cc5a902e7279f36dd676967106c041dc9dde70
278278
url: "https://pub.dev"
279279
source: hosted
280-
version: "0.20.4"
280+
version: "0.20.5"
281281
flutter_keyboard_visibility:
282282
dependency: transitive
283283
description:
@@ -449,34 +449,34 @@ packages:
449449
dependency: "direct main"
450450
description:
451451
name: geolocator
452-
sha256: e946395fc608842bb2f6c914807e9183f86f3cb787f6b8f832753e5251036f02
452+
sha256: f4efb8d3c4cdcad2e226af9661eb1a0dd38c71a9494b22526f9da80ab79520e5
453453
url: "https://pub.dev"
454454
source: hosted
455-
version: "10.1.0"
455+
version: "10.1.1"
456456
geolocator_android:
457457
dependency: transitive
458458
description:
459459
name: geolocator_android
460-
sha256: afe2393715372e3901f789422a8a527fd78cfd423783e721c7e9ae826b081ece
460+
sha256: "136f1c97e1903366393bda514c5d9e98843418baea52899aa45edae9af8a5cd6"
461461
url: "https://pub.dev"
462462
source: hosted
463-
version: "4.5.1"
463+
version: "4.5.2"
464464
geolocator_apple:
465465
dependency: transitive
466466
description:
467467
name: geolocator_apple
468-
sha256: "79babf44b692ec5e789d322dc736ef71586056e8e6828f747c9e005456b248bf"
468+
sha256: "2f2d4ee16c4df269e93c0e382be075cc01d5db6703c3196e4af20a634fe49ef4"
469469
url: "https://pub.dev"
470470
source: hosted
471-
version: "2.3.5"
471+
version: "2.3.6"
472472
geolocator_platform_interface:
473473
dependency: transitive
474474
description:
475475
name: geolocator_platform_interface
476-
sha256: "3b95ecdc36462c47dbc535dcfedea774d03ccd1f3c9864e0a02ad088eeff4508"
476+
sha256: "009a21c4bc2761e58dccf07c24f219adaebe0ff707abdfd40b0a763d4003fab9"
477477
url: "https://pub.dev"
478478
source: hosted
479-
version: "4.2.1"
479+
version: "4.2.2"
480480
geolocator_web:
481481
dependency: transitive
482482
description:
@@ -537,10 +537,10 @@ packages:
537537
dependency: "direct main"
538538
description:
539539
name: image
540-
sha256: "49a0d4b0c12402853d3f227fe7c315601b238d126aa4caa5dbb2dcf99421aa4a"
540+
sha256: "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e"
541541
url: "https://pub.dev"
542542
source: hosted
543-
version: "4.1.6"
543+
version: "4.1.7"
544544
image_cropper:
545545
dependency: "direct main"
546546
description:
@@ -661,6 +661,30 @@ packages:
661661
url: "https://pub.dev"
662662
source: hosted
663663
version: "0.9.0"
664+
leak_tracker:
665+
dependency: transitive
666+
description:
667+
name: leak_tracker
668+
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
669+
url: "https://pub.dev"
670+
source: hosted
671+
version: "10.0.0"
672+
leak_tracker_flutter_testing:
673+
dependency: transitive
674+
description:
675+
name: leak_tracker_flutter_testing
676+
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
677+
url: "https://pub.dev"
678+
source: hosted
679+
version: "2.0.1"
680+
leak_tracker_testing:
681+
dependency: transitive
682+
description:
683+
name: leak_tracker_testing
684+
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
685+
url: "https://pub.dev"
686+
source: hosted
687+
version: "2.0.1"
664688
lints:
665689
dependency: transitive
666690
description:
@@ -697,26 +721,26 @@ packages:
697721
dependency: transitive
698722
description:
699723
name: matcher
700-
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
724+
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
701725
url: "https://pub.dev"
702726
source: hosted
703-
version: "0.12.16"
727+
version: "0.12.16+1"
704728
material_color_utilities:
705729
dependency: transitive
706730
description:
707731
name: material_color_utilities
708-
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
732+
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
709733
url: "https://pub.dev"
710734
source: hosted
711-
version: "0.5.0"
735+
version: "0.8.0"
712736
meta:
713737
dependency: transitive
714738
description:
715739
name: meta
716-
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
740+
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
717741
url: "https://pub.dev"
718742
source: hosted
719-
version: "1.10.0"
743+
version: "1.11.0"
720744
mgrs_dart:
721745
dependency: transitive
722746
description:
@@ -753,10 +777,10 @@ packages:
753777
dependency: transitive
754778
description:
755779
name: path
756-
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
780+
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
757781
url: "https://pub.dev"
758782
source: hosted
759-
version: "1.8.3"
783+
version: "1.9.0"
760784
path_provider:
761785
dependency: "direct main"
762786
description:
@@ -1078,10 +1102,10 @@ packages:
10781102
dependency: transitive
10791103
description:
10801104
name: url_launcher_platform_interface
1081-
sha256: a932c3a8082e118f80a475ce692fde89dc20fddb24c57360b96bc56f7035de1f
1105+
sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029"
10821106
url: "https://pub.dev"
10831107
source: hosted
1084-
version: "2.3.1"
1108+
version: "2.3.2"
10851109
url_launcher_web:
10861110
dependency: transitive
10871111
description:
@@ -1118,10 +1142,10 @@ packages:
11181142
dependency: transitive
11191143
description:
11201144
name: vm_service
1121-
sha256: a2662fb1f114f4296cf3f5a50786a2d888268d7776cf681aa17d660ffa23b246
1145+
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
11221146
url: "https://pub.dev"
11231147
source: hosted
1124-
version: "14.0.0"
1148+
version: "13.0.0"
11251149
wakelock:
11261150
dependency: "direct main"
11271151
description:
@@ -1174,10 +1198,10 @@ packages:
11741198
dependency: transitive
11751199
description:
11761200
name: web
1177-
sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
1201+
sha256: "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05"
11781202
url: "https://pub.dev"
11791203
source: hosted
1180-
version: "0.3.0"
1204+
version: "0.4.2"
11811205
win32:
11821206
dependency: transitive
11831207
description:
@@ -1219,5 +1243,5 @@ packages:
12191243
source: hosted
12201244
version: "3.1.2"
12211245
sdks:
1222-
dart: ">=3.2.0 <4.0.0"
1246+
dart: ">=3.3.0-279.1.beta <4.0.0"
12231247
flutter: ">=3.16.0"

0 commit comments

Comments
 (0)