Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 2939647

Browse files
singhtaranjeetsinghtaranjeet
authoredOct 14, 2023
feat(dependency): upgrade dependencies and fix android example app (#48)
* feat(dependency): upgrade dependencies and fix android example app Signed-off-by: Taranjeet Singh <[email protected]> * feat(version): use <4.0.0 instead of 3.1.0 Signed-off-by: Taranjeet Singh <[email protected]> --------- Signed-off-by: Taranjeet Singh <[email protected]>
1 parent b3e4205 commit 2939647

12 files changed

+160
-122
lines changed
 

‎example/android/app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
2626
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2727

2828
android {
29-
compileSdkVersion 30
29+
compileSdkVersion 31
3030

3131
sourceSets {
3232
main.java.srcDirs += 'src/main/kotlin'

‎example/android/app/src/main/java/com/example/example/MainActivity.java

-13
This file was deleted.

‎example/android/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
buildscript {
2-
ext.kotlin_version = '1.3.50'
2+
ext.kotlin_version = '1.7.10'
33
repositories {
44
google()
55
jcenter()
66
}
77

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.0'
9+
classpath 'com.android.tools.build:gradle:4.2.0'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
}
1212
}
@@ -26,6 +26,6 @@ subprojects {
2626
project.evaluationDependsOn(':app')
2727
}
2828

29-
task clean(type: Delete) {
29+
tasks.register("clean", Delete) {
3030
delete rootProject.buildDir
3131
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
6+
distributionUrl=https://services.gradle.org/distributions/gradle-6.9-all.zip

‎example/lib/main.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class RootPage extends StatelessWidget {
5050
appBar: AppBar(
5151
title: Text("Table Widget"),
5252
actions: [
53-
FlatButton(
53+
TextButton(
5454
child: Text(
5555
"TEST LIVE",
5656
style: TextStyle(

‎example/linux/flutter/generated_plugin_registrant.cc

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// Generated file. Do not edit.
33
//
44

5+
// clang-format off
6+
57
#include "generated_plugin_registrant.h"
68

79

‎example/linux/flutter/generated_plugin_registrant.h

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// Generated file. Do not edit.
33
//
44

5+
// clang-format off
6+
57
#ifndef GENERATED_PLUGIN_REGISTRANT_
68
#define GENERATED_PLUGIN_REGISTRANT_
79

‎example/linux/flutter/generated_plugins.cmake

+8
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
list(APPEND FLUTTER_PLUGIN_LIST
66
)
77

8+
list(APPEND FLUTTER_FFI_PLUGIN_LIST
9+
)
10+
811
set(PLUGIN_BUNDLED_LIBRARIES)
912

1013
foreach(plugin ${FLUTTER_PLUGIN_LIST})
@@ -13,3 +16,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
1316
list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
1417
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
1518
endforeach(plugin)
19+
20+
foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
21+
add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
22+
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
23+
endforeach(ffi_plugin)

‎example/pubspec.lock

+73-52
Original file line numberDiff line numberDiff line change
@@ -5,58 +5,58 @@ packages:
55
dependency: transitive
66
description:
77
name: async
8-
url: "https://pub.dartlang.org"
8+
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
9+
url: "https://pub.dev"
910
source: hosted
10-
version: "2.5.0"
11+
version: "2.11.0"
1112
boolean_selector:
1213
dependency: transitive
1314
description:
1415
name: boolean_selector
15-
url: "https://pub.dartlang.org"
16+
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
17+
url: "https://pub.dev"
1618
source: hosted
17-
version: "2.1.0"
19+
version: "2.1.1"
1820
characters:
1921
dependency: transitive
2022
description:
2123
name: characters
22-
url: "https://pub.dartlang.org"
24+
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
25+
url: "https://pub.dev"
2326
source: hosted
24-
version: "1.1.0"
25-
charcode:
26-
dependency: transitive
27-
description:
28-
name: charcode
29-
url: "https://pub.dartlang.org"
30-
source: hosted
31-
version: "1.2.0"
27+
version: "1.3.0"
3228
clock:
3329
dependency: transitive
3430
description:
3531
name: clock
36-
url: "https://pub.dartlang.org"
32+
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
33+
url: "https://pub.dev"
3734
source: hosted
38-
version: "1.1.0"
35+
version: "1.1.1"
3936
collection:
4037
dependency: transitive
4138
description:
4239
name: collection
43-
url: "https://pub.dartlang.org"
40+
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
41+
url: "https://pub.dev"
4442
source: hosted
45-
version: "1.15.0"
43+
version: "1.17.2"
4644
cupertino_icons:
4745
dependency: "direct main"
4846
description:
4947
name: cupertino_icons
50-
url: "https://pub.dartlang.org"
48+
sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
49+
url: "https://pub.dev"
5150
source: hosted
52-
version: "1.0.2"
51+
version: "1.0.6"
5352
fake_async:
5453
dependency: transitive
5554
description:
5655
name: fake_async
57-
url: "https://pub.dartlang.org"
56+
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
57+
url: "https://pub.dev"
5858
source: hosted
59-
version: "1.2.0"
59+
version: "1.3.1"
6060
flutter:
6161
dependency: "direct main"
6262
description: flutter
@@ -71,9 +71,10 @@ packages:
7171
dependency: "direct main"
7272
description:
7373
name: intl
74-
url: "https://pub.dartlang.org"
74+
sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
75+
url: "https://pub.dev"
7576
source: hosted
76-
version: "0.17.0"
77+
version: "0.18.1"
7778
json_table:
7879
dependency: "direct main"
7980
description:
@@ -85,30 +86,42 @@ packages:
8586
dependency: transitive
8687
description:
8788
name: matcher
88-
url: "https://pub.dartlang.org"
89+
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
90+
url: "https://pub.dev"
8991
source: hosted
90-
version: "0.12.10"
92+
version: "0.12.16"
93+
material_color_utilities:
94+
dependency: transitive
95+
description:
96+
name: material_color_utilities
97+
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
98+
url: "https://pub.dev"
99+
source: hosted
100+
version: "0.5.0"
91101
meta:
92102
dependency: transitive
93103
description:
94104
name: meta
95-
url: "https://pub.dartlang.org"
105+
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
106+
url: "https://pub.dev"
96107
source: hosted
97-
version: "1.3.0"
108+
version: "1.9.1"
98109
path:
99110
dependency: transitive
100111
description:
101112
name: path
102-
url: "https://pub.dartlang.org"
113+
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
114+
url: "https://pub.dev"
103115
source: hosted
104-
version: "1.8.0"
116+
version: "1.8.3"
105117
rxdart:
106118
dependency: "direct main"
107119
description:
108120
name: rxdart
109-
url: "https://pub.dartlang.org"
121+
sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb"
122+
url: "https://pub.dev"
110123
source: hosted
111-
version: "0.26.0"
124+
version: "0.27.7"
112125
sky_engine:
113126
dependency: transitive
114127
description: flutter
@@ -118,57 +131,65 @@ packages:
118131
dependency: transitive
119132
description:
120133
name: source_span
121-
url: "https://pub.dartlang.org"
134+
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
135+
url: "https://pub.dev"
122136
source: hosted
123-
version: "1.8.0"
137+
version: "1.10.0"
124138
stack_trace:
125139
dependency: transitive
126140
description:
127141
name: stack_trace
128-
url: "https://pub.dartlang.org"
142+
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
143+
url: "https://pub.dev"
129144
source: hosted
130-
version: "1.10.0"
145+
version: "1.11.0"
131146
stream_channel:
132147
dependency: transitive
133148
description:
134149
name: stream_channel
135-
url: "https://pub.dartlang.org"
150+
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
151+
url: "https://pub.dev"
136152
source: hosted
137-
version: "2.1.0"
153+
version: "2.1.1"
138154
string_scanner:
139155
dependency: transitive
140156
description:
141157
name: string_scanner
142-
url: "https://pub.dartlang.org"
158+
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
159+
url: "https://pub.dev"
143160
source: hosted
144-
version: "1.1.0"
161+
version: "1.2.0"
145162
term_glyph:
146163
dependency: transitive
147164
description:
148165
name: term_glyph
149-
url: "https://pub.dartlang.org"
166+
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
167+
url: "https://pub.dev"
150168
source: hosted
151-
version: "1.2.0"
169+
version: "1.2.1"
152170
test_api:
153171
dependency: transitive
154172
description:
155173
name: test_api
156-
url: "https://pub.dartlang.org"
174+
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
175+
url: "https://pub.dev"
157176
source: hosted
158-
version: "0.2.19"
159-
typed_data:
177+
version: "0.6.0"
178+
vector_math:
160179
dependency: transitive
161180
description:
162-
name: typed_data
163-
url: "https://pub.dartlang.org"
181+
name: vector_math
182+
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
183+
url: "https://pub.dev"
164184
source: hosted
165-
version: "1.3.0"
166-
vector_math:
185+
version: "2.1.4"
186+
web:
167187
dependency: transitive
168188
description:
169-
name: vector_math
170-
url: "https://pub.dartlang.org"
189+
name: web
190+
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
191+
url: "https://pub.dev"
171192
source: hosted
172-
version: "2.1.0"
193+
version: "0.1.4-beta"
173194
sdks:
174-
dart: ">=2.12.0 <3.0.0"
195+
dart: ">=3.1.0-185.0.dev <4.0.0"

‎example/pubspec.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ description: A new Flutter project.
1414
version: 1.0.0+1
1515

1616
environment:
17-
sdk: '>=2.12.0 <3.0.0'
17+
sdk: '>=2.12.0 <4.0.0'
1818

1919
dependencies:
2020
flutter:
@@ -25,8 +25,8 @@ dependencies:
2525
cupertino_icons: ^1.0.2
2626
json_table:
2727
path: ../
28-
intl: ^0.17.0
29-
rxdart: ^0.26.0
28+
intl: ^0.18.1
29+
rxdart: ^0.27.7
3030

3131
dev_dependencies:
3232
flutter_test:
@@ -44,7 +44,7 @@ flutter:
4444
# the material Icons class.
4545
uses-material-design: true
4646
assets:
47-
- countries.json
47+
- assets/countries.json
4848
# To add assets to your application, add an assets section, like this:
4949
# assets:
5050
# - images/a_dot_burr.jpeg

‎pubspec.lock

+64-46
Original file line numberDiff line numberDiff line change
@@ -5,51 +5,50 @@ packages:
55
dependency: transitive
66
description:
77
name: async
8-
url: "https://pub.dartlang.org"
8+
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
9+
url: "https://pub.dev"
910
source: hosted
10-
version: "2.5.0"
11+
version: "2.11.0"
1112
boolean_selector:
1213
dependency: transitive
1314
description:
1415
name: boolean_selector
15-
url: "https://pub.dartlang.org"
16+
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
17+
url: "https://pub.dev"
1618
source: hosted
17-
version: "2.1.0"
19+
version: "2.1.1"
1820
characters:
1921
dependency: transitive
2022
description:
2123
name: characters
22-
url: "https://pub.dartlang.org"
24+
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
25+
url: "https://pub.dev"
2326
source: hosted
24-
version: "1.1.0"
25-
charcode:
26-
dependency: transitive
27-
description:
28-
name: charcode
29-
url: "https://pub.dartlang.org"
30-
source: hosted
31-
version: "1.2.0"
27+
version: "1.3.0"
3228
clock:
3329
dependency: transitive
3430
description:
3531
name: clock
36-
url: "https://pub.dartlang.org"
32+
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
33+
url: "https://pub.dev"
3734
source: hosted
38-
version: "1.1.0"
35+
version: "1.1.1"
3936
collection:
4037
dependency: transitive
4138
description:
4239
name: collection
43-
url: "https://pub.dartlang.org"
40+
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
41+
url: "https://pub.dev"
4442
source: hosted
45-
version: "1.15.0"
43+
version: "1.17.2"
4644
fake_async:
4745
dependency: transitive
4846
description:
4947
name: fake_async
50-
url: "https://pub.dartlang.org"
48+
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
49+
url: "https://pub.dev"
5150
source: hosted
52-
version: "1.2.0"
51+
version: "1.3.1"
5352
flutter:
5453
dependency: "direct main"
5554
description: flutter
@@ -64,23 +63,34 @@ packages:
6463
dependency: transitive
6564
description:
6665
name: matcher
67-
url: "https://pub.dartlang.org"
66+
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
67+
url: "https://pub.dev"
6868
source: hosted
69-
version: "0.12.10"
69+
version: "0.12.16"
70+
material_color_utilities:
71+
dependency: transitive
72+
description:
73+
name: material_color_utilities
74+
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
75+
url: "https://pub.dev"
76+
source: hosted
77+
version: "0.5.0"
7078
meta:
7179
dependency: transitive
7280
description:
7381
name: meta
74-
url: "https://pub.dartlang.org"
82+
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
83+
url: "https://pub.dev"
7584
source: hosted
76-
version: "1.3.0"
85+
version: "1.9.1"
7786
path:
7887
dependency: transitive
7988
description:
8089
name: path
81-
url: "https://pub.dartlang.org"
90+
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
91+
url: "https://pub.dev"
8292
source: hosted
83-
version: "1.8.0"
93+
version: "1.8.3"
8494
sky_engine:
8595
dependency: transitive
8696
description: flutter
@@ -90,57 +100,65 @@ packages:
90100
dependency: transitive
91101
description:
92102
name: source_span
93-
url: "https://pub.dartlang.org"
103+
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
104+
url: "https://pub.dev"
94105
source: hosted
95-
version: "1.8.0"
106+
version: "1.10.0"
96107
stack_trace:
97108
dependency: transitive
98109
description:
99110
name: stack_trace
100-
url: "https://pub.dartlang.org"
111+
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
112+
url: "https://pub.dev"
101113
source: hosted
102-
version: "1.10.0"
114+
version: "1.11.0"
103115
stream_channel:
104116
dependency: transitive
105117
description:
106118
name: stream_channel
107-
url: "https://pub.dartlang.org"
119+
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
120+
url: "https://pub.dev"
108121
source: hosted
109-
version: "2.1.0"
122+
version: "2.1.1"
110123
string_scanner:
111124
dependency: transitive
112125
description:
113126
name: string_scanner
114-
url: "https://pub.dartlang.org"
127+
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
128+
url: "https://pub.dev"
115129
source: hosted
116-
version: "1.1.0"
130+
version: "1.2.0"
117131
term_glyph:
118132
dependency: transitive
119133
description:
120134
name: term_glyph
121-
url: "https://pub.dartlang.org"
135+
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
136+
url: "https://pub.dev"
122137
source: hosted
123-
version: "1.2.0"
138+
version: "1.2.1"
124139
test_api:
125140
dependency: transitive
126141
description:
127142
name: test_api
128-
url: "https://pub.dartlang.org"
143+
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
144+
url: "https://pub.dev"
129145
source: hosted
130-
version: "0.2.19"
131-
typed_data:
146+
version: "0.6.0"
147+
vector_math:
132148
dependency: transitive
133149
description:
134-
name: typed_data
135-
url: "https://pub.dartlang.org"
150+
name: vector_math
151+
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
152+
url: "https://pub.dev"
136153
source: hosted
137-
version: "1.3.0"
138-
vector_math:
154+
version: "2.1.4"
155+
web:
139156
dependency: transitive
140157
description:
141-
name: vector_math
142-
url: "https://pub.dartlang.org"
158+
name: web
159+
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
160+
url: "https://pub.dev"
143161
source: hosted
144-
version: "2.1.0"
162+
version: "0.1.4-beta"
145163
sdks:
146-
dart: ">=2.12.0 <3.0.0"
164+
dart: ">=3.1.0-185.0.dev <4.0.0"

‎pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version: 2.0.1
44
homepage: https://github.com/apgapg/json_table
55

66
environment:
7-
sdk: '>=2.12.0 <3.0.0'
7+
sdk: '>=2.12.0 <4.0.0'
88

99
dependencies:
1010
flutter:

0 commit comments

Comments
 (0)
Please sign in to comment.