Skip to content

Commit 32dee5e

Browse files
committed
# Conflicts: # README.md
2 parents 4ebda71 + b4d625e commit 32dee5e

File tree

389 files changed

+4863
-3879
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

389 files changed

+4863
-3879
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider","path":"/Users/brandonsneider/.pub-cache/hosted/pub.dartlang.org/path_provider-0.5.0+1/","dependencies":[]},{"name":"sqflite","path":"/Users/brandonsneider/.pub-cache/hosted/pub.dartlang.org/sqflite-1.1.2/","dependencies":[]}],"android":[{"name":"path_provider","path":"/Users/brandonsneider/.pub-cache/hosted/pub.dartlang.org/path_provider-0.5.0+1/","dependencies":[]},{"name":"sqflite","path":"/Users/brandonsneider/.pub-cache/hosted/pub.dartlang.org/sqflite-1.1.2/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":[]},{"name":"sqflite","dependencies":[]}],"date_created":"2020-06-18 21:49:04.552095","version":"1.20.0-0.0.pre"}

001-tik_tok_ui/final/pubspec.lock

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
# Generated by pub
2-
# See https://www.dartlang.org/tools/pub/glossary#lockfile
2+
# See https://dart.dev/tools/pub/glossary#lockfile
33
packages:
44
async:
55
dependency: transitive
66
description:
77
name: async
88
url: "https://pub.dartlang.org"
99
source: hosted
10-
version: "2.0.8"
10+
version: "2.4.1"
1111
boolean_selector:
1212
dependency: transitive
1313
description:
1414
name: boolean_selector
1515
url: "https://pub.dartlang.org"
1616
source: hosted
17-
version: "1.0.4"
17+
version: "2.0.0"
1818
cached_network_image:
1919
dependency: "direct main"
2020
description:
@@ -28,14 +28,21 @@ packages:
2828
name: charcode
2929
url: "https://pub.dartlang.org"
3030
source: hosted
31-
version: "1.1.2"
31+
version: "1.1.3"
32+
clock:
33+
dependency: transitive
34+
description:
35+
name: clock
36+
url: "https://pub.dartlang.org"
37+
source: hosted
38+
version: "1.0.1"
3239
collection:
3340
dependency: transitive
3441
description:
3542
name: collection
3643
url: "https://pub.dartlang.org"
3744
source: hosted
38-
version: "1.14.11"
45+
version: "1.14.12"
3946
convert:
4047
dependency: transitive
4148
description:
@@ -56,7 +63,14 @@ packages:
5663
name: cupertino_icons
5764
url: "https://pub.dartlang.org"
5865
source: hosted
59-
version: "0.1.2"
66+
version: "0.1.3"
67+
fake_async:
68+
dependency: transitive
69+
description:
70+
name: fake_async
71+
url: "https://pub.dartlang.org"
72+
source: hosted
73+
version: "1.1.0"
6074
flutter:
6175
dependency: "direct main"
6276
description: flutter
@@ -80,7 +94,7 @@ packages:
8094
name: http
8195
url: "https://pub.dartlang.org"
8296
source: hosted
83-
version: "0.12.0+1"
97+
version: "0.12.1"
8498
http_parser:
8599
dependency: transitive
86100
description:
@@ -94,21 +108,21 @@ packages:
94108
name: matcher
95109
url: "https://pub.dartlang.org"
96110
source: hosted
97-
version: "0.12.3+1"
111+
version: "0.12.6"
98112
meta:
99113
dependency: transitive
100114
description:
101115
name: meta
102116
url: "https://pub.dartlang.org"
103117
source: hosted
104-
version: "1.1.6"
118+
version: "1.1.8"
105119
path:
106120
dependency: transitive
107121
description:
108122
name: path
109123
url: "https://pub.dartlang.org"
110124
source: hosted
111-
version: "1.6.2"
125+
version: "1.7.0"
112126
path_provider:
113127
dependency: transitive
114128
description:
@@ -122,14 +136,7 @@ packages:
122136
name: pedantic
123137
url: "https://pub.dartlang.org"
124138
source: hosted
125-
version: "1.5.0"
126-
quiver:
127-
dependency: transitive
128-
description:
129-
name: quiver
130-
url: "https://pub.dartlang.org"
131-
source: hosted
132-
version: "2.0.1"
139+
version: "1.9.0"
133140
sky_engine:
134141
dependency: transitive
135142
description: flutter
@@ -141,7 +148,7 @@ packages:
141148
name: source_span
142149
url: "https://pub.dartlang.org"
143150
source: hosted
144-
version: "1.5.5"
151+
version: "1.7.0"
145152
sqflite:
146153
dependency: transitive
147154
description:
@@ -162,14 +169,14 @@ packages:
162169
name: stream_channel
163170
url: "https://pub.dartlang.org"
164171
source: hosted
165-
version: "1.6.8"
172+
version: "2.0.0"
166173
string_scanner:
167174
dependency: transitive
168175
description:
169176
name: string_scanner
170177
url: "https://pub.dartlang.org"
171178
source: hosted
172-
version: "1.0.4"
179+
version: "1.0.5"
173180
synchronized:
174181
dependency: transitive
175182
description:
@@ -190,7 +197,7 @@ packages:
190197
name: test_api
191198
url: "https://pub.dartlang.org"
192199
source: hosted
193-
version: "0.2.2"
200+
version: "0.2.16"
194201
typed_data:
195202
dependency: transitive
196203
description:
@@ -213,5 +220,5 @@ packages:
213220
source: hosted
214221
version: "2.0.8"
215222
sdks:
216-
dart: ">=2.1.1-dev.0.0 <3.0.0"
223+
dart: ">=2.7.0 <3.0.0"
217224
flutter: ">=1.2.1 <2.0.0"

