Skip to content

Commit 40427ef

Browse files
committed
Merge branch 'jonbhanson-master' into v1.0.0
2 parents 9f91fc1 + be91f6c commit 40427ef

File tree

84 files changed

+1229
-2175
lines changed

Some content is hidden

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

84 files changed

+1229
-2175
lines changed

.gitignore

Lines changed: 65 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,75 @@
1+
# Miscellaneous
2+
*.class
3+
*.log
4+
*.pyc
5+
*.swp
16
.DS_Store
27
.atom/
8+
.buildlog/
9+
.history
10+
.svn/
11+
12+
# IntelliJ related
13+
*.iml
14+
*.ipr
15+
*.iws
316
.idea/
4-
.vscode/
517

18+
# The .vscode folder contains launch configuration and tasks you configure in
19+
# VS Code which you may wish to be included in version control, so this line
20+
# is commented out by default.
21+
#.vscode/
22+
23+
# Flutter/Dart/Pub related
24+
**/doc/api/
25+
.dart_tool/
26+
.flutter-plugins
27+
.flutter-plugins-dependencies
628
.packages
29+
.pub-cache/
730
.pub/
8-
.dart_tool/
31+
build/
932
pubspec.lock
10-
flutter_export_environment.sh
11-
resources/
12-
examples/all_plugins/pubspec.yaml
13-
14-
Podfile
15-
Podfile.lock
16-
Pods/
17-
.symlinks/
18-
**/Flutter/App.framework/
19-
**/Flutter/Flutter.framework/
20-
**/Flutter/Generated.xcconfig
21-
**/Flutter/flutter_assets/
22-
ServiceDefinitions.json
23-
xcuserdata/
24-
*.xcworkspace
2533

26-
local.properties
27-
keystore.properties
28-
.gradle/
29-
gradlew
30-
gradlew.bat
31-
gradle-wrapper.jar
32-
.flutter-plugins-dependencies
33-
flutter_export_environment.sh
34-
*.iml
34+
# Android related
35+
**/android/**/gradle-wrapper.jar
36+
**/android/.gradle
37+
**/android/captures/
38+
**/android/gradlew
39+
**/android/gradlew.bat
40+
**/android/local.properties
41+
**/android/**/GeneratedPluginRegistrant.java
3542

36-
GeneratedPluginRegistrant.h
37-
GeneratedPluginRegistrant.m
38-
GeneratedPluginRegistrant.java
39-
build/
40-
.flutter-plugins
43+
# iOS/XCode related
44+
**/ios/**/*.mode1v3
45+
**/ios/**/*.mode2v3
46+
**/ios/**/*.moved-aside
47+
**/ios/**/*.pbxuser
48+
**/ios/**/*.perspectivev3
49+
**/ios/**/*sync/
50+
**/ios/**/.sconsign.dblite
51+
**/ios/**/.tags*
52+
**/ios/**/.vagrant/
53+
**/ios/**/DerivedData/
54+
**/ios/**/Icon?
55+
**/ios/**/Pods/
56+
**/ios/**/.symlinks/
57+
**/ios/**/profile
58+
**/ios/**/xcuserdata
59+
**/ios/.generated/
60+
**/ios/Flutter/App.framework
61+
**/ios/Flutter/Flutter.framework
62+
**/ios/Flutter/Flutter.podspec
63+
**/ios/Flutter/Generated.xcconfig
64+
**/ios/Flutter/app.flx
65+
**/ios/Flutter/app.zip
66+
**/ios/Flutter/flutter_assets/
67+
**/ios/Flutter/flutter_export_environment.sh
68+
**/ios/ServiceDefinitions.json
69+
**/ios/Runner/GeneratedPluginRegistrant.*
4170

42-
.project
43-
.classpath
44-
.settings
71+
# Exceptions to above rules.
72+
!**/ios/**/default.mode1v3
73+
!**/ios/**/default.mode2v3
74+
!**/ios/**/default.pbxuser
75+
!**/ios/**/default.perspectivev3

.idea/libraries/Dart_SDK.xml

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

.idea/libraries/Flutter_for_Android.xml

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

.idea/modules.xml

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

.idea/runConfigurations/example_lib_main_dart.xml

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

.idea/workspace.xml

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

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 1.0.0
2+
3+
* Adds null safety.
4+
* Refreshes the example app.
5+
* Updates .gitignore and removes files that should not be tracked.
6+
17
## 0.1.4
28

39
* Animate to bounds was added. (Thanks to @nghiashiyi)

apple_maps_flutter.iml

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

example/.gitignore

Lines changed: 13 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -22,51 +22,25 @@
2222

2323
# Flutter/Dart/Pub related
2424
**/doc/api/
25+
**/ios/Flutter/.last_build_id
2526
.dart_tool/
2627
.flutter-plugins
28+
.flutter-plugins-dependencies
2729
.packages
2830
.pub-cache/
2931
.pub/
3032
/build/
3133

32-
# Android related
33-
**/android/**/gradle-wrapper.jar
34-
**/android/.gradle
35-
**/android/captures/
36-
**/android/gradlew
37-
**/android/gradlew.bat
38-
**/android/local.properties
39-
**/android/**/GeneratedPluginRegistrant.java
34+
# Web related
35+
lib/generated_plugin_registrant.dart
4036

41-
# iOS/XCode related
42-
**/ios/**/*.mode1v3
43-
**/ios/**/*.mode2v3
44-
**/ios/**/*.moved-aside
45-
**/ios/**/*.pbxuser
46-
**/ios/**/*.perspectivev3
47-
**/ios/**/*sync/
48-
**/ios/**/.sconsign.dblite
49-
**/ios/**/.tags*
50-
**/ios/**/.vagrant/
51-
**/ios/**/DerivedData/
52-
**/ios/**/Icon?
53-
**/ios/**/Pods/
54-
**/ios/**/.symlinks/
55-
**/ios/**/profile
56-
**/ios/**/xcuserdata
57-
**/ios/.generated/
58-
**/ios/Flutter/App.framework
59-
**/ios/Flutter/Flutter.framework
60-
**/ios/Flutter/Generated.xcconfig
61-
**/ios/Flutter/app.flx
62-
**/ios/Flutter/app.zip
63-
**/ios/Flutter/flutter_assets/
64-
**/ios/ServiceDefinitions.json
65-
**/ios/Runner/GeneratedPluginRegistrant.*
37+
# Symbolication related
38+
app.*.symbols
6639

67-
# Exceptions to above rules.
68-
!**/ios/**/default.mode1v3
69-
!**/ios/**/default.mode2v3
70-
!**/ios/**/default.pbxuser
71-
!**/ios/**/default.perspectivev3
72-
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
40+
# Obfuscation related
41+
app.*.map.json
42+
43+
# Android Studio will place build artifacts here
44+
/android/app/debug
45+
/android/app/profile
46+
/android/app/release

example/.metadata

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: 20e59316b8b8474554b38493b8ca888794b0234a
7+
revision: c5a4b4029c0798f37c4a39b479d7cb75daa7b05c
88
channel: stable
99

1010
project_type: app

0 commit comments

Comments
 (0)