diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..cad7657d --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "cmake.configureOnOpen": false +} \ No newline at end of file diff --git a/analytics_integration/android/app/src/main/AndroidManifest.xml b/analytics_integration/android/app/src/main/AndroidManifest.xml index 6e2ef34c..e4be8162 100644 --- a/analytics_integration/android/app/src/main/AndroidManifest.xml +++ b/analytics_integration/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,11 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - - + + + diff --git a/custom_home_drawer/android/app/src/main/kotlin/com/example/custom_home_drawer/MainActivity.kt b/custom_home_drawer/android/app/src/main/kotlin/com/example/custom_home_drawer/MainActivity.kt deleted file mode 100644 index 10c92fe3..00000000 --- a/custom_home_drawer/android/app/src/main/kotlin/com/example/custom_home_drawer/MainActivity.kt +++ /dev/null @@ -1,6 +0,0 @@ -package github.nisrulz.custom_home_drawer - -import io.flutter.embedding.android.FlutterActivity - -class MainActivity: FlutterActivity() { -} diff --git a/dropdown_button/.dart_tool/package_config.json b/dropdown_button/.dart_tool/package_config.json index bb9fd126..487dd717 100644 --- a/dropdown_button/.dart_tool/package_config.json +++ b/dropdown_button/.dart_tool/package_config.json @@ -3,135 +3,129 @@ "packages": [ { "name": "async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "boolean_selector", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "characters", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "charcode", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "clock", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "collection", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "cupertino_icons", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.2", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "fake_async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "flutter_test", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter_test", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "matcher", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12", "packageUri": "lib/", "languageVersion": "2.12" }, + { + "name": "material_color_utilities", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5", + "packageUri": "lib/", + "languageVersion": "2.13" + }, { "name": "meta", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "path", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "sky_engine", - "rootUri": "file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "source_span", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "stack_trace", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "stream_channel", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "string_scanner", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "term_glyph", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "test_api", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "typed_data", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "vector_math", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "dropdown_button", @@ -140,7 +134,7 @@ "languageVersion": "2.10" } ], - "generated": "2021-07-25T18:35:22.037374Z", + "generated": "2022-10-22T19:11:19.381451Z", "generator": "pub", - "generatorVersion": "2.12.2" + "generatorVersion": "2.18.2" } diff --git a/dropdown_button/.dart_tool/package_config_subset b/dropdown_button/.dart_tool/package_config_subset index 15fb0680..09ab8fbb 100644 --- a/dropdown_button/.dart_tool/package_config_subset +++ b/dropdown_button/.dart_tool/package_config_subset @@ -1,93 +1,89 @@ +dropdown_button +2.10 +file:///Users/nishantsrivastava/Documents/github/flutter-examples/dropdown_button/ +file:///Users/nishantsrivastava/Documents/github/flutter-examples/dropdown_button/lib/ async -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/lib/ boolean_selector 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ characters 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/lib/ -charcode -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/lib/ clock 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/lib/ collection 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/lib/ cupertino_icons 2.0 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.2/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.2/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3/lib/ fake_async 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/lib/ matcher 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/lib/ +material_color_utilities +2.13 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/lib/ meta 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/lib/ path 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/lib/ source_span -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/lib/ stack_trace 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ stream_channel 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ string_scanner 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/lib/ term_glyph 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/lib/ test_api 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/lib/ -typed_data -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/lib/ vector_math -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/lib/ sky_engine 2.12 -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/ -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/lib/ flutter -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter/ -file:///home/zion/Documents/sdks/flutter/packages/flutter/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/lib/ flutter_test -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/ -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/lib/ -dropdown_button -2.10 -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/dropdown_button/ -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/dropdown_button/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/lib/ 2 diff --git a/dropdown_button/.dart_tool/version b/dropdown_button/.dart_tool/version index 26e33797..0163af7e 100644 --- a/dropdown_button/.dart_tool/version +++ b/dropdown_button/.dart_tool/version @@ -1 +1 @@ -2.0.4 \ No newline at end of file +3.3.5 \ No newline at end of file diff --git a/dropdown_button/android/.dart_tool/package_config.json b/dropdown_button/android/.dart_tool/package_config.json index c45f2e55..740ff030 100644 --- a/dropdown_button/android/.dart_tool/package_config.json +++ b/dropdown_button/android/.dart_tool/package_config.json @@ -3,135 +3,129 @@ "packages": [ { "name": "async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "boolean_selector", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "characters", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "charcode", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "clock", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "collection", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "cupertino_icons", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "fake_async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "flutter_test", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter_test", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "matcher", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12", "packageUri": "lib/", "languageVersion": "2.12" }, + { + "name": "material_color_utilities", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5", + "packageUri": "lib/", + "languageVersion": "2.13" + }, { "name": "meta", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "path", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "sky_engine", - "rootUri": "file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "source_span", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "stack_trace", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "stream_channel", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "string_scanner", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "term_glyph", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "test_api", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "typed_data", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "vector_math", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "android", @@ -140,7 +134,7 @@ "languageVersion": "2.10" } ], - "generated": "2021-07-25T18:44:23.492271Z", + "generated": "2022-10-22T18:57:22.194540Z", "generator": "pub", - "generatorVersion": "2.12.2" + "generatorVersion": "2.18.2" } diff --git a/dropdown_button/android/android/app/src/main/AndroidManifest.xml b/dropdown_button/android/android/app/src/main/AndroidManifest.xml index d5320878..eafa28cc 100644 --- a/dropdown_button/android/android/app/src/main/AndroidManifest.xml +++ b/dropdown_button/android/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,11 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - + diff --git a/dropdown_button/android/app/src/main/java/github/nisrulz/dropdownbutton/MainActivity.java b/dropdown_button/android/app/src/main/java/github/nisrulz/dropdownbutton/MainActivity.java deleted file mode 100644 index f06380f9..00000000 --- a/dropdown_button/android/app/src/main/java/github/nisrulz/dropdownbutton/MainActivity.java +++ /dev/null @@ -1,14 +0,0 @@ -package github.nisrulz.dropdownbutton; - -import android.os.Bundle; - -import io.flutter.app.FlutterActivity; -import io.flutter.plugins.GeneratedPluginRegistrant; - -public class MainActivity extends FlutterActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); - } -} diff --git a/dropdown_button/android/gradle/wrapper/gradle-wrapper.jar b/dropdown_button/android/gradle/wrapper/gradle-wrapper.jar index e708b1c0..249e5832 100644 Binary files a/dropdown_button/android/gradle/wrapper/gradle-wrapper.jar and b/dropdown_button/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/dropdown_button/android/gradle/wrapper/gradle-wrapper.properties b/dropdown_button/android/gradle/wrapper/gradle-wrapper.properties index 05679dc3..ae04661e 100644 --- a/dropdown_button/android/gradle/wrapper/gradle-wrapper.properties +++ b/dropdown_button/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/dropdown_button/android/gradlew b/dropdown_button/android/gradlew index 4f906e0c..a69d9cb6 100755 --- a/dropdown_button/android/gradlew +++ b/dropdown_button/android/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/dropdown_button/android/gradlew.bat b/dropdown_button/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/dropdown_button/android/gradlew.bat +++ b/dropdown_button/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/enabling_splash_screen/.dart_tool/package_config.json b/enabling_splash_screen/.dart_tool/package_config.json index 5b3629b0..92d2d1cc 100644 --- a/enabling_splash_screen/.dart_tool/package_config.json +++ b/enabling_splash_screen/.dart_tool/package_config.json @@ -3,135 +3,129 @@ "packages": [ { "name": "async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "boolean_selector", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "characters", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "charcode", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "clock", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "collection", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "cupertino_icons", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.2", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "fake_async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "flutter_test", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter_test", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "matcher", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12", "packageUri": "lib/", "languageVersion": "2.12" }, + { + "name": "material_color_utilities", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5", + "packageUri": "lib/", + "languageVersion": "2.13" + }, { "name": "meta", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "path", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "sky_engine", - "rootUri": "file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "source_span", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "stack_trace", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "stream_channel", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "string_scanner", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "term_glyph", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "test_api", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "typed_data", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "vector_math", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "enabling_splash_screen", @@ -140,7 +134,7 @@ "languageVersion": "2.10" } ], - "generated": "2021-07-25T18:35:23.420078Z", + "generated": "2022-10-22T19:11:22.878819Z", "generator": "pub", - "generatorVersion": "2.12.2" + "generatorVersion": "2.18.2" } diff --git a/enabling_splash_screen/.dart_tool/package_config_subset b/enabling_splash_screen/.dart_tool/package_config_subset index 4e0fd963..1f9b84a4 100644 --- a/enabling_splash_screen/.dart_tool/package_config_subset +++ b/enabling_splash_screen/.dart_tool/package_config_subset @@ -1,93 +1,89 @@ +enabling_splash_screen +2.10 +file:///Users/nishantsrivastava/Documents/github/flutter-examples/enabling_splash_screen/ +file:///Users/nishantsrivastava/Documents/github/flutter-examples/enabling_splash_screen/lib/ async -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/lib/ boolean_selector 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ characters 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/lib/ -charcode -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/lib/ clock 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/lib/ collection 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/lib/ cupertino_icons 2.0 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.2/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.2/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3/lib/ fake_async 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/lib/ matcher 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/lib/ +material_color_utilities +2.13 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/lib/ meta 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/lib/ path 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/lib/ source_span -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/lib/ stack_trace 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ stream_channel 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ string_scanner 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/lib/ term_glyph 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/lib/ test_api 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/lib/ -typed_data -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/lib/ vector_math -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/lib/ sky_engine 2.12 -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/ -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/lib/ flutter -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter/ -file:///home/zion/Documents/sdks/flutter/packages/flutter/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/lib/ flutter_test -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/ -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/lib/ -enabling_splash_screen -2.10 -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/enabling_splash_screen/ -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/enabling_splash_screen/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/lib/ 2 diff --git a/enabling_splash_screen/.dart_tool/version b/enabling_splash_screen/.dart_tool/version index 26e33797..0163af7e 100644 --- a/enabling_splash_screen/.dart_tool/version +++ b/enabling_splash_screen/.dart_tool/version @@ -1 +1 @@ -2.0.4 \ No newline at end of file +3.3.5 \ No newline at end of file diff --git a/enabling_splash_screen/android/.dart_tool/package_config.json b/enabling_splash_screen/android/.dart_tool/package_config.json index 76653385..1633f272 100644 --- a/enabling_splash_screen/android/.dart_tool/package_config.json +++ b/enabling_splash_screen/android/.dart_tool/package_config.json @@ -3,135 +3,129 @@ "packages": [ { "name": "async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "boolean_selector", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "characters", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "charcode", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "clock", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "collection", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "cupertino_icons", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "fake_async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "flutter_test", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter_test", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "matcher", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12", "packageUri": "lib/", "languageVersion": "2.12" }, + { + "name": "material_color_utilities", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5", + "packageUri": "lib/", + "languageVersion": "2.13" + }, { "name": "meta", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "path", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "sky_engine", - "rootUri": "file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "source_span", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "stack_trace", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "stream_channel", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "string_scanner", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "term_glyph", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "test_api", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "typed_data", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "vector_math", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "android", @@ -140,7 +134,7 @@ "languageVersion": "2.10" } ], - "generated": "2021-07-25T18:44:26.925321Z", + "generated": "2022-10-22T18:57:24.668152Z", "generator": "pub", - "generatorVersion": "2.12.2" + "generatorVersion": "2.18.2" } diff --git a/enabling_splash_screen/android/android/app/src/main/AndroidManifest.xml b/enabling_splash_screen/android/android/app/src/main/AndroidManifest.xml index d5320878..eafa28cc 100644 --- a/enabling_splash_screen/android/android/app/src/main/AndroidManifest.xml +++ b/enabling_splash_screen/android/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,11 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - + diff --git a/enabling_splash_screen/android/app/src/main/java/github/nisrulz/enablingsplashscreen/MainActivity.java b/enabling_splash_screen/android/app/src/main/java/github/nisrulz/enablingsplashscreen/MainActivity.java deleted file mode 100644 index c21547c4..00000000 --- a/enabling_splash_screen/android/app/src/main/java/github/nisrulz/enablingsplashscreen/MainActivity.java +++ /dev/null @@ -1,14 +0,0 @@ -package github.nisrulz.enablingsplashscreen; - -import android.os.Bundle; - -import io.flutter.app.FlutterActivity; -import io.flutter.plugins.GeneratedPluginRegistrant; - -public class MainActivity extends FlutterActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); - } -} diff --git a/enabling_splash_screen/android/gradle/wrapper/gradle-wrapper.jar b/enabling_splash_screen/android/gradle/wrapper/gradle-wrapper.jar index e708b1c0..249e5832 100644 Binary files a/enabling_splash_screen/android/gradle/wrapper/gradle-wrapper.jar and b/enabling_splash_screen/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/enabling_splash_screen/android/gradle/wrapper/gradle-wrapper.properties b/enabling_splash_screen/android/gradle/wrapper/gradle-wrapper.properties index 05679dc3..ae04661e 100644 --- a/enabling_splash_screen/android/gradle/wrapper/gradle-wrapper.properties +++ b/enabling_splash_screen/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/enabling_splash_screen/android/gradlew b/enabling_splash_screen/android/gradlew index 4f906e0c..a69d9cb6 100755 --- a/enabling_splash_screen/android/gradlew +++ b/enabling_splash_screen/android/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/enabling_splash_screen/android/gradlew.bat b/enabling_splash_screen/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/enabling_splash_screen/android/gradlew.bat +++ b/enabling_splash_screen/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/expense_planner/.dart_tool/package_config.json b/expense_planner/.dart_tool/package_config.json index d3be142f..26011fa0 100644 --- a/expense_planner/.dart_tool/package_config.json +++ b/expense_planner/.dart_tool/package_config.json @@ -3,141 +3,135 @@ "packages": [ { "name": "async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "boolean_selector", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "characters", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "charcode", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "clock", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "collection", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "cupertino_icons", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.2", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "fake_async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "flutter_test", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter_test", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "intl", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/intl-0.15.8", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/intl-0.15.8", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "matcher", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12", "packageUri": "lib/", "languageVersion": "2.12" }, + { + "name": "material_color_utilities", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5", + "packageUri": "lib/", + "languageVersion": "2.13" + }, { "name": "meta", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "path", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "sky_engine", - "rootUri": "file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "source_span", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "stack_trace", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "stream_channel", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "string_scanner", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "term_glyph", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "test_api", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "typed_data", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "vector_math", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "expense_planner", @@ -146,7 +140,7 @@ "languageVersion": "2.10" } ], - "generated": "2021-07-25T18:35:25.216233Z", + "generated": "2022-10-22T19:11:25.580679Z", "generator": "pub", - "generatorVersion": "2.12.2" + "generatorVersion": "2.18.2" } diff --git a/expense_planner/.dart_tool/package_config_subset b/expense_planner/.dart_tool/package_config_subset index 2b77540d..b300c230 100644 --- a/expense_planner/.dart_tool/package_config_subset +++ b/expense_planner/.dart_tool/package_config_subset @@ -1,97 +1,93 @@ +expense_planner +2.10 +file:///Users/nishantsrivastava/Documents/github/flutter-examples/expense_planner/ +file:///Users/nishantsrivastava/Documents/github/flutter-examples/expense_planner/lib/ async -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/lib/ boolean_selector 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ characters 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/lib/ -charcode -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/lib/ clock 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/lib/ collection 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/lib/ cupertino_icons 2.0 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.2/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.2/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3/lib/ fake_async 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/lib/ intl 2.0 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/intl-0.15.8/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/intl-0.15.8/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/intl-0.15.8/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/intl-0.15.8/lib/ matcher 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/lib/ +material_color_utilities +2.13 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/lib/ meta 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/lib/ path 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/lib/ source_span -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/lib/ stack_trace 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ stream_channel 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ string_scanner 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/lib/ term_glyph 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/lib/ test_api 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/lib/ -typed_data -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/lib/ vector_math -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/lib/ sky_engine 2.12 -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/ -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/lib/ flutter -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter/ -file:///home/zion/Documents/sdks/flutter/packages/flutter/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/lib/ flutter_test -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/ -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/lib/ -expense_planner -2.10 -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/expense_planner/ -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/expense_planner/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/lib/ 2 diff --git a/expense_planner/.dart_tool/version b/expense_planner/.dart_tool/version index 26e33797..0163af7e 100644 --- a/expense_planner/.dart_tool/version +++ b/expense_planner/.dart_tool/version @@ -1 +1 @@ -2.0.4 \ No newline at end of file +3.3.5 \ No newline at end of file diff --git a/expense_planner/android/android/app/src/main/AndroidManifest.xml b/expense_planner/android/android/app/src/main/AndroidManifest.xml index d5320878..eafa28cc 100644 --- a/expense_planner/android/android/app/src/main/AndroidManifest.xml +++ b/expense_planner/android/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,11 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - + diff --git a/expense_planner/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java b/expense_planner/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java deleted file mode 100644 index d007606a..00000000 --- a/expense_planner/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java +++ /dev/null @@ -1,23 +0,0 @@ -package io.flutter.plugins; - -import io.flutter.plugin.common.PluginRegistry; - -/** - * Generated file. Do not edit. - */ -public final class GeneratedPluginRegistrant { - public static void registerWith(PluginRegistry registry) { - if (alreadyRegisteredWith(registry)) { - return; - } - } - - private static boolean alreadyRegisteredWith(PluginRegistry registry) { - final String key = GeneratedPluginRegistrant.class.getCanonicalName(); - if (registry.hasPlugin(key)) { - return true; - } - registry.registrarFor(key); - return false; - } -} diff --git a/expense_planner/android/app/src/main/kotlin/github/nisrulz/expense_planner/MainActivity.kt b/expense_planner/android/app/src/main/kotlin/github/nisrulz/expense_planner/MainActivity.kt deleted file mode 100644 index 0bdda4fb..00000000 --- a/expense_planner/android/app/src/main/kotlin/github/nisrulz/expense_planner/MainActivity.kt +++ /dev/null @@ -1,13 +0,0 @@ -package github.nisrulz.expense_planner - -import android.os.Bundle - -import io.flutter.app.FlutterActivity -import io.flutter.plugins.GeneratedPluginRegistrant - -class MainActivity: FlutterActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - GeneratedPluginRegistrant.registerWith(this) - } -} diff --git a/expense_planner/android/gradle/wrapper/gradle-wrapper.jar b/expense_planner/android/gradle/wrapper/gradle-wrapper.jar index e708b1c0..249e5832 100644 Binary files a/expense_planner/android/gradle/wrapper/gradle-wrapper.jar and b/expense_planner/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/expense_planner/android/gradle/wrapper/gradle-wrapper.properties b/expense_planner/android/gradle/wrapper/gradle-wrapper.properties index 05679dc3..ae04661e 100644 --- a/expense_planner/android/gradle/wrapper/gradle-wrapper.properties +++ b/expense_planner/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/expense_planner/android/gradlew b/expense_planner/android/gradlew index 4f906e0c..a69d9cb6 100755 --- a/expense_planner/android/gradlew +++ b/expense_planner/android/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/expense_planner/android/gradlew.bat b/expense_planner/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/expense_planner/android/gradlew.bat +++ b/expense_planner/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/expense_planner/ios/Flutter/Generated.xcconfig b/expense_planner/ios/Flutter/Generated.xcconfig index b9fe88f5..cee79f1a 100644 --- a/expense_planner/ios/Flutter/Generated.xcconfig +++ b/expense_planner/ios/Flutter/Generated.xcconfig @@ -1,12 +1,14 @@ // This is a generated file; do not edit or check into version control. -FLUTTER_ROOT=/home/zion/Documents/sdks/flutter -FLUTTER_APPLICATION_PATH=/home/zion/Documents/workspaces/github_ws/flutter-examples/expense_planner +FLUTTER_ROOT=/usr/local/Caskroom/flutter/2.8.1/flutter +FLUTTER_APPLICATION_PATH=/Users/nishantsrivastava/Documents/github/flutter-examples/expense_planner +COCOAPODS_PARALLEL_CODE_SIGN=true FLUTTER_TARGET=lib/main.dart FLUTTER_BUILD_DIR=build -SYMROOT=${SOURCE_ROOT}/../build/ios FLUTTER_BUILD_NAME=1.0.0 FLUTTER_BUILD_NUMBER=1 +EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386 +EXCLUDED_ARCHS[sdk=iphoneos*]=armv7 DART_OBFUSCATION=false -TRACK_WIDGET_CREATION=false +TRACK_WIDGET_CREATION=true TREE_SHAKE_ICONS=false -PACKAGE_CONFIG=.packages +PACKAGE_CONFIG=.dart_tool/package_config.json diff --git a/expense_planner/ios/Runner/GeneratedPluginRegistrant.h b/expense_planner/ios/Runner/GeneratedPluginRegistrant.h index ed9a5c61..7a890927 100644 --- a/expense_planner/ios/Runner/GeneratedPluginRegistrant.h +++ b/expense_planner/ios/Runner/GeneratedPluginRegistrant.h @@ -2,6 +2,8 @@ // Generated file. Do not edit. // +// clang-format off + #ifndef GeneratedPluginRegistrant_h #define GeneratedPluginRegistrant_h diff --git a/expense_planner/ios/Runner/GeneratedPluginRegistrant.m b/expense_planner/ios/Runner/GeneratedPluginRegistrant.m index 60dfa42b..efe65ecc 100644 --- a/expense_planner/ios/Runner/GeneratedPluginRegistrant.m +++ b/expense_planner/ios/Runner/GeneratedPluginRegistrant.m @@ -2,6 +2,8 @@ // Generated file. Do not edit. // +// clang-format off + #import "GeneratedPluginRegistrant.h" @implementation GeneratedPluginRegistrant diff --git a/firebase_crash_reporting/android/app/src/main/AndroidManifest.xml b/firebase_crash_reporting/android/app/src/main/AndroidManifest.xml index 512343b2..cd16e9c9 100644 --- a/firebase_crash_reporting/android/app/src/main/AndroidManifest.xml +++ b/firebase_crash_reporting/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,11 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_ios_podfile_setup + +target 'Runner' do + use_frameworks! + use_modular_headers! + + flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) + end +end diff --git a/flutter_date_pickers-master/example/android/app/src/main/AndroidManifest.xml b/flutter_date_pickers-master/example/android/app/src/main/AndroidManifest.xml index 0ff98a1a..659eaaae 100644 --- a/flutter_date_pickers-master/example/android/app/src/main/AndroidManifest.xml +++ b/flutter_date_pickers-master/example/android/app/src/main/AndroidManifest.xml @@ -7,11 +7,11 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - + diff --git a/flutter_date_pickers-master/example/android/app/src/main/java/com/mariamelnik/flutter_date_picker/MainActivity.java b/flutter_date_pickers-master/example/android/app/src/main/java/com/mariamelnik/flutter_date_picker/MainActivity.java deleted file mode 100644 index 7831724f..00000000 --- a/flutter_date_pickers-master/example/android/app/src/main/java/com/mariamelnik/flutter_date_picker/MainActivity.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.mariamelnik.flutter_date_picker; - -import android.os.Bundle; -import io.flutter.app.FlutterActivity; -import io.flutter.plugins.GeneratedPluginRegistrant; - -public class MainActivity extends FlutterActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); - } -} diff --git a/flutter_date_pickers-master/pubspec.lock b/flutter_date_pickers-master/pubspec.lock index 84da0035..9c6d221c 100644 --- a/flutter_date_pickers-master/pubspec.lock +++ b/flutter_date_pickers-master/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.5.0" + version: "2.9.0" boolean_selector: dependency: transitive description: @@ -21,35 +21,28 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0" + version: "1.2.1" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" fake_async: dependency: transitive description: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -78,21 +71,28 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10" + version: "0.12.12" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.5" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.8.0" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.2" sky_engine: dependency: transitive description: flutter @@ -104,7 +104,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.9.0" stack_trace: dependency: transitive description: @@ -125,34 +125,27 @@ packages: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.19" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.0" + version: "0.4.12" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.2" sdks: - dart: ">=2.12.0 <3.0.0" + dart: ">=2.17.0-0 <3.0.0" diff --git a/getx_counter_app/android/app/src/main/AndroidManifest.xml b/getx_counter_app/android/app/src/main/AndroidManifest.xml index 38a1d16d..4854c2f3 100644 --- a/getx_counter_app/android/app/src/main/AndroidManifest.xml +++ b/getx_counter_app/android/app/src/main/AndroidManifest.xml @@ -5,7 +5,7 @@ android:name="${applicationName}" android:icon="@mipmap/ic_launcher"> - + diff --git a/google_signin/android/app/src/main/java/github/nisrulz/googlesignin/MainActivity.java b/google_signin/android/app/src/main/java/github/nisrulz/googlesignin/MainActivity.java deleted file mode 100644 index 8f2ec27e..00000000 --- a/google_signin/android/app/src/main/java/github/nisrulz/googlesignin/MainActivity.java +++ /dev/null @@ -1,14 +0,0 @@ -package github.nisrulz.googlesignin; - -import android.os.Bundle; - -import io.flutter.app.FlutterActivity; -import io.flutter.plugins.GeneratedPluginRegistrant; - -public class MainActivity extends FlutterActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); - } -} diff --git a/google_signin/android/gradle/wrapper/gradle-wrapper.jar b/google_signin/android/gradle/wrapper/gradle-wrapper.jar index e708b1c0..249e5832 100644 Binary files a/google_signin/android/gradle/wrapper/gradle-wrapper.jar and b/google_signin/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/google_signin/android/gradle/wrapper/gradle-wrapper.properties b/google_signin/android/gradle/wrapper/gradle-wrapper.properties index 05679dc3..ae04661e 100644 --- a/google_signin/android/gradle/wrapper/gradle-wrapper.properties +++ b/google_signin/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/google_signin/android/gradlew b/google_signin/android/gradlew index 4f906e0c..a69d9cb6 100755 --- a/google_signin/android/gradlew +++ b/google_signin/android/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/google_signin/android/gradlew.bat b/google_signin/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/google_signin/android/gradlew.bat +++ b/google_signin/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/grid_layout/.dart_tool/package_config.json b/grid_layout/.dart_tool/package_config.json index ac663a51..fb06a226 100644 --- a/grid_layout/.dart_tool/package_config.json +++ b/grid_layout/.dart_tool/package_config.json @@ -3,135 +3,129 @@ "packages": [ { "name": "async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "boolean_selector", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "characters", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "charcode", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "clock", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "collection", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "cupertino_icons", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.2", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "fake_async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "flutter_test", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter_test", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "matcher", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12", "packageUri": "lib/", "languageVersion": "2.12" }, + { + "name": "material_color_utilities", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5", + "packageUri": "lib/", + "languageVersion": "2.13" + }, { "name": "meta", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "path", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "sky_engine", - "rootUri": "file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "source_span", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "stack_trace", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "stream_channel", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "string_scanner", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "term_glyph", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "test_api", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "typed_data", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "vector_math", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "grid_layout", @@ -140,7 +134,7 @@ "languageVersion": "2.10" } ], - "generated": "2021-07-25T18:35:29.365601Z", + "generated": "2022-10-22T19:13:26.271931Z", "generator": "pub", - "generatorVersion": "2.12.2" + "generatorVersion": "2.18.2" } diff --git a/grid_layout/.dart_tool/package_config_subset b/grid_layout/.dart_tool/package_config_subset index 2330511c..f1574c8f 100644 --- a/grid_layout/.dart_tool/package_config_subset +++ b/grid_layout/.dart_tool/package_config_subset @@ -1,93 +1,89 @@ +grid_layout +2.10 +file:///Users/nishantsrivastava/Documents/github/flutter-examples/grid_layout/ +file:///Users/nishantsrivastava/Documents/github/flutter-examples/grid_layout/lib/ async -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/lib/ boolean_selector 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ characters 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/lib/ -charcode -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/lib/ clock 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/lib/ collection 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/lib/ cupertino_icons 2.0 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.2/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.2/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3/lib/ fake_async 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/lib/ matcher 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/lib/ +material_color_utilities +2.13 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/lib/ meta 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/lib/ path 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/lib/ source_span -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/lib/ stack_trace 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ stream_channel 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ string_scanner 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/lib/ term_glyph 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/lib/ test_api 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/lib/ -typed_data -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/lib/ vector_math -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/lib/ sky_engine 2.12 -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/ -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/lib/ flutter -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter/ -file:///home/zion/Documents/sdks/flutter/packages/flutter/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/lib/ flutter_test -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/ -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/lib/ -grid_layout -2.10 -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/grid_layout/ -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/grid_layout/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/lib/ 2 diff --git a/grid_layout/.dart_tool/version b/grid_layout/.dart_tool/version index 26e33797..0163af7e 100644 --- a/grid_layout/.dart_tool/version +++ b/grid_layout/.dart_tool/version @@ -1 +1 @@ -2.0.4 \ No newline at end of file +3.3.5 \ No newline at end of file diff --git a/grid_layout/android/android/app/src/main/AndroidManifest.xml b/grid_layout/android/android/app/src/main/AndroidManifest.xml index d5320878..eafa28cc 100644 --- a/grid_layout/android/android/app/src/main/AndroidManifest.xml +++ b/grid_layout/android/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,11 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - + diff --git a/grid_layout/android/app/src/main/java/github/nisrulz/gridlayout/MainActivity.java b/grid_layout/android/app/src/main/java/github/nisrulz/gridlayout/MainActivity.java deleted file mode 100644 index 79533904..00000000 --- a/grid_layout/android/app/src/main/java/github/nisrulz/gridlayout/MainActivity.java +++ /dev/null @@ -1,14 +0,0 @@ -package github.nisrulz.gridlayout; - -import android.os.Bundle; - -import io.flutter.app.FlutterActivity; -import io.flutter.plugins.GeneratedPluginRegistrant; - -public class MainActivity extends FlutterActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); - } -} diff --git a/grid_layout/android/gradle/wrapper/gradle-wrapper.jar b/grid_layout/android/gradle/wrapper/gradle-wrapper.jar index e708b1c0..249e5832 100644 Binary files a/grid_layout/android/gradle/wrapper/gradle-wrapper.jar and b/grid_layout/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/grid_layout/android/gradle/wrapper/gradle-wrapper.properties b/grid_layout/android/gradle/wrapper/gradle-wrapper.properties index 05679dc3..ae04661e 100644 --- a/grid_layout/android/gradle/wrapper/gradle-wrapper.properties +++ b/grid_layout/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/grid_layout/android/gradlew b/grid_layout/android/gradlew index 4f906e0c..a69d9cb6 100755 --- a/grid_layout/android/gradlew +++ b/grid_layout/android/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/grid_layout/android/gradlew.bat b/grid_layout/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/grid_layout/android/gradlew.bat +++ b/grid_layout/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/handling_routes/.dart_tool/package_config.json b/handling_routes/.dart_tool/package_config.json index b3a7fd7a..ffe2cfb4 100644 --- a/handling_routes/.dart_tool/package_config.json +++ b/handling_routes/.dart_tool/package_config.json @@ -3,129 +3,123 @@ "packages": [ { "name": "async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "boolean_selector", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "characters", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "charcode", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "clock", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "collection", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "fake_async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "flutter_test", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter_test", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "matcher", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12", "packageUri": "lib/", "languageVersion": "2.12" }, + { + "name": "material_color_utilities", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5", + "packageUri": "lib/", + "languageVersion": "2.13" + }, { "name": "meta", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "path", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "sky_engine", - "rootUri": "file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "source_span", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "stack_trace", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "stream_channel", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "string_scanner", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "term_glyph", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "test_api", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "typed_data", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "vector_math", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "handling_routes", @@ -134,7 +128,7 @@ "languageVersion": "2.10" } ], - "generated": "2021-07-25T18:35:30.666104Z", + "generated": "2022-10-22T19:13:29.905297Z", "generator": "pub", - "generatorVersion": "2.12.2" + "generatorVersion": "2.18.2" } diff --git a/handling_routes/.dart_tool/package_config_subset b/handling_routes/.dart_tool/package_config_subset index e9a7dd2b..98acaffa 100644 --- a/handling_routes/.dart_tool/package_config_subset +++ b/handling_routes/.dart_tool/package_config_subset @@ -1,89 +1,85 @@ +handling_routes +2.10 +file:///Users/nishantsrivastava/Documents/github/flutter-examples/handling_routes/ +file:///Users/nishantsrivastava/Documents/github/flutter-examples/handling_routes/lib/ async -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/lib/ boolean_selector 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ characters 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/lib/ -charcode -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/lib/ clock 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/lib/ collection 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/lib/ fake_async 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/lib/ matcher 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/lib/ +material_color_utilities +2.13 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/lib/ meta 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/lib/ path 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/lib/ source_span -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/lib/ stack_trace 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ stream_channel 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ string_scanner 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/lib/ term_glyph 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/lib/ test_api 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/lib/ -typed_data -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/lib/ vector_math -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/lib/ sky_engine 2.12 -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/ -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/lib/ flutter -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter/ -file:///home/zion/Documents/sdks/flutter/packages/flutter/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/lib/ flutter_test -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/ -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/lib/ -handling_routes -2.10 -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/handling_routes/ -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/handling_routes/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/lib/ 2 diff --git a/handling_routes/.dart_tool/version b/handling_routes/.dart_tool/version index 26e33797..0163af7e 100644 --- a/handling_routes/.dart_tool/version +++ b/handling_routes/.dart_tool/version @@ -1 +1 @@ -2.0.4 \ No newline at end of file +3.3.5 \ No newline at end of file diff --git a/handling_routes/android/android/app/src/main/AndroidManifest.xml b/handling_routes/android/android/app/src/main/AndroidManifest.xml index d5320878..eafa28cc 100644 --- a/handling_routes/android/android/app/src/main/AndroidManifest.xml +++ b/handling_routes/android/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,11 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - - + \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/handling_routes/android/gradlew.bat b/handling_routes/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/handling_routes/android/gradlew.bat +++ b/handling_routes/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/image_editor/android/app/src/main/AndroidManifest.xml b/image_editor/android/app/src/main/AndroidManifest.xml index cd731d24..4b0316c2 100644 --- a/image_editor/android/app/src/main/AndroidManifest.xml +++ b/image_editor/android/app/src/main/AndroidManifest.xml @@ -6,7 +6,7 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_ios_podfile_setup + +target 'Runner' do + flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) + end +end diff --git a/image_from_network/.dart_tool/package_config.json b/image_from_network/.dart_tool/package_config.json index 460bf26e..a90b21d2 100644 --- a/image_from_network/.dart_tool/package_config.json +++ b/image_from_network/.dart_tool/package_config.json @@ -3,135 +3,129 @@ "packages": [ { "name": "async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "boolean_selector", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "characters", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "charcode", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "clock", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "collection", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "cupertino_icons", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.2", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "fake_async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "flutter_test", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter_test", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "matcher", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12", "packageUri": "lib/", "languageVersion": "2.12" }, + { + "name": "material_color_utilities", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5", + "packageUri": "lib/", + "languageVersion": "2.13" + }, { "name": "meta", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "path", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "sky_engine", - "rootUri": "file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "source_span", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "stack_trace", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "stream_channel", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "string_scanner", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "term_glyph", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "test_api", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "typed_data", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "vector_math", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "image_from_network", @@ -140,7 +134,7 @@ "languageVersion": "2.10" } ], - "generated": "2021-07-25T18:35:32.004505Z", + "generated": "2022-10-22T19:13:42.375159Z", "generator": "pub", - "generatorVersion": "2.12.2" + "generatorVersion": "2.18.2" } diff --git a/image_from_network/.dart_tool/package_config_subset b/image_from_network/.dart_tool/package_config_subset index f178f5bd..d8f9e96f 100644 --- a/image_from_network/.dart_tool/package_config_subset +++ b/image_from_network/.dart_tool/package_config_subset @@ -1,93 +1,89 @@ +image_from_network +2.10 +file:///Users/nishantsrivastava/Documents/github/flutter-examples/image_from_network/ +file:///Users/nishantsrivastava/Documents/github/flutter-examples/image_from_network/lib/ async -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/lib/ boolean_selector 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ characters 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/lib/ -charcode -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/lib/ clock 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/lib/ collection 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/lib/ cupertino_icons 2.0 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.2/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.2/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.3/lib/ fake_async 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/lib/ matcher 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/lib/ +material_color_utilities +2.13 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/lib/ meta 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/lib/ path 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/lib/ source_span -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/lib/ stack_trace 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ stream_channel 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ string_scanner 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/lib/ term_glyph 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/lib/ test_api 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/lib/ -typed_data -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/lib/ vector_math -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/lib/ sky_engine 2.12 -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/ -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/lib/ flutter -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter/ -file:///home/zion/Documents/sdks/flutter/packages/flutter/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/lib/ flutter_test -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/ -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/lib/ -image_from_network -2.10 -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/image_from_network/ -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/image_from_network/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/lib/ 2 diff --git a/image_from_network/.dart_tool/version b/image_from_network/.dart_tool/version index 26e33797..0163af7e 100644 --- a/image_from_network/.dart_tool/version +++ b/image_from_network/.dart_tool/version @@ -1 +1 @@ -2.0.4 \ No newline at end of file +3.3.5 \ No newline at end of file diff --git a/image_from_network/android/android/app/src/main/AndroidManifest.xml b/image_from_network/android/android/app/src/main/AndroidManifest.xml index d5320878..eafa28cc 100644 --- a/image_from_network/android/android/app/src/main/AndroidManifest.xml +++ b/image_from_network/android/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,11 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - + diff --git a/image_from_network/android/app/src/main/java/github/nisrulz/imagefromnetwork/MainActivity.java b/image_from_network/android/app/src/main/java/github/nisrulz/imagefromnetwork/MainActivity.java deleted file mode 100644 index 5f1fcc78..00000000 --- a/image_from_network/android/app/src/main/java/github/nisrulz/imagefromnetwork/MainActivity.java +++ /dev/null @@ -1,14 +0,0 @@ -package github.nisrulz.imagefromnetwork; - -import android.os.Bundle; - -import io.flutter.app.FlutterActivity; -import io.flutter.plugins.GeneratedPluginRegistrant; - -public class MainActivity extends FlutterActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); - } -} diff --git a/image_from_network/android/gradle/wrapper/gradle-wrapper.jar b/image_from_network/android/gradle/wrapper/gradle-wrapper.jar index e708b1c0..249e5832 100644 Binary files a/image_from_network/android/gradle/wrapper/gradle-wrapper.jar and b/image_from_network/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/image_from_network/android/gradle/wrapper/gradle-wrapper.properties b/image_from_network/android/gradle/wrapper/gradle-wrapper.properties index 05679dc3..ae04661e 100644 --- a/image_from_network/android/gradle/wrapper/gradle-wrapper.properties +++ b/image_from_network/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/image_from_network/android/gradlew b/image_from_network/android/gradlew index 4f906e0c..a69d9cb6 100755 --- a/image_from_network/android/gradlew +++ b/image_from_network/android/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/image_from_network/android/gradlew.bat b/image_from_network/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/image_from_network/android/gradlew.bat +++ b/image_from_network/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/infinite_list/android/android/app/src/main/AndroidManifest.xml b/infinite_list/android/android/app/src/main/AndroidManifest.xml index d5320878..eafa28cc 100644 --- a/infinite_list/android/android/app/src/main/AndroidManifest.xml +++ b/infinite_list/android/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,11 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - + diff --git a/infinite_list/android/app/src/main/java/github/nisrulz/infinitelist/MainActivity.java b/infinite_list/android/app/src/main/java/github/nisrulz/infinitelist/MainActivity.java deleted file mode 100644 index f36a16b2..00000000 --- a/infinite_list/android/app/src/main/java/github/nisrulz/infinitelist/MainActivity.java +++ /dev/null @@ -1,14 +0,0 @@ -package github.nisrulz.infinitelist; - -import android.os.Bundle; - -import io.flutter.app.FlutterActivity; -import io.flutter.plugins.GeneratedPluginRegistrant; - -public class MainActivity extends FlutterActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); - } -} diff --git a/infinite_list/android/gradle/wrapper/gradle-wrapper.jar b/infinite_list/android/gradle/wrapper/gradle-wrapper.jar index e708b1c0..249e5832 100644 Binary files a/infinite_list/android/gradle/wrapper/gradle-wrapper.jar and b/infinite_list/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/infinite_list/android/gradle/wrapper/gradle-wrapper.properties b/infinite_list/android/gradle/wrapper/gradle-wrapper.properties index 05679dc3..ae04661e 100644 --- a/infinite_list/android/gradle/wrapper/gradle-wrapper.properties +++ b/infinite_list/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/infinite_list/android/gradlew b/infinite_list/android/gradlew index 4f906e0c..a69d9cb6 100755 --- a/infinite_list/android/gradlew +++ b/infinite_list/android/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/infinite_list/android/gradlew.bat b/infinite_list/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/infinite_list/android/gradlew.bat +++ b/infinite_list/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/load_local_image/.dart_tool/package_config.json b/load_local_image/.dart_tool/package_config.json index 7296f7a9..110d4416 100644 --- a/load_local_image/.dart_tool/package_config.json +++ b/load_local_image/.dart_tool/package_config.json @@ -3,129 +3,123 @@ "packages": [ { "name": "async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "boolean_selector", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "characters", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "charcode", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "clock", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "collection", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "fake_async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "flutter_test", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter_test", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "matcher", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12", "packageUri": "lib/", "languageVersion": "2.12" }, + { + "name": "material_color_utilities", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5", + "packageUri": "lib/", + "languageVersion": "2.13" + }, { "name": "meta", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "path", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "sky_engine", - "rootUri": "file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "source_span", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "stack_trace", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "stream_channel", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "string_scanner", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "term_glyph", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "test_api", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "typed_data", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "vector_math", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "load_local_image", @@ -134,7 +128,7 @@ "languageVersion": "2.10" } ], - "generated": "2021-07-25T18:35:36.469076Z", + "generated": "2022-10-22T19:13:48.493718Z", "generator": "pub", - "generatorVersion": "2.12.2" + "generatorVersion": "2.18.2" } diff --git a/load_local_image/.dart_tool/package_config_subset b/load_local_image/.dart_tool/package_config_subset index 565405bf..2a1fb357 100644 --- a/load_local_image/.dart_tool/package_config_subset +++ b/load_local_image/.dart_tool/package_config_subset @@ -1,89 +1,85 @@ +load_local_image +2.10 +file:///Users/nishantsrivastava/Documents/github/flutter-examples/load_local_image/ +file:///Users/nishantsrivastava/Documents/github/flutter-examples/load_local_image/lib/ async -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/lib/ boolean_selector 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ characters 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/lib/ -charcode -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/lib/ clock 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/lib/ collection 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/lib/ fake_async 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/lib/ matcher 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/lib/ +material_color_utilities +2.13 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/lib/ meta 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/lib/ path 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/lib/ source_span -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/lib/ stack_trace 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ stream_channel 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ string_scanner 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/lib/ term_glyph 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/lib/ test_api 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/lib/ -typed_data -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/lib/ vector_math -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/lib/ sky_engine 2.12 -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/ -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/lib/ flutter -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter/ -file:///home/zion/Documents/sdks/flutter/packages/flutter/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/lib/ flutter_test -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/ -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/lib/ -load_local_image -2.10 -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/load_local_image/ -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/load_local_image/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/lib/ 2 diff --git a/load_local_image/.dart_tool/version b/load_local_image/.dart_tool/version index 26e33797..0163af7e 100644 --- a/load_local_image/.dart_tool/version +++ b/load_local_image/.dart_tool/version @@ -1 +1 @@ -2.0.4 \ No newline at end of file +3.3.5 \ No newline at end of file diff --git a/load_local_image/android/android/app/src/main/AndroidManifest.xml b/load_local_image/android/android/app/src/main/AndroidManifest.xml index d5320878..eafa28cc 100644 --- a/load_local_image/android/android/app/src/main/AndroidManifest.xml +++ b/load_local_image/android/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,11 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - - + \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/load_local_image/android/gradlew.bat b/load_local_image/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/load_local_image/android/gradlew.bat +++ b/load_local_image/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/load_local_json/.dart_tool/package_config.json b/load_local_json/.dart_tool/package_config.json index 8550c9fc..d8f78c64 100644 --- a/load_local_json/.dart_tool/package_config.json +++ b/load_local_json/.dart_tool/package_config.json @@ -3,129 +3,123 @@ "packages": [ { "name": "async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "boolean_selector", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "characters", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "charcode", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "clock", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "collection", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "fake_async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "flutter_test", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter_test", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "matcher", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12", "packageUri": "lib/", "languageVersion": "2.12" }, + { + "name": "material_color_utilities", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5", + "packageUri": "lib/", + "languageVersion": "2.13" + }, { "name": "meta", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "path", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "sky_engine", - "rootUri": "file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "source_span", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "stack_trace", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "stream_channel", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "string_scanner", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "term_glyph", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "test_api", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "typed_data", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "vector_math", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "load_local_json", @@ -134,7 +128,7 @@ "languageVersion": "2.10" } ], - "generated": "2021-07-25T18:35:37.857909Z", + "generated": "2022-10-22T19:13:51.495871Z", "generator": "pub", - "generatorVersion": "2.12.2" + "generatorVersion": "2.18.2" } diff --git a/load_local_json/.dart_tool/package_config_subset b/load_local_json/.dart_tool/package_config_subset index f6a35262..88a34097 100644 --- a/load_local_json/.dart_tool/package_config_subset +++ b/load_local_json/.dart_tool/package_config_subset @@ -1,89 +1,85 @@ +load_local_json +2.10 +file:///Users/nishantsrivastava/Documents/github/flutter-examples/load_local_json/ +file:///Users/nishantsrivastava/Documents/github/flutter-examples/load_local_json/lib/ async -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/lib/ boolean_selector 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ characters 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/lib/ -charcode -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/lib/ clock 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/lib/ collection 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/lib/ fake_async 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/lib/ matcher 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/lib/ +material_color_utilities +2.13 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/lib/ meta 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/lib/ path 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/lib/ source_span -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/lib/ stack_trace 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ stream_channel 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ string_scanner 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/lib/ term_glyph 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/lib/ test_api 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/lib/ -typed_data -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/lib/ vector_math -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/lib/ sky_engine 2.12 -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/ -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/lib/ flutter -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter/ -file:///home/zion/Documents/sdks/flutter/packages/flutter/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/lib/ flutter_test -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/ -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/lib/ -load_local_json -2.10 -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/load_local_json/ -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/load_local_json/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/lib/ 2 diff --git a/load_local_json/.dart_tool/version b/load_local_json/.dart_tool/version index 26e33797..0163af7e 100644 --- a/load_local_json/.dart_tool/version +++ b/load_local_json/.dart_tool/version @@ -1 +1 @@ -2.0.4 \ No newline at end of file +3.3.5 \ No newline at end of file diff --git a/load_local_json/android/android/app/src/main/AndroidManifest.xml b/load_local_json/android/android/app/src/main/AndroidManifest.xml index d5320878..eafa28cc 100644 --- a/load_local_json/android/android/app/src/main/AndroidManifest.xml +++ b/load_local_json/android/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,11 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - - + \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/load_local_json/android/gradlew.bat b/load_local_json/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/load_local_json/android/gradlew.bat +++ b/load_local_json/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/lunch_app/android/app/src/main/AndroidManifest.xml b/lunch_app/android/app/src/main/AndroidManifest.xml index 86fae2a6..72978d8c 100644 --- a/lunch_app/android/app/src/main/AndroidManifest.xml +++ b/lunch_app/android/app/src/main/AndroidManifest.xml @@ -4,7 +4,7 @@ android:label="lunch_app" android:icon="@mipmap/ic_launcher"> - + diff --git a/navigation_drawer/android/app/src/main/java/github/nisrulz/navigationdrawer/MainActivity.java b/navigation_drawer/android/app/src/main/java/github/nisrulz/navigationdrawer/MainActivity.java deleted file mode 100644 index 820f6dd7..00000000 --- a/navigation_drawer/android/app/src/main/java/github/nisrulz/navigationdrawer/MainActivity.java +++ /dev/null @@ -1,14 +0,0 @@ -package github.nisrulz.navigationdrawer; - -import android.os.Bundle; - -import io.flutter.app.FlutterActivity; -import io.flutter.plugins.GeneratedPluginRegistrant; - -public class MainActivity extends FlutterActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); - } -} diff --git a/navigation_drawer/android/gradle/wrapper/gradle-wrapper.jar b/navigation_drawer/android/gradle/wrapper/gradle-wrapper.jar index e708b1c0..249e5832 100644 Binary files a/navigation_drawer/android/gradle/wrapper/gradle-wrapper.jar and b/navigation_drawer/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/navigation_drawer/android/gradle/wrapper/gradle-wrapper.properties b/navigation_drawer/android/gradle/wrapper/gradle-wrapper.properties index 05679dc3..ae04661e 100644 --- a/navigation_drawer/android/gradle/wrapper/gradle-wrapper.properties +++ b/navigation_drawer/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/navigation_drawer/android/gradlew b/navigation_drawer/android/gradlew index 4f906e0c..a69d9cb6 100755 --- a/navigation_drawer/android/gradlew +++ b/navigation_drawer/android/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/navigation_drawer/android/gradlew.bat b/navigation_drawer/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/navigation_drawer/android/gradlew.bat +++ b/navigation_drawer/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/news_memes_app/android/app/src/main/AndroidManifest.xml b/news_memes_app/android/app/src/main/AndroidManifest.xml index 818f2579..c2313f23 100644 --- a/news_memes_app/android/app/src/main/AndroidManifest.xml +++ b/news_memes_app/android/app/src/main/AndroidManifest.xml @@ -4,7 +4,7 @@ android:label="news_memes_app" android:icon="@mipmap/ic_launcher"> :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_ios_podfile_setup + +target 'Runner' do + use_frameworks! + use_modular_headers! + + flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) + end +end diff --git a/persist_key_value/.flutter-plugins-dependencies b/persist_key_value/.flutter-plugins-dependencies index 60a915a2..0df5765b 100644 --- a/persist_key_value/.flutter-plugins-dependencies +++ b/persist_key_value/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"shared_preferences","path":"/home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.4.2/","dependencies":[]}],"android":[{"name":"shared_preferences","path":"/home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.4.2/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"shared_preferences","dependencies":[]}],"date_created":"2021-07-25 20:35:41.092585","version":"2.0.4"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"shared_preferences","path":"/usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.4.2/","native_build":true,"dependencies":[]}],"android":[{"name":"shared_preferences","path":"/usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.4.2/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"shared_preferences","dependencies":[]}],"date_created":"2022-10-22 21:14:06.895922","version":"3.3.5"} \ No newline at end of file diff --git a/persist_key_value/android/android/app/src/main/AndroidManifest.xml b/persist_key_value/android/android/app/src/main/AndroidManifest.xml index d5320878..eafa28cc 100644 --- a/persist_key_value/android/android/app/src/main/AndroidManifest.xml +++ b/persist_key_value/android/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,11 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - + diff --git a/persist_key_value/android/app/src/main/kotlin/github/nisrulz/persistkeyvalue/MainActivity.kt b/persist_key_value/android/app/src/main/kotlin/github/nisrulz/persistkeyvalue/MainActivity.kt deleted file mode 100644 index 0b4eafb3..00000000 --- a/persist_key_value/android/app/src/main/kotlin/github/nisrulz/persistkeyvalue/MainActivity.kt +++ /dev/null @@ -1,13 +0,0 @@ -package github.nisrulz.persistkeyvalue - -import android.os.Bundle - -import io.flutter.app.FlutterActivity -import io.flutter.plugins.GeneratedPluginRegistrant - -class MainActivity(): FlutterActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - GeneratedPluginRegistrant.registerWith(this) - } -} diff --git a/persist_key_value/android/gradle/wrapper/gradle-wrapper.jar b/persist_key_value/android/gradle/wrapper/gradle-wrapper.jar index e708b1c0..249e5832 100644 Binary files a/persist_key_value/android/gradle/wrapper/gradle-wrapper.jar and b/persist_key_value/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/persist_key_value/android/gradle/wrapper/gradle-wrapper.properties b/persist_key_value/android/gradle/wrapper/gradle-wrapper.properties index 05679dc3..ae04661e 100644 --- a/persist_key_value/android/gradle/wrapper/gradle-wrapper.properties +++ b/persist_key_value/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/persist_key_value/android/gradlew b/persist_key_value/android/gradlew index 4f906e0c..a69d9cb6 100755 --- a/persist_key_value/android/gradlew +++ b/persist_key_value/android/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/persist_key_value/android/gradlew.bat b/persist_key_value/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/persist_key_value/android/gradlew.bat +++ b/persist_key_value/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/push_notifcations/android/.settings/org.eclipse.buildship.core.prefs b/push_notifcations/android/.settings/org.eclipse.buildship.core.prefs index d1f44f19..bac05f9e 100644 --- a/push_notifcations/android/.settings/org.eclipse.buildship.core.prefs +++ b/push_notifcations/android/.settings/org.eclipse.buildship.core.prefs @@ -1,11 +1,11 @@ -arguments= +arguments=--init-script /var/folders/yf/ljp_xc1j3fb6sdyd1mmz4nth0000gn/T/init14930713327144805756.gradle --init-script /var/folders/yf/ljp_xc1j3fb6sdyd1mmz4nth0000gn/T/init484410638590856338.gradle auto.sync=false build.scans.enabled=false -connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) +connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(7.4.2)) connection.project.dir= eclipse.preferences.version=1 gradle.user.home= -java.home=E\:/java +java.home=/Library/Java/JavaVirtualMachines/zulu-11.jdk/Contents/Home jvm.arguments= offline.mode=false override.workspace.settings=true diff --git a/push_notifcations/android/app/src/main/AndroidManifest.xml b/push_notifcations/android/app/src/main/AndroidManifest.xml index e2d01098..0d04bf3b 100644 --- a/push_notifcations/android/app/src/main/AndroidManifest.xml +++ b/push_notifcations/android/app/src/main/AndroidManifest.xml @@ -10,7 +10,7 @@ android:label="push_notifcations" android:icon="@mipmap/ic_launcher"> :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_ios_podfile_setup + +target 'Runner' do + use_frameworks! + use_modular_headers! + + flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) + end +end diff --git a/save_data_locally_with_sqlite/android/app/src/main/AndroidManifest.xml b/save_data_locally_with_sqlite/android/app/src/main/AndroidManifest.xml index 3fefb812..621fa373 100644 --- a/save_data_locally_with_sqlite/android/app/src/main/AndroidManifest.xml +++ b/save_data_locally_with_sqlite/android/app/src/main/AndroidManifest.xml @@ -4,7 +4,7 @@ android:label="save_data_locally_with_sqlite" android:icon="@mipmap/ic_launcher"> :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_ios_podfile_setup + +target 'Runner' do + use_frameworks! + use_modular_headers! + + flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) + end +end diff --git a/scan_qr_code/android/app/src/main/AndroidManifest.xml b/scan_qr_code/android/app/src/main/AndroidManifest.xml index fc4c8dec..f7d83c01 100644 --- a/scan_qr_code/android/app/src/main/AndroidManifest.xml +++ b/scan_qr_code/android/app/src/main/AndroidManifest.xml @@ -5,7 +5,7 @@ android:name="${applicationName}" android:icon="@mipmap/ic_launcher"> - - + \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/simple_material_app/android/gradlew.bat b/simple_material_app/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/simple_material_app/android/gradlew.bat +++ b/simple_material_app/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/sliver_app_bar_example/android/app/src/main/AndroidManifest.xml b/sliver_app_bar_example/android/app/src/main/AndroidManifest.xml index 77acaad2..f23c7ff2 100644 --- a/sliver_app_bar_example/android/app/src/main/AndroidManifest.xml +++ b/sliver_app_bar_example/android/app/src/main/AndroidManifest.xml @@ -5,7 +5,7 @@ android:name="${applicationName}" android:icon="@mipmap/ic_launcher"> - - + \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/stateful_widget/android/gradlew.bat b/stateful_widget/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/stateful_widget/android/gradlew.bat +++ b/stateful_widget/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/stateless_widgets/.dart_tool/package_config.json b/stateless_widgets/.dart_tool/package_config.json index 9b0cc917..31f278b4 100644 --- a/stateless_widgets/.dart_tool/package_config.json +++ b/stateless_widgets/.dart_tool/package_config.json @@ -3,129 +3,123 @@ "packages": [ { "name": "async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "boolean_selector", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "characters", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "charcode", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "clock", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "collection", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "fake_async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "flutter_test", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter_test", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "matcher", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12", "packageUri": "lib/", "languageVersion": "2.12" }, + { + "name": "material_color_utilities", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5", + "packageUri": "lib/", + "languageVersion": "2.13" + }, { "name": "meta", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "path", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "sky_engine", - "rootUri": "file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "source_span", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "stack_trace", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "stream_channel", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "string_scanner", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "term_glyph", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "test_api", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "typed_data", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "vector_math", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "stateless_widgets", @@ -134,7 +128,7 @@ "languageVersion": "2.10" } ], - "generated": "2021-07-25T18:35:44.956616Z", + "generated": "2022-10-22T19:14:31.705281Z", "generator": "pub", - "generatorVersion": "2.12.2" + "generatorVersion": "2.18.2" } diff --git a/stateless_widgets/.dart_tool/package_config_subset b/stateless_widgets/.dart_tool/package_config_subset index 745beecb..52bb672b 100644 --- a/stateless_widgets/.dart_tool/package_config_subset +++ b/stateless_widgets/.dart_tool/package_config_subset @@ -1,89 +1,85 @@ +stateless_widgets +2.10 +file:///Users/nishantsrivastava/Documents/github/flutter-examples/stateless_widgets/ +file:///Users/nishantsrivastava/Documents/github/flutter-examples/stateless_widgets/lib/ async -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/lib/ boolean_selector 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ characters 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/lib/ -charcode -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/lib/ clock 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/lib/ collection 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/lib/ fake_async 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/lib/ matcher 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/lib/ +material_color_utilities +2.13 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/lib/ meta 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/lib/ path 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/lib/ source_span -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/lib/ stack_trace 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ stream_channel 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ string_scanner 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/lib/ term_glyph 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/lib/ test_api 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/lib/ -typed_data -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/lib/ vector_math -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/lib/ sky_engine 2.12 -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/ -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/lib/ flutter -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter/ -file:///home/zion/Documents/sdks/flutter/packages/flutter/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/lib/ flutter_test -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/ -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/lib/ -stateless_widgets -2.10 -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/stateless_widgets/ -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/stateless_widgets/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/lib/ 2 diff --git a/stateless_widgets/.dart_tool/version b/stateless_widgets/.dart_tool/version index 26e33797..0163af7e 100644 --- a/stateless_widgets/.dart_tool/version +++ b/stateless_widgets/.dart_tool/version @@ -1 +1 @@ -2.0.4 \ No newline at end of file +3.3.5 \ No newline at end of file diff --git a/stateless_widgets/android/android/app/src/main/AndroidManifest.xml b/stateless_widgets/android/android/app/src/main/AndroidManifest.xml index d5320878..eafa28cc 100644 --- a/stateless_widgets/android/android/app/src/main/AndroidManifest.xml +++ b/stateless_widgets/android/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,11 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - - + \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/stateless_widgets/android/gradlew.bat b/stateless_widgets/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/stateless_widgets/android/gradlew.bat +++ b/stateless_widgets/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/statless_counter_app/android/app/src/main/AndroidManifest.xml b/statless_counter_app/android/app/src/main/AndroidManifest.xml index 7e549e3b..9d48978b 100644 --- a/statless_counter_app/android/app/src/main/AndroidManifest.xml +++ b/statless_counter_app/android/app/src/main/AndroidManifest.xml @@ -4,7 +4,7 @@ android:label="statless_counter_app" android:icon="@mipmap/ic_launcher"> - + \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/tip_calculator/android/gradlew.bat b/tip_calculator/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/tip_calculator/android/gradlew.bat +++ b/tip_calculator/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/todo_list_using_provider/android/app/src/main/AndroidManifest.xml b/todo_list_using_provider/android/app/src/main/AndroidManifest.xml index ab1021dd..7a7db90d 100644 --- a/todo_list_using_provider/android/app/src/main/AndroidManifest.xml +++ b/todo_list_using_provider/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,11 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - - + \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/using_alert_dialog/android/gradlew.bat b/using_alert_dialog/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/using_alert_dialog/android/gradlew.bat +++ b/using_alert_dialog/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/using_bottom_nav_bar/.dart_tool/package_config.json b/using_bottom_nav_bar/.dart_tool/package_config.json index da78d858..b55d3662 100644 --- a/using_bottom_nav_bar/.dart_tool/package_config.json +++ b/using_bottom_nav_bar/.dart_tool/package_config.json @@ -3,129 +3,123 @@ "packages": [ { "name": "async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "boolean_selector", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "characters", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "charcode", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "clock", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "collection", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "fake_async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "flutter_test", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter_test", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "matcher", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12", "packageUri": "lib/", "languageVersion": "2.12" }, + { + "name": "material_color_utilities", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5", + "packageUri": "lib/", + "languageVersion": "2.13" + }, { "name": "meta", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "path", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "sky_engine", - "rootUri": "file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "source_span", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "stack_trace", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "stream_channel", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "string_scanner", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "term_glyph", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "test_api", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "typed_data", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "vector_math", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "using_bottom_nav_bar", @@ -134,7 +128,7 @@ "languageVersion": "2.10" } ], - "generated": "2021-07-25T18:35:50.269730Z", + "generated": "2022-10-22T19:14:53.219918Z", "generator": "pub", - "generatorVersion": "2.12.2" + "generatorVersion": "2.18.2" } diff --git a/using_bottom_nav_bar/.dart_tool/package_config_subset b/using_bottom_nav_bar/.dart_tool/package_config_subset index 40526151..b9ab858e 100644 --- a/using_bottom_nav_bar/.dart_tool/package_config_subset +++ b/using_bottom_nav_bar/.dart_tool/package_config_subset @@ -1,89 +1,85 @@ +using_bottom_nav_bar +2.10 +file:///Users/nishantsrivastava/Documents/github/flutter-examples/using_bottom_nav_bar/ +file:///Users/nishantsrivastava/Documents/github/flutter-examples/using_bottom_nav_bar/lib/ async -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/lib/ boolean_selector 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ characters 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/lib/ -charcode -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/lib/ clock 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/lib/ collection 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/lib/ fake_async 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/lib/ matcher 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/lib/ +material_color_utilities +2.13 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/lib/ meta 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/lib/ path 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/lib/ source_span -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/lib/ stack_trace 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ stream_channel 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ string_scanner 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/lib/ term_glyph 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/lib/ test_api 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/lib/ -typed_data -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/lib/ vector_math -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/lib/ sky_engine 2.12 -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/ -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/lib/ flutter -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter/ -file:///home/zion/Documents/sdks/flutter/packages/flutter/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/lib/ flutter_test -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/ -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/lib/ -using_bottom_nav_bar -2.10 -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/using_bottom_nav_bar/ -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/using_bottom_nav_bar/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/lib/ 2 diff --git a/using_bottom_nav_bar/.dart_tool/version b/using_bottom_nav_bar/.dart_tool/version index 26e33797..0163af7e 100644 --- a/using_bottom_nav_bar/.dart_tool/version +++ b/using_bottom_nav_bar/.dart_tool/version @@ -1 +1 @@ -2.0.4 \ No newline at end of file +3.3.5 \ No newline at end of file diff --git a/using_bottom_nav_bar/android/android/app/src/main/AndroidManifest.xml b/using_bottom_nav_bar/android/android/app/src/main/AndroidManifest.xml index d5320878..eafa28cc 100644 --- a/using_bottom_nav_bar/android/android/app/src/main/AndroidManifest.xml +++ b/using_bottom_nav_bar/android/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,11 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - - + \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/using_bottom_nav_bar/android/gradlew.bat b/using_bottom_nav_bar/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/using_bottom_nav_bar/android/gradlew.bat +++ b/using_bottom_nav_bar/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/using_custom_fonts/.dart_tool/package_config.json b/using_custom_fonts/.dart_tool/package_config.json index 1ffeb6f3..d347fa7b 100644 --- a/using_custom_fonts/.dart_tool/package_config.json +++ b/using_custom_fonts/.dart_tool/package_config.json @@ -3,129 +3,123 @@ "packages": [ { "name": "async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "boolean_selector", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "characters", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "charcode", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "clock", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "collection", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "fake_async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "flutter_test", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter_test", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "matcher", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12", "packageUri": "lib/", "languageVersion": "2.12" }, + { + "name": "material_color_utilities", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5", + "packageUri": "lib/", + "languageVersion": "2.13" + }, { "name": "meta", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "path", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "sky_engine", - "rootUri": "file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "source_span", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "stack_trace", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "stream_channel", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "string_scanner", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "term_glyph", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "test_api", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "typed_data", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "vector_math", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "using_custom_fonts", @@ -134,7 +128,7 @@ "languageVersion": "2.10" } ], - "generated": "2021-07-25T18:35:51.677076Z", + "generated": "2022-10-22T19:14:56.660724Z", "generator": "pub", - "generatorVersion": "2.12.2" + "generatorVersion": "2.18.2" } diff --git a/using_custom_fonts/.dart_tool/package_config_subset b/using_custom_fonts/.dart_tool/package_config_subset index cb067ce6..23c7fe79 100644 --- a/using_custom_fonts/.dart_tool/package_config_subset +++ b/using_custom_fonts/.dart_tool/package_config_subset @@ -1,89 +1,85 @@ +using_custom_fonts +2.10 +file:///Users/nishantsrivastava/Documents/github/flutter-examples/using_custom_fonts/ +file:///Users/nishantsrivastava/Documents/github/flutter-examples/using_custom_fonts/lib/ async -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/lib/ boolean_selector 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ characters 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/lib/ -charcode -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/lib/ clock 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/lib/ collection 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/lib/ fake_async 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/lib/ matcher 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/lib/ +material_color_utilities +2.13 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/lib/ meta 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/lib/ path 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/lib/ source_span -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/lib/ stack_trace 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ stream_channel 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ string_scanner 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/lib/ term_glyph 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/lib/ test_api 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/lib/ -typed_data -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/lib/ vector_math -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/lib/ sky_engine 2.12 -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/ -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/lib/ flutter -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter/ -file:///home/zion/Documents/sdks/flutter/packages/flutter/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/lib/ flutter_test -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/ -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/lib/ -using_custom_fonts -2.10 -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/using_custom_fonts/ -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/using_custom_fonts/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/lib/ 2 diff --git a/using_custom_fonts/.dart_tool/version b/using_custom_fonts/.dart_tool/version index 26e33797..0163af7e 100644 --- a/using_custom_fonts/.dart_tool/version +++ b/using_custom_fonts/.dart_tool/version @@ -1 +1 @@ -2.0.4 \ No newline at end of file +3.3.5 \ No newline at end of file diff --git a/using_custom_fonts/android/android/app/src/main/AndroidManifest.xml b/using_custom_fonts/android/android/app/src/main/AndroidManifest.xml index d5320878..eafa28cc 100644 --- a/using_custom_fonts/android/android/app/src/main/AndroidManifest.xml +++ b/using_custom_fonts/android/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,11 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - + diff --git a/using_custom_fonts/android/app/src/main/java/github/nisrulz/usingcustomfonts/MainActivity.java b/using_custom_fonts/android/app/src/main/java/github/nisrulz/usingcustomfonts/MainActivity.java deleted file mode 100644 index 7300eaae..00000000 --- a/using_custom_fonts/android/app/src/main/java/github/nisrulz/usingcustomfonts/MainActivity.java +++ /dev/null @@ -1,14 +0,0 @@ -package github.nisrulz.usingcustomfonts; - -import android.os.Bundle; - -import io.flutter.app.FlutterActivity; -import io.flutter.plugins.GeneratedPluginRegistrant; - -public class MainActivity extends FlutterActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); - } -} diff --git a/using_custom_fonts/android/gradle/wrapper/gradle-wrapper.jar b/using_custom_fonts/android/gradle/wrapper/gradle-wrapper.jar index e708b1c0..249e5832 100644 Binary files a/using_custom_fonts/android/gradle/wrapper/gradle-wrapper.jar and b/using_custom_fonts/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/using_custom_fonts/android/gradle/wrapper/gradle-wrapper.properties b/using_custom_fonts/android/gradle/wrapper/gradle-wrapper.properties index 05679dc3..ae04661e 100644 --- a/using_custom_fonts/android/gradle/wrapper/gradle-wrapper.properties +++ b/using_custom_fonts/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/using_custom_fonts/android/gradlew b/using_custom_fonts/android/gradlew index 4f906e0c..a69d9cb6 100755 --- a/using_custom_fonts/android/gradlew +++ b/using_custom_fonts/android/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/using_custom_fonts/android/gradlew.bat b/using_custom_fonts/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/using_custom_fonts/android/gradlew.bat +++ b/using_custom_fonts/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/using_edittext/.dart_tool/package_config.json b/using_edittext/.dart_tool/package_config.json index 5b2229cd..f925a1d9 100644 --- a/using_edittext/.dart_tool/package_config.json +++ b/using_edittext/.dart_tool/package_config.json @@ -3,129 +3,123 @@ "packages": [ { "name": "async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "boolean_selector", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "characters", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "charcode", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "clock", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "collection", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "fake_async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "flutter_test", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter_test", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "matcher", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12", "packageUri": "lib/", "languageVersion": "2.12" }, + { + "name": "material_color_utilities", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5", + "packageUri": "lib/", + "languageVersion": "2.13" + }, { "name": "meta", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "path", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "sky_engine", - "rootUri": "file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "source_span", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "stack_trace", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "stream_channel", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "string_scanner", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "term_glyph", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "test_api", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "typed_data", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "vector_math", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "using_edittext", @@ -134,7 +128,7 @@ "languageVersion": "2.10" } ], - "generated": "2021-07-25T18:35:53.663551Z", + "generated": "2022-10-22T19:15:01.388233Z", "generator": "pub", - "generatorVersion": "2.12.2" + "generatorVersion": "2.18.2" } diff --git a/using_edittext/.dart_tool/package_config_subset b/using_edittext/.dart_tool/package_config_subset index 4b49666b..c782629c 100644 --- a/using_edittext/.dart_tool/package_config_subset +++ b/using_edittext/.dart_tool/package_config_subset @@ -1,89 +1,85 @@ +using_edittext +2.10 +file:///Users/nishantsrivastava/Documents/github/flutter-examples/using_edittext/ +file:///Users/nishantsrivastava/Documents/github/flutter-examples/using_edittext/lib/ async -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/lib/ boolean_selector 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ characters 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/lib/ -charcode -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/lib/ clock 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/lib/ collection 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/lib/ fake_async 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/lib/ matcher 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/lib/ +material_color_utilities +2.13 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/lib/ meta 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/lib/ path 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/lib/ source_span -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/lib/ stack_trace 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ stream_channel 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ string_scanner 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/lib/ term_glyph 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/lib/ test_api 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/lib/ -typed_data -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/lib/ vector_math -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/lib/ sky_engine 2.12 -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/ -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/lib/ flutter -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter/ -file:///home/zion/Documents/sdks/flutter/packages/flutter/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/lib/ flutter_test -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/ -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/lib/ -using_edittext -2.10 -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/using_edittext/ -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/using_edittext/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/lib/ 2 diff --git a/using_edittext/.dart_tool/version b/using_edittext/.dart_tool/version index 26e33797..0163af7e 100644 --- a/using_edittext/.dart_tool/version +++ b/using_edittext/.dart_tool/version @@ -1 +1 @@ -2.0.4 \ No newline at end of file +3.3.5 \ No newline at end of file diff --git a/using_edittext/android/android/app/src/main/AndroidManifest.xml b/using_edittext/android/android/app/src/main/AndroidManifest.xml index d5320878..eafa28cc 100644 --- a/using_edittext/android/android/app/src/main/AndroidManifest.xml +++ b/using_edittext/android/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,11 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - - + \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/using_edittext/android/gradlew.bat b/using_edittext/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/using_edittext/android/gradlew.bat +++ b/using_edittext/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/using_expansionpanel/android/app/src/main/AndroidManifest.xml b/using_expansionpanel/android/app/src/main/AndroidManifest.xml index 8a5a4e5c..f9cbe8b2 100644 --- a/using_expansionpanel/android/app/src/main/AndroidManifest.xml +++ b/using_expansionpanel/android/app/src/main/AndroidManifest.xml @@ -5,7 +5,7 @@ android:name="${applicationName}" android:icon="@mipmap/ic_launcher"> - + diff --git a/using_firebase_db/android/app/src/main/java/github/nisrulz/using_firebase_db/MainActivity.java b/using_firebase_db/android/app/src/main/java/github/nisrulz/using_firebase_db/MainActivity.java deleted file mode 100644 index 7bd98bcc..00000000 --- a/using_firebase_db/android/app/src/main/java/github/nisrulz/using_firebase_db/MainActivity.java +++ /dev/null @@ -1,13 +0,0 @@ -package github.nisrulz.using_firebase_db; - -import android.os.Bundle; -import io.flutter.app.FlutterActivity; -import io.flutter.plugins.GeneratedPluginRegistrant; - -public class MainActivity extends FlutterActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); - } -} diff --git a/using_firebase_db/ios/Flutter/Debug.xcconfig b/using_firebase_db/ios/Flutter/Debug.xcconfig index 592ceee8..ec97fc6f 100644 --- a/using_firebase_db/ios/Flutter/Debug.xcconfig +++ b/using_firebase_db/ios/Flutter/Debug.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" diff --git a/using_firebase_db/ios/Flutter/Release.xcconfig b/using_firebase_db/ios/Flutter/Release.xcconfig index 592ceee8..c4855bfe 100644 --- a/using_firebase_db/ios/Flutter/Release.xcconfig +++ b/using_firebase_db/ios/Flutter/Release.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig" diff --git a/using_firebase_db/ios/Podfile b/using_firebase_db/ios/Podfile new file mode 100644 index 00000000..d207307f --- /dev/null +++ b/using_firebase_db/ios/Podfile @@ -0,0 +1,38 @@ +# Uncomment this line to define a global platform for your project +# platform :ios, '11.0' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_ios_podfile_setup + +target 'Runner' do + flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) + end +end diff --git a/using_gradient/.dart_tool/package_config.json b/using_gradient/.dart_tool/package_config.json index 3e2675c7..7b000ed6 100644 --- a/using_gradient/.dart_tool/package_config.json +++ b/using_gradient/.dart_tool/package_config.json @@ -3,129 +3,123 @@ "packages": [ { "name": "async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "boolean_selector", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "characters", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "charcode", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "clock", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "collection", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "fake_async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "flutter_test", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter_test", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "matcher", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12", "packageUri": "lib/", "languageVersion": "2.12" }, + { + "name": "material_color_utilities", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5", + "packageUri": "lib/", + "languageVersion": "2.13" + }, { "name": "meta", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "path", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "sky_engine", - "rootUri": "file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "source_span", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "stack_trace", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "stream_channel", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "string_scanner", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "term_glyph", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "test_api", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "typed_data", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "vector_math", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "using_gradient", @@ -134,7 +128,7 @@ "languageVersion": "2.10" } ], - "generated": "2021-07-25T18:35:58.326991Z", + "generated": "2022-10-22T19:15:14.507097Z", "generator": "pub", - "generatorVersion": "2.12.2" + "generatorVersion": "2.18.2" } diff --git a/using_gradient/.dart_tool/package_config_subset b/using_gradient/.dart_tool/package_config_subset index 2e2e336c..e603dcb8 100644 --- a/using_gradient/.dart_tool/package_config_subset +++ b/using_gradient/.dart_tool/package_config_subset @@ -1,89 +1,85 @@ +using_gradient +2.10 +file:///Users/nishantsrivastava/Documents/github/flutter-examples/using_gradient/ +file:///Users/nishantsrivastava/Documents/github/flutter-examples/using_gradient/lib/ async -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/lib/ boolean_selector 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ characters 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/lib/ -charcode -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/lib/ clock 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/lib/ collection 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/lib/ fake_async 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/lib/ matcher 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/lib/ +material_color_utilities +2.13 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/lib/ meta 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/lib/ path 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/lib/ source_span -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/lib/ stack_trace 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ stream_channel 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ string_scanner 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/lib/ term_glyph 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/lib/ test_api 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/lib/ -typed_data -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/lib/ vector_math -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/lib/ sky_engine 2.12 -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/ -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/lib/ flutter -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter/ -file:///home/zion/Documents/sdks/flutter/packages/flutter/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/lib/ flutter_test -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/ -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/lib/ -using_gradient -2.10 -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/using_gradient/ -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/using_gradient/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/lib/ 2 diff --git a/using_gradient/.dart_tool/version b/using_gradient/.dart_tool/version index 26e33797..0163af7e 100644 --- a/using_gradient/.dart_tool/version +++ b/using_gradient/.dart_tool/version @@ -1 +1 @@ -2.0.4 \ No newline at end of file +3.3.5 \ No newline at end of file diff --git a/using_gradient/android/android/app/src/main/AndroidManifest.xml b/using_gradient/android/android/app/src/main/AndroidManifest.xml index d5320878..eafa28cc 100644 --- a/using_gradient/android/android/app/src/main/AndroidManifest.xml +++ b/using_gradient/android/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,11 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - + diff --git a/using_gradient/android/app/src/main/java/github/nisrulz/usinggradient/MainActivity.java b/using_gradient/android/app/src/main/java/github/nisrulz/usinggradient/MainActivity.java deleted file mode 100644 index 8aa1eec0..00000000 --- a/using_gradient/android/app/src/main/java/github/nisrulz/usinggradient/MainActivity.java +++ /dev/null @@ -1,14 +0,0 @@ -package github.nisrulz.usinggradient; - -import android.os.Bundle; - -import io.flutter.app.FlutterActivity; -import io.flutter.plugins.GeneratedPluginRegistrant; - -public class MainActivity extends FlutterActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); - } -} diff --git a/using_gradient/android/gradle/wrapper/gradle-wrapper.jar b/using_gradient/android/gradle/wrapper/gradle-wrapper.jar index e708b1c0..249e5832 100644 Binary files a/using_gradient/android/gradle/wrapper/gradle-wrapper.jar and b/using_gradient/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/using_gradient/android/gradle/wrapper/gradle-wrapper.properties b/using_gradient/android/gradle/wrapper/gradle-wrapper.properties index 05679dc3..ae04661e 100644 --- a/using_gradient/android/gradle/wrapper/gradle-wrapper.properties +++ b/using_gradient/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/using_gradient/android/gradlew b/using_gradient/android/gradlew index 4f906e0c..a69d9cb6 100755 --- a/using_gradient/android/gradlew +++ b/using_gradient/android/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/using_gradient/android/gradlew.bat b/using_gradient/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/using_gradient/android/gradlew.bat +++ b/using_gradient/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/using_http_get/.dart_tool/package_config.json b/using_http_get/.dart_tool/package_config.json index c17bd5de..00dfe77d 100644 --- a/using_http_get/.dart_tool/package_config.json +++ b/using_http_get/.dart_tool/package_config.json @@ -3,147 +3,141 @@ "packages": [ { "name": "async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "boolean_selector", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "characters", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "charcode", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "clock", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "collection", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "fake_async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "flutter_test", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter_test", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "http", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.2", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.13.5", "packageUri": "lib/", - "languageVersion": "2.4" + "languageVersion": "2.14" }, { "name": "http_parser", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.4", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/http_parser-4.0.2", "packageUri": "lib/", - "languageVersion": "2.3" + "languageVersion": "2.12" }, { "name": "matcher", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12", "packageUri": "lib/", "languageVersion": "2.12" }, { - "name": "meta", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0", + "name": "material_color_utilities", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.13" }, { - "name": "path", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0", + "name": "meta", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0", "packageUri": "lib/", "languageVersion": "2.12" }, { - "name": "pedantic", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/pedantic-1.9.0", + "name": "path", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2", "packageUri": "lib/", - "languageVersion": "2.1" + "languageVersion": "2.12" }, { "name": "sky_engine", - "rootUri": "file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "source_span", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "stack_trace", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "stream_channel", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "string_scanner", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "term_glyph", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "test_api", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "typed_data", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "vector_math", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "using_http_get", @@ -152,7 +146,7 @@ "languageVersion": "2.10" } ], - "generated": "2021-07-25T18:36:01.033919Z", + "generated": "2022-10-22T19:15:16.684842Z", "generator": "pub", - "generatorVersion": "2.12.2" + "generatorVersion": "2.18.2" } diff --git a/using_http_get/.dart_tool/package_config_subset b/using_http_get/.dart_tool/package_config_subset index 5d55af29..3c050088 100644 --- a/using_http_get/.dart_tool/package_config_subset +++ b/using_http_get/.dart_tool/package_config_subset @@ -1,101 +1,97 @@ +using_http_get +2.10 +file:///Users/nishantsrivastava/Documents/github/flutter-examples/using_http_get/ +file:///Users/nishantsrivastava/Documents/github/flutter-examples/using_http_get/lib/ async -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/lib/ boolean_selector 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ characters 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/lib/ -charcode -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/lib/ clock 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/lib/ collection 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/lib/ fake_async 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/lib/ http -2.4 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.2/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.2/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.13.5/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.13.5/lib/ http_parser -2.3 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.4/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.4/lib/ +2.12 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/http_parser-4.0.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/http_parser-4.0.2/lib/ matcher 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/lib/ +material_color_utilities +2.13 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/lib/ meta 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/lib/ path 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/lib/ -pedantic -2.1 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/pedantic-1.9.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/pedantic-1.9.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/lib/ source_span -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/lib/ stack_trace 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ stream_channel 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ string_scanner 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/lib/ term_glyph 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/lib/ test_api 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/lib/ typed_data 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib/ vector_math -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/lib/ sky_engine 2.12 -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/ -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/lib/ flutter -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter/ -file:///home/zion/Documents/sdks/flutter/packages/flutter/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/lib/ flutter_test -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/ -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/lib/ -using_http_get -2.10 -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/using_http_get/ -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/using_http_get/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/lib/ 2 diff --git a/using_http_get/.dart_tool/version b/using_http_get/.dart_tool/version index 26e33797..0163af7e 100644 --- a/using_http_get/.dart_tool/version +++ b/using_http_get/.dart_tool/version @@ -1 +1 @@ -2.0.4 \ No newline at end of file +3.3.5 \ No newline at end of file diff --git a/using_http_get/android/android/app/src/main/AndroidManifest.xml b/using_http_get/android/android/app/src/main/AndroidManifest.xml index d5320878..eafa28cc 100644 --- a/using_http_get/android/android/app/src/main/AndroidManifest.xml +++ b/using_http_get/android/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,11 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - - + \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/using_http_get/android/gradlew.bat b/using_http_get/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/using_http_get/android/gradlew.bat +++ b/using_http_get/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/using_http_get/pubspec.yaml b/using_http_get/pubspec.yaml index b75978c7..a921fc6d 100644 --- a/using_http_get/pubspec.yaml +++ b/using_http_get/pubspec.yaml @@ -7,7 +7,7 @@ environment: dependencies: flutter: sdk: flutter - http: ^0.12.0 + http: ^0.13.3 dev_dependencies: flutter_test: diff --git a/using_interactiveviewer/android/app/src/main/AndroidManifest.xml b/using_interactiveviewer/android/app/src/main/AndroidManifest.xml index 9f82387d..d1c64da9 100644 --- a/using_interactiveviewer/android/app/src/main/AndroidManifest.xml +++ b/using_interactiveviewer/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,11 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - + diff --git a/using_listview/android/app/src/main/java/github/nisrulz/usinglistview/MainActivity.java b/using_listview/android/app/src/main/java/github/nisrulz/usinglistview/MainActivity.java deleted file mode 100644 index 1fee85c4..00000000 --- a/using_listview/android/app/src/main/java/github/nisrulz/usinglistview/MainActivity.java +++ /dev/null @@ -1,14 +0,0 @@ -package github.nisrulz.usinglistview; - -import android.os.Bundle; - -import io.flutter.app.FlutterActivity; -import io.flutter.plugins.GeneratedPluginRegistrant; - -public class MainActivity extends FlutterActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); - } -} diff --git a/using_listview/android/gradle/wrapper/gradle-wrapper.jar b/using_listview/android/gradle/wrapper/gradle-wrapper.jar index e708b1c0..249e5832 100644 Binary files a/using_listview/android/gradle/wrapper/gradle-wrapper.jar and b/using_listview/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/using_listview/android/gradle/wrapper/gradle-wrapper.properties b/using_listview/android/gradle/wrapper/gradle-wrapper.properties index 05679dc3..ae04661e 100644 --- a/using_listview/android/gradle/wrapper/gradle-wrapper.properties +++ b/using_listview/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/using_listview/android/gradlew b/using_listview/android/gradlew index 4f906e0c..a69d9cb6 100755 --- a/using_listview/android/gradlew +++ b/using_listview/android/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/using_listview/android/gradlew.bat b/using_listview/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/using_listview/android/gradlew.bat +++ b/using_listview/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/using_listwheelscrollview/android/app/src/main/AndroidManifest.xml b/using_listwheelscrollview/android/app/src/main/AndroidManifest.xml index ac481f8c..578ea04a 100644 --- a/using_listwheelscrollview/android/app/src/main/AndroidManifest.xml +++ b/using_listwheelscrollview/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,11 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> =2.12.0-0.0 <3.0.0" + dart: ">=2.17.0-0 <3.0.0" diff --git a/using_platform_adaptive/android/app/src/main/AndroidManifest.xml b/using_platform_adaptive/android/app/src/main/AndroidManifest.xml index c97a6e45..410ef4e5 100644 --- a/using_platform_adaptive/android/app/src/main/AndroidManifest.xml +++ b/using_platform_adaptive/android/app/src/main/AndroidManifest.xml @@ -5,7 +5,7 @@ android:name="${applicationName}" android:icon="@mipmap/ic_launcher"> - + diff --git a/using_snackbar/android/app/src/main/java/github/nisrulz/usingsnackbar/MainActivity.java b/using_snackbar/android/app/src/main/java/github/nisrulz/usingsnackbar/MainActivity.java deleted file mode 100644 index 47115223..00000000 --- a/using_snackbar/android/app/src/main/java/github/nisrulz/usingsnackbar/MainActivity.java +++ /dev/null @@ -1,14 +0,0 @@ -package github.nisrulz.usingsnackbar; - -import android.os.Bundle; - -import io.flutter.app.FlutterActivity; -import io.flutter.plugins.GeneratedPluginRegistrant; - -public class MainActivity extends FlutterActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); - } -} diff --git a/using_snackbar/android/gradle/wrapper/gradle-wrapper.jar b/using_snackbar/android/gradle/wrapper/gradle-wrapper.jar index e708b1c0..249e5832 100644 Binary files a/using_snackbar/android/gradle/wrapper/gradle-wrapper.jar and b/using_snackbar/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/using_snackbar/android/gradle/wrapper/gradle-wrapper.properties b/using_snackbar/android/gradle/wrapper/gradle-wrapper.properties index 05679dc3..ae04661e 100644 --- a/using_snackbar/android/gradle/wrapper/gradle-wrapper.properties +++ b/using_snackbar/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/using_snackbar/android/gradlew b/using_snackbar/android/gradlew index 4f906e0c..a69d9cb6 100755 --- a/using_snackbar/android/gradlew +++ b/using_snackbar/android/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/using_snackbar/android/gradlew.bat b/using_snackbar/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/using_snackbar/android/gradlew.bat +++ b/using_snackbar/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/using_stepper/.dart_tool/package_config.json b/using_stepper/.dart_tool/package_config.json index f69bdf82..d0c7c41c 100644 --- a/using_stepper/.dart_tool/package_config.json +++ b/using_stepper/.dart_tool/package_config.json @@ -3,129 +3,123 @@ "packages": [ { "name": "async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "boolean_selector", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "characters", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "charcode", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "clock", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "collection", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "fake_async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "flutter_test", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter_test", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "matcher", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12", "packageUri": "lib/", "languageVersion": "2.12" }, + { + "name": "material_color_utilities", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5", + "packageUri": "lib/", + "languageVersion": "2.13" + }, { "name": "meta", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "path", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "sky_engine", - "rootUri": "file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "source_span", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "stack_trace", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "stream_channel", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "string_scanner", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "term_glyph", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "test_api", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "typed_data", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "vector_math", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "using_stepper", @@ -134,7 +128,7 @@ "languageVersion": "2.10" } ], - "generated": "2021-07-25T18:36:08.683206Z", + "generated": "2022-10-22T19:15:33.651139Z", "generator": "pub", - "generatorVersion": "2.12.2" + "generatorVersion": "2.18.2" } diff --git a/using_stepper/.dart_tool/package_config_subset b/using_stepper/.dart_tool/package_config_subset index d4800ece..d8a4a255 100644 --- a/using_stepper/.dart_tool/package_config_subset +++ b/using_stepper/.dart_tool/package_config_subset @@ -1,89 +1,85 @@ +using_stepper +2.10 +file:///Users/nishantsrivastava/Documents/github/flutter-examples/using_stepper/ +file:///Users/nishantsrivastava/Documents/github/flutter-examples/using_stepper/lib/ async -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/lib/ boolean_selector 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ characters 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/lib/ -charcode -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/lib/ clock 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/lib/ collection 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/lib/ fake_async 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/lib/ matcher 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/lib/ +material_color_utilities +2.13 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/lib/ meta 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/lib/ path 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/lib/ source_span -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/lib/ stack_trace 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ stream_channel 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ string_scanner 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/lib/ term_glyph 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/lib/ test_api 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/lib/ -typed_data -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/lib/ vector_math -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/lib/ sky_engine 2.12 -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/ -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/lib/ flutter -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter/ -file:///home/zion/Documents/sdks/flutter/packages/flutter/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/lib/ flutter_test -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/ -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/lib/ -using_stepper -2.10 -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/using_stepper/ -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/using_stepper/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/lib/ 2 diff --git a/using_stepper/.dart_tool/version b/using_stepper/.dart_tool/version index 26e33797..0163af7e 100644 --- a/using_stepper/.dart_tool/version +++ b/using_stepper/.dart_tool/version @@ -1 +1 @@ -2.0.4 \ No newline at end of file +3.3.5 \ No newline at end of file diff --git a/using_stepper/android/android/app/src/main/AndroidManifest.xml b/using_stepper/android/android/app/src/main/AndroidManifest.xml index d5320878..eafa28cc 100644 --- a/using_stepper/android/android/app/src/main/AndroidManifest.xml +++ b/using_stepper/android/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,11 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - + \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/using_stepper/android/gradlew.bat b/using_stepper/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/using_stepper/android/gradlew.bat +++ b/using_stepper/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/using_tabs/.dart_tool/package_config.json b/using_tabs/.dart_tool/package_config.json index 46af2390..e90c759b 100644 --- a/using_tabs/.dart_tool/package_config.json +++ b/using_tabs/.dart_tool/package_config.json @@ -3,129 +3,123 @@ "packages": [ { "name": "async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "boolean_selector", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "characters", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "charcode", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "clock", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "collection", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "fake_async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "flutter_test", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter_test", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "matcher", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12", "packageUri": "lib/", "languageVersion": "2.12" }, + { + "name": "material_color_utilities", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5", + "packageUri": "lib/", + "languageVersion": "2.13" + }, { "name": "meta", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "path", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "sky_engine", - "rootUri": "file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "source_span", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "stack_trace", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "stream_channel", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "string_scanner", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "term_glyph", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "test_api", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "typed_data", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "vector_math", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "using_tabs", @@ -134,7 +128,7 @@ "languageVersion": "2.10" } ], - "generated": "2021-07-25T18:36:10.301849Z", + "generated": "2022-10-22T19:15:39.012797Z", "generator": "pub", - "generatorVersion": "2.12.2" + "generatorVersion": "2.18.2" } diff --git a/using_tabs/.dart_tool/package_config_subset b/using_tabs/.dart_tool/package_config_subset index 279bc85f..cc04c481 100644 --- a/using_tabs/.dart_tool/package_config_subset +++ b/using_tabs/.dart_tool/package_config_subset @@ -1,89 +1,85 @@ +using_tabs +2.10 +file:///Users/nishantsrivastava/Documents/github/flutter-examples/using_tabs/ +file:///Users/nishantsrivastava/Documents/github/flutter-examples/using_tabs/lib/ async -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/lib/ boolean_selector 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ characters 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/lib/ -charcode -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/lib/ clock 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/lib/ collection 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/lib/ fake_async 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/lib/ matcher 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/lib/ +material_color_utilities +2.13 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/lib/ meta 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/lib/ path 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/lib/ source_span -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/lib/ stack_trace 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ stream_channel 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ string_scanner 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/lib/ term_glyph 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/lib/ test_api 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/lib/ -typed_data -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/lib/ vector_math -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/lib/ sky_engine 2.12 -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/ -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/lib/ flutter -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter/ -file:///home/zion/Documents/sdks/flutter/packages/flutter/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/lib/ flutter_test -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/ -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/lib/ -using_tabs -2.10 -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/using_tabs/ -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/using_tabs/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/lib/ 2 diff --git a/using_tabs/.dart_tool/version b/using_tabs/.dart_tool/version index 26e33797..0163af7e 100644 --- a/using_tabs/.dart_tool/version +++ b/using_tabs/.dart_tool/version @@ -1 +1 @@ -2.0.4 \ No newline at end of file +3.3.5 \ No newline at end of file diff --git a/using_tabs/android/android/app/src/main/AndroidManifest.xml b/using_tabs/android/android/app/src/main/AndroidManifest.xml index d5320878..eafa28cc 100644 --- a/using_tabs/android/android/app/src/main/AndroidManifest.xml +++ b/using_tabs/android/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,11 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - - + \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/using_tabs/android/gradlew.bat b/using_tabs/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/using_tabs/android/gradlew.bat +++ b/using_tabs/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/using_theme/.dart_tool/package_config.json b/using_theme/.dart_tool/package_config.json index 4ae666b1..1ef26a24 100644 --- a/using_theme/.dart_tool/package_config.json +++ b/using_theme/.dart_tool/package_config.json @@ -3,129 +3,123 @@ "packages": [ { "name": "async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "boolean_selector", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "characters", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "charcode", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "clock", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "collection", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "fake_async", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "flutter_test", - "rootUri": "file:///home/zion/Documents/sdks/flutter/packages/flutter_test", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.17" }, { "name": "matcher", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12", "packageUri": "lib/", "languageVersion": "2.12" }, + { + "name": "material_color_utilities", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5", + "packageUri": "lib/", + "languageVersion": "2.13" + }, { "name": "meta", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "path", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "sky_engine", - "rootUri": "file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "source_span", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "stack_trace", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "stream_channel", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "string_scanner", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "term_glyph", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "test_api", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "typed_data", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "vector_math", - "rootUri": "file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0", + "rootUri": "file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.14" }, { "name": "using_theme", @@ -134,7 +128,7 @@ "languageVersion": "2.10" } ], - "generated": "2021-07-25T18:36:12.080976Z", + "generated": "2022-10-22T19:15:43.198658Z", "generator": "pub", - "generatorVersion": "2.12.2" + "generatorVersion": "2.18.2" } diff --git a/using_theme/.dart_tool/package_config_subset b/using_theme/.dart_tool/package_config_subset index ef9606b5..81779fa5 100644 --- a/using_theme/.dart_tool/package_config_subset +++ b/using_theme/.dart_tool/package_config_subset @@ -1,89 +1,85 @@ +using_theme +2.10 +file:///Users/nishantsrivastava/Documents/github/flutter-examples/using_theme/ +file:///Users/nishantsrivastava/Documents/github/flutter-examples/using_theme/lib/ async -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/lib/ boolean_selector 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/ characters 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0/lib/ -charcode -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.1/lib/ clock 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.1/lib/ collection 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/lib/ fake_async 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.3.1/lib/ matcher 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/lib/ +material_color_utilities +2.13 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.5/lib/ meta 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.8.0/lib/ path 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/lib/ source_span -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.0/lib/ stack_trace 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/ stream_channel 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/ string_scanner 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/lib/ term_glyph 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/lib/ test_api 2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19/lib/ -typed_data -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/lib/ vector_math -2.12 -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/ -file:///home/zion/Documents/sdks/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0/lib/ +2.14 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/lib/ sky_engine 2.12 -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/ -file:///home/zion/Documents/sdks/flutter/bin/cache/pkg/sky_engine/lib/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/bin/cache/pkg/sky_engine/lib/ flutter -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter/ -file:///home/zion/Documents/sdks/flutter/packages/flutter/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter/lib/ flutter_test -2.12 -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/ -file:///home/zion/Documents/sdks/flutter/packages/flutter_test/lib/ -using_theme -2.10 -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/using_theme/ -file:///home/zion/Documents/workspaces/github_ws/flutter-examples/using_theme/lib/ +2.17 +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/ +file:///usr/local/Caskroom/flutter/2.8.1/flutter/packages/flutter_test/lib/ 2 diff --git a/using_theme/.dart_tool/version b/using_theme/.dart_tool/version index 26e33797..0163af7e 100644 --- a/using_theme/.dart_tool/version +++ b/using_theme/.dart_tool/version @@ -1 +1 @@ -2.0.4 \ No newline at end of file +3.3.5 \ No newline at end of file diff --git a/using_theme/android/android/app/src/main/AndroidManifest.xml b/using_theme/android/android/app/src/main/AndroidManifest.xml index d5320878..eafa28cc 100644 --- a/using_theme/android/android/app/src/main/AndroidManifest.xml +++ b/using_theme/android/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,11 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - - + \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/using_theme/android/gradlew.bat b/using_theme/android/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/using_theme/android/gradlew.bat +++ b/using_theme/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/view_pdf_file/android/app/src/main/AndroidManifest.xml b/view_pdf_file/android/app/src/main/AndroidManifest.xml index cb8957f3..f4b1753f 100644 --- a/view_pdf_file/android/app/src/main/AndroidManifest.xml +++ b/view_pdf_file/android/app/src/main/AndroidManifest.xml @@ -6,11 +6,11 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_ios_podfile_setup + +target 'Runner' do + use_frameworks! + use_modular_headers! + + flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) + end +end