001-tik_tok_ui/final/pubspec.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,26 @@ description: A new Flutter project.
1414
version: 1.0.0+1
1515

1616
environment:
17-
sdk: ">=2.1.0 <3.0.0"
17+
sdk: ">=2.2.2 <3.0.0"
1818

1919
dependencies:
2020
flutter:
2121
sdk: flutter
2222

2323
# The following adds the Cupertino Icons font to your application.
2424
# Use with the CupertinoIcons class for iOS style icons.
25-
cupertino_icons: ^0.1.2
25+
cupertino_icons: ^0.1.3
2626
cached_network_image: 0.7.0
2727

2828
dev_dependencies:
2929
flutter_test:
3030
sdk: flutter
3131

32-
3332
# For information on the generic Dart part of this file, see the
3433
# following page: https://www.dartlang.org/tools/pub/pubspec
3534

3635
# The following section is specific to Flutter.
3736
flutter:
38-
3937
# The following line ensures that the Material Icons font is
4038
# included with your application, so that you can use the icons in
4139
# the material Icons class.
@@ -58,9 +56,9 @@ flutter:
5856
# list giving the asset and other descriptors for the font. For
5957
# example:
6058
fonts:
61-
- family: TikTokIcons
59+
- family: TikTokIcons
6260
fonts:
63-
- asset: assets/fonts/TikTokIcons.ttf
61+
- asset: assets/fonts/TikTokIcons.ttf
6462
# fonts:
6563
# - family: Schyler
6664
# fonts:
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"path_provider","path":"/Users/brandonsneider/.pub-cache/hosted/pub.dartlang.org/path_provider-0.5.0+1/","dependencies":[]},{"name":"sqflite","path":"/Users/brandonsneider/.pub-cache/hosted/pub.dartlang.org/sqflite-1.1.2/","dependencies":[]}],"android":[{"name":"path_provider","path":"/Users/brandonsneider/.pub-cache/hosted/pub.dartlang.org/path_provider-0.5.0+1/","dependencies":[]},{"name":"sqflite","path":"/Users/brandonsneider/.pub-cache/hosted/pub.dartlang.org/sqflite-1.1.2/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"path_provider","dependencies":[]},{"name":"sqflite","dependencies":[]}],"date_created":"2020-06-18 21:49:06.052206","version":"1.20.0-0.0.pre"}

001-tik_tok_ui/phase1/pubspec.lock

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
# Generated by pub
2-
# See https://www.dartlang.org/tools/pub/glossary#lockfile
2+
# See https://dart.dev/tools/pub/glossary#lockfile
33
packages:
44
async:
55
dependency: transitive
66
description:
77
name: async
88
url: "https://pub.dartlang.org"
99
source: hosted
10-
version: "2.0.8"
10+
version: "2.4.1"
1111
boolean_selector:
1212
dependency: transitive
1313
description:
1414
name: boolean_selector
1515
url: "https://pub.dartlang.org"
1616
source: hosted
17-
version: "1.0.4"
17+
version: "2.0.0"
1818
cached_network_image:
1919
dependency: "direct main"
2020
description:
@@ -28,14 +28,21 @@ packages:
2828
name: charcode
2929
url: "https://pub.dartlang.org"
3030
source: hosted
31-
version: "1.1.2"
31+
version: "1.1.3"
32+
clock:
33+
dependency: transitive
34+
description:
35+
name: clock
36+
url: "https://pub.dartlang.org"
37+
source: hosted
38+
version: "1.0.1"
3239
collection:
3340
dependency: transitive
3441
description:
3542
name: collection
3643
url: "https://pub.dartlang.org"
3744
source: hosted
38-
version: "1.14.11"
45+
version: "1.14.12"
3946
convert:
4047
dependency: transitive
4148
description:
@@ -56,7 +63,14 @@ packages:
5663
name: cupertino_icons
5764
url: "https://pub.dartlang.org"
5865
source: hosted
59-
version: "0.1.2"
66+
version: "0.1.3"
67+
fake_async:
68+
dependency: transitive
69+
description:
70+
name: fake_async
71+
url: "https://pub.dartlang.org"
72+
source: hosted
73+
version: "1.1.0"
6074
flutter:
6175
dependency: "direct main"
6276
description: flutter
@@ -80,7 +94,7 @@ packages:
8094
name: http
8195
url: "https://pub.dartlang.org"
8296
source: hosted
83-
version: "0.12.0+1"
97+
version: "0.12.1"
8498
http_parser:
8599
dependency: transitive
86100
description:
@@ -94,21 +108,21 @@ packages:
94108
name: matcher
95109
url: "https://pub.dartlang.org"
96110
source: hosted
97-
version: "0.12.3+1"
111+
version: "0.12.6"
98112
meta:
99113
dependency: transitive
100114
description:
101115
name: meta
102116
url: "https://pub.dartlang.org"
103117
source: hosted
104-
version: "1.1.6"
118+
version: "1.1.8"
105119
path:
106120
dependency: transitive
107121
description:
108122
name: path
109123
url: "https://pub.dartlang.org"
110124
source: hosted
111-
version: "1.6.2"
125+
version: "1.7.0"
112126
path_provider:
113127
dependency: transitive
114128
description:
@@ -122,14 +136,7 @@ packages:
122136
name: pedantic
123137
url: "https://pub.dartlang.org"
124138
source: hosted
125-
version: "1.5.0"
126-
quiver:
127-
dependency: transitive
128-
description:
129-
name: quiver
130-
url: "https://pub.dartlang.org"
131-
source: hosted
132-
version: "2.0.1"
139+
version: "1.9.0"
133140
sky_engine:
134141
dependency: transitive
135142
description: flutter
@@ -141,7 +148,7 @@ packages:
141148
name: source_span
142149
url: "https://pub.dartlang.org"
143150
source: hosted
144-
version: "1.5.5"
151+
version: "1.7.0"
145152
sqflite:
146153
dependency: transitive
147154
description:
@@ -162,14 +169,14 @@ packages:
162169
name: stream_channel
163170
url: "https://pub.dartlang.org"
164171
source: hosted
165-
version: "1.6.8"
172+
version: "2.0.0"
166173
string_scanner:
167174
dependency: transitive
168175
description:
169176
name: string_scanner
170177
url: "https://pub.dartlang.org"
171178
source: hosted
172-
version: "1.0.4"
179+
version: "1.0.5"
173180
synchronized:
174181
dependency: transitive
175182
description:
@@ -190,7 +197,7 @@ packages:
190197
name: test_api
191198
url: "https://pub.dartlang.org"
192199
source: hosted
193-
version: "0.2.2"
200+
version: "0.2.16"
194201
typed_data:
195202
dependency: transitive
196203
description:
@@ -213,5 +220,5 @@ packages:
213220
source: hosted
214221
version: "2.0.8"
215222
sdks:
216-
dart: ">=2.1.1-dev.0.0 <3.0.0"
223+
dart: ">=2.7.0 <3.0.0"
217224
flutter: ">=1.2.1 <2.0.0"

0 commit comments

Comments
 (0)