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 2112aea

Browse files
committedMar 28, 2021
Merge branch 'jonbhanson-master' into v1.0.0
2 parents 8861ca7 + fe1fc66 commit 2112aea

Some content is hidden

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

50 files changed

+497
-1008
lines changed
 

‎.gitignore

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
.buildlog/
99
.history
1010
.svn/
11-
resources/
1211

1312
# IntelliJ related
1413
*.iml
@@ -25,10 +24,12 @@ resources/
2524
**/doc/api/
2625
.dart_tool/
2726
.flutter-plugins
27+
.flutter-plugins-dependencies
2828
.packages
2929
.pub-cache/
3030
.pub/
3131
build/
32+
pubspec.lock
3233

3334
# Android related
3435
**/android/**/gradle-wrapper.jar
@@ -58,6 +59,7 @@ build/
5859
**/ios/.generated/
5960
**/ios/Flutter/App.framework
6061
**/ios/Flutter/Flutter.framework
62+
**/ios/Flutter/Flutter.podspec
6163
**/ios/Flutter/Generated.xcconfig
6264
**/ios/Flutter/app.flx
6365
**/ios/Flutter/app.zip
@@ -71,6 +73,3 @@ build/
7173
!**/ios/**/default.mode2v3
7274
!**/ios/**/default.pbxuser
7375
!**/ios/**/default.perspectivev3
74-
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
75-
example/.flutter-plugins-dependencies
76-
example/ios/Flutter/Flutter.podspec

‎.vscode/launch.json

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.