Skip to content

Commit 20ed30c

Browse files
committed
✨ 更新到 Flutter2.0
1 parent 9f1b7b8 commit 20ed30c

File tree

9 files changed

+50
-49
lines changed

9 files changed

+50
-49
lines changed

android/app/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ android {
5454

5555
signingConfigs {
5656
release {
57-
// keyAlias keystoreProperties['keyAlias']
58-
// keyPassword keystoreProperties['keyPassword']
59-
// storeFile file(keystoreProperties['storeFile'])
60-
// storePassword keystoreProperties['storePassword']
57+
keyAlias keystoreProperties['keyAlias']
58+
keyPassword keystoreProperties['keyPassword']
59+
storeFile file(keystoreProperties['storeFile'])
60+
storePassword keystoreProperties['storePassword']
6161
}
6262
}
6363
buildTypes {

android/app/src/main/AndroidManifest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<application
1414
android:name="io.flutter.app.FlutterApplication"
1515
android:label="FlutterUnit"
16+
android:usesCleartextTraffic="true"
1617
android:icon="@mipmap/logo">
1718
<activity
1819
android:name=".MainActivity"

android/key.properties

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
storePassword=toly1994
2+
keyPassword=toly1994328
3+
keyAlias=toly
4+
storeFile=/Volumes/coder/release/toly.jks

ios/Podfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ EXTERNAL SOURCES:
5151

5252
SPEC CHECKSUMS:
5353
connectivity: c4130b2985d4ef6fd26f9702e886bd5260681467
54-
Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
54+
Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
5555
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
5656
path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
5757
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
@@ -62,4 +62,4 @@ SPEC CHECKSUMS:
6262

6363
PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
6464

65-
COCOAPODS: 1.8.4
65+
COCOAPODS: 1.10.0

ios/Runner.xcodeproj/project.pbxproj

+4-21
Original file line numberDiff line numberDiff line change
@@ -253,29 +253,12 @@
253253
buildActionMask = 2147483647;
254254
files = (
255255
);
256-
inputPaths = (
257-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
258-
"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
259-
"${PODS_ROOT}/../Flutter/Flutter.framework",
260-
"${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework",
261-
"${BUILT_PRODUCTS_DIR}/connectivity/connectivity.framework",
262-
"${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework",
263-
"${BUILT_PRODUCTS_DIR}/share/share.framework",
264-
"${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework",
265-
"${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework",
266-
"${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework",
256+
inputFileListPaths = (
257+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
267258
);
268259
name = "[CP] Embed Pods Frameworks";
269-
outputPaths = (
270-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework",
271-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
272-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
273-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity.framework",
274-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework",
275-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/share.framework",
276-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework",
277-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework",
278-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework",
260+
outputFileListPaths = (
261+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
279262
);
280263
runOnlyForDeploymentPostprocessing = 0;
281264
shellPath = /bin/sh;

ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ios/Runner/Info.plist

+6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
4+
45
<dict>
6+
<key>NSAppTransportSecurity</key>
7+
<dict>
8+
<key>NSAllowsArbitraryLoads</key>
9+
<true/>
10+
</dict>
511
<key>CFBundleDevelopmentRegion</key>
612
<string>$(DEVELOPMENT_LANGUAGE)</string>
713
<key>CFBundleExecutable</key>
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/Users/a1/.pub-cache/hosted/pub.flutter-io.cn/path_provider_linux-0.0.1+2/
1+
/Volumes/coder/SDK/st_flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_linux-0.0.1+2/

pubspec.lock

+27-20
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ packages:
1414
name: async
1515
url: "https://pub.flutter-io.cn"
1616
source: hosted
17-
version: "2.5.0-nullsafety.1"
17+
version: "2.5.0"
1818
bloc:
1919
dependency: transitive
2020
description:
@@ -28,35 +28,35 @@ packages:
2828
name: boolean_selector
2929
url: "https://pub.flutter-io.cn"
3030
source: hosted
31-
version: "2.1.0-nullsafety.1"
31+
version: "2.1.0"
3232
characters:
3333
dependency: transitive
3434
description:
3535
name: characters
3636
url: "https://pub.flutter-io.cn"
3737
source: hosted
38-
version: "1.1.0-nullsafety.3"
38+
version: "1.1.0"
3939
charcode:
4040
dependency: transitive
4141
description:
4242
name: charcode
4343
url: "https://pub.flutter-io.cn"
4444
source: hosted
45-
version: "1.2.0-nullsafety.1"
45+
version: "1.2.0"
4646
clock:
4747
dependency: transitive
4848
description:
4949
name: clock
5050
url: "https://pub.flutter-io.cn"
5151
source: hosted
52-
version: "1.1.0-nullsafety.1"
52+
version: "1.1.0"
5353
collection:
5454
dependency: transitive
5555
description:
5656
name: collection
5757
url: "https://pub.flutter-io.cn"
5858
source: hosted
59-
version: "1.15.0-nullsafety.3"
59+
version: "1.15.0"
6060
connectivity:
6161
dependency: "direct main"
6262
description:
@@ -105,7 +105,7 @@ packages:
105105
name: fake_async
106106
url: "https://pub.flutter-io.cn"
107107
source: hosted
108-
version: "1.2.0-nullsafety.1"
108+
version: "1.2.0"
109109
file:
110110
dependency: transitive
111111
description:
@@ -170,6 +170,13 @@ packages:
170170
url: "https://pub.flutter-io.cn"
171171
source: hosted
172172
version: "0.16.1"
173+
js:
174+
dependency: transitive
175+
description:
176+
name: js
177+
url: "https://pub.flutter-io.cn"
178+
source: hosted
179+
version: "0.6.3"
173180
jwt_decoder:
174181
dependency: "direct main"
175182
description:
@@ -190,14 +197,14 @@ packages:
190197
name: matcher
191198
url: "https://pub.flutter-io.cn"
192199
source: hosted
193-
version: "0.12.10-nullsafety.1"
200+
version: "0.12.10"
194201
meta:
195202
dependency: transitive
196203
description:
197204
name: meta
198205
url: "https://pub.flutter-io.cn"
199206
source: hosted
200-
version: "1.3.0-nullsafety.3"
207+
version: "1.3.0"
201208
nested:
202209
dependency: transitive
203210
description:
@@ -211,7 +218,7 @@ packages:
211218
name: path
212219
url: "https://pub.flutter-io.cn"
213220
source: hosted
214-
version: "1.8.0-nullsafety.1"
221+
version: "1.8.0"
215222
path_provider:
216223
dependency: "direct main"
217224
description:
@@ -314,7 +321,7 @@ packages:
314321
name: source_span
315322
url: "https://pub.flutter-io.cn"
316323
source: hosted
317-
version: "1.8.0-nullsafety.2"
324+
version: "1.8.0"
318325
sqflite:
319326
dependency: "direct main"
320327
description:
@@ -335,21 +342,21 @@ packages:
335342
name: stack_trace
336343
url: "https://pub.flutter-io.cn"
337344
source: hosted
338-
version: "1.10.0-nullsafety.1"
345+
version: "1.10.0"
339346
stream_channel:
340347
dependency: transitive
341348
description:
342349
name: stream_channel
343350
url: "https://pub.flutter-io.cn"
344351
source: hosted
345-
version: "2.1.0-nullsafety.1"
352+
version: "2.1.0"
346353
string_scanner:
347354
dependency: transitive
348355
description:
349356
name: string_scanner
350357
url: "https://pub.flutter-io.cn"
351358
source: hosted
352-
version: "1.1.0-nullsafety.1"
359+
version: "1.1.0"
353360
synchronized:
354361
dependency: transitive
355362
description:
@@ -363,14 +370,14 @@ packages:
363370
name: term_glyph
364371
url: "https://pub.flutter-io.cn"
365372
source: hosted
366-
version: "1.2.0-nullsafety.1"
373+
version: "1.2.0"
367374
test_api:
368375
dependency: transitive
369376
description:
370377
name: test_api
371378
url: "https://pub.flutter-io.cn"
372379
source: hosted
373-
version: "0.2.19-nullsafety.2"
380+
version: "0.2.19"
374381
toggle_rotate:
375382
dependency: "direct main"
376383
description:
@@ -384,7 +391,7 @@ packages:
384391
name: typed_data
385392
url: "https://pub.flutter-io.cn"
386393
source: hosted
387-
version: "1.3.0-nullsafety.3"
394+
version: "1.3.0"
388395
url_launcher:
389396
dependency: "direct main"
390397
description:
@@ -419,7 +426,7 @@ packages:
419426
name: vector_math
420427
url: "https://pub.flutter-io.cn"
421428
source: hosted
422-
version: "2.1.0-nullsafety.3"
429+
version: "2.1.0"
423430
xdg_directories:
424431
dependency: transitive
425432
description:
@@ -428,5 +435,5 @@ packages:
428435
source: hosted
429436
version: "0.1.0"
430437
sdks:
431-
dart: ">=2.10.0-110 <2.11.0"
432-
flutter: ">=1.17.0 <2.0.0"
438+
dart: ">=2.12.0-0.0 <3.0.0"
439+
flutter: ">=1.17.0"

0 commit comments

Comments
 (0)