Skip to content

Commit 2112aea

Browse files
committed
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.

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.0.0
2+
3+
* Adds null safety. Refresh example app.
4+
15
## 0.1.9+4
26

37
* Fixed build failure

example/.gitignore

Lines changed: 13 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -22,52 +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/Flutter/flutter_export_environment.sh
65-
**/ios/ServiceDefinitions.json
66-
**/ios/Runner/GeneratedPluginRegistrant.*
37+
# Symbolication related
38+
app.*.symbols
6739

68-
# Exceptions to above rules.
69-
!**/ios/**/default.mode1v3
70-
!**/ios/**/default.mode2v3
71-
!**/ios/**/default.pbxuser
72-
!**/ios/**/default.perspectivev3
73-
!/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: cc949a8e8b9cf394b9290a8e80f87af3e207dce5
7+
revision: c5a4b4029c0798f37c4a39b479d7cb75daa7b05c
88
channel: stable
99

1010
project_type: app

example/android/.gitignore

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
gradle-wrapper.jar
2+
/.gradle
3+
/captures/
4+
/gradlew
5+
/gradlew.bat
6+
/local.properties
7+
GeneratedPluginRegistrant.java
8+
9+
# Remember to never publicly share your keystore.
10+
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
11+
key.properties

example/android/.project

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

example/android/.settings/org.eclipse.buildship.core.prefs

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

example/android/app/.classpath

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

example/android/app/.project

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

0 commit comments

Comments
 (0)