Skip to content

Commit

Permalink
Merge branch 'hotfix' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
rafaelsetragni committed Mar 16, 2024
2 parents 15734cd + ff53e29 commit 3809218
Show file tree
Hide file tree
Showing 24 changed files with 277 additions and 121 deletions.
Binary file modified .DS_Store
Binary file not shown.
48 changes: 33 additions & 15 deletions .dart_tool/package_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,24 @@
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "leak_tracker",
"rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker-10.0.0",
"packageUri": "lib/",
"languageVersion": "3.1"
},
{
"name": "leak_tracker_flutter_testing",
"rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-2.0.1",
"packageUri": "lib/",
"languageVersion": "3.1"
},
{
"name": "leak_tracker_testing",
"rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker_testing-2.0.1",
"packageUri": "lib/",
"languageVersion": "3.1"
},
{
"name": "lints",
"rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/lints-3.0.0",
Expand All @@ -159,19 +177,19 @@
},
{
"name": "matcher",
"rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/matcher-0.12.16",
"rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/matcher-0.12.16+1",
"packageUri": "lib/",
"languageVersion": "2.18"
"languageVersion": "3.0"
},
{
"name": "material_color_utilities",
"rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/material_color_utilities-0.5.0",
"rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/material_color_utilities-0.8.0",
"packageUri": "lib/",
"languageVersion": "2.17"
},
{
"name": "meta",
"rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/meta-1.10.0",
"rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/meta-1.11.0",
"packageUri": "lib/",
"languageVersion": "2.12"
},
Expand All @@ -183,7 +201,7 @@
},
{
"name": "mocktail",
"rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/mocktail-1.0.2",
"rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/mocktail-1.0.3",
"packageUri": "lib/",
"languageVersion": "2.12"
},
Expand All @@ -195,9 +213,9 @@
},
{
"name": "path",
"rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/path-1.8.3",
"rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/path-1.9.0",
"packageUri": "lib/",
"languageVersion": "2.12"
"languageVersion": "3.0"
},
{
"name": "plugin_platform_interface",
Expand Down Expand Up @@ -272,16 +290,16 @@
"languageVersion": "2.14"
},
{
"name": "watcher",
"rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/watcher-1.0.2",
"name": "vm_service",
"rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/vm_service-13.0.0",
"packageUri": "lib/",
"languageVersion": "2.14"
"languageVersion": "3.0"
},
{
"name": "web",
"rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/web-0.3.0",
"name": "watcher",
"rootUri": "file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/watcher-1.0.2",
"packageUri": "lib/",
"languageVersion": "3.2"
"languageVersion": "2.14"
},
{
"name": "yaml",
Expand All @@ -296,7 +314,7 @@
"languageVersion": "2.19"
}
],
"generated": "2024-01-17T11:13:42.180172Z",
"generated": "2024-03-15T22:37:48.300698Z",
"generator": "pub",
"generatorVersion": "3.2.3"
"generatorVersion": "3.3.1"
}
44 changes: 28 additions & 16 deletions .dart_tool/package_config_subset
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,18 @@ intl
3.0
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/intl-0.19.0/
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/intl-0.19.0/lib/
leak_tracker
3.1
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker-10.0.0/
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker-10.0.0/lib/
leak_tracker_flutter_testing
3.1
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-2.0.1/
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker_flutter_testing-2.0.1/lib/
leak_tracker_testing
3.1
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker_testing-2.0.1/
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/leak_tracker_testing-2.0.1/lib/
lints
3.0
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/lints-3.0.0/
Expand All @@ -91,33 +103,33 @@ logging
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/logging-1.1.1/
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/logging-1.1.1/lib/
matcher
2.18
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/matcher-0.12.16/
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/matcher-0.12.16/lib/
3.0
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/matcher-0.12.16+1/
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/matcher-0.12.16+1/lib/
material_color_utilities
2.17
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/material_color_utilities-0.5.0/
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/material_color_utilities-0.5.0/lib/
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/material_color_utilities-0.8.0/
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/material_color_utilities-0.8.0/lib/
meta
2.12
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/meta-1.10.0/
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/meta-1.10.0/lib/
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/meta-1.11.0/
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/meta-1.11.0/lib/
mockito
3.1
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/mockito-5.4.4/
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/mockito-5.4.4/lib/
mocktail
2.12
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/mocktail-1.0.2/
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/mocktail-1.0.2/lib/
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/mocktail-1.0.3/
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/mocktail-1.0.3/lib/
package_config
2.12
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/package_config-2.1.0/
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/package_config-2.1.0/lib/
path
2.12
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/path-1.8.3/
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/path-1.8.3/lib/
3.0
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/path-1.9.0/
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/path-1.9.0/lib/
plugin_platform_interface
3.0
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/plugin_platform_interface-2.1.8/
Expand Down Expand Up @@ -162,14 +174,14 @@ vector_math
2.14
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/vector_math-2.1.4/
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/vector_math-2.1.4/lib/
vm_service
3.0
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/vm_service-13.0.0/
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/vm_service-13.0.0/lib/
watcher
2.14
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/watcher-1.0.2/
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/watcher-1.0.2/lib/
web
3.2
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/web-0.3.0/
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/web-0.3.0/lib/
yaml
2.12
file:///Users/rafaelsetragni/.pub-cache/hosted/pub.dev/yaml-3.1.1/
Expand Down
2 changes: 1 addition & 1 deletion .dart_tool/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.16.5
3.19.3
Binary file modified .github/.DS_Store
Binary file not shown.
17 changes: 9 additions & 8 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions android/.idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions android/.idea/appInsightsSettings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions android/.idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions android/.idea/migrations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions android/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions android/.idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
group 'me.carda.awesome_notifications'
version '0.9.1'
version '0.9.3'

buildscript {
repositories {
Expand Down Expand Up @@ -43,7 +43,7 @@ android {

dependencies {
// implementation project(':awn_core')
implementation 'me.carda:AndroidAwnCore:[0.9.1, 0.10.0)'
implementation 'me.carda:AndroidAwnCore:[0.9.3, 0.10.0)'

implementation 'com.google.guava:guava:32.1.3-android'

Expand Down
2 changes: 1 addition & 1 deletion example/ios/Flutter/AppFrameworkInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>11.0</string>
<string>12.0</string>
</dict>
</plist>
6 changes: 3 additions & 3 deletions example/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
platform :ios, '11.0'
platform :ios, '12.0'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
Expand Down Expand Up @@ -31,7 +31,7 @@ target 'Runner' do
use_frameworks!
use_modular_headers!

#pod 'IosAwnCore', '0.7.5-dev.3'
#pod 'IosAwnCore', '0.9.3'
#pod 'IosAwnCore', :path => '../../../IosAwnCore/'
flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
end
Expand All @@ -57,4 +57,4 @@ end
awesome_pod_file = File.expand_path(File.join('plugins', 'awesome_notifications', 'ios', 'Scripts', 'AwesomePodFile'), '.symlinks')
require awesome_pod_file
update_awesome_main_target_settings('Runner', File.dirname(File.realpath(__FILE__)), flutter_root)
################ Awesome Notifications pod modification 2 ###################
################ Awesome Notifications pod modification 2 ###################
Loading

0 comments on commit 3809218

Please sign in to comment.