From c4be8b6060c70085994859d08639b49b2deb7441 Mon Sep 17 00:00:00 2001 From: "Mike O. Abidakun" Date: Sat, 24 Feb 2024 10:42:58 +0000 Subject: [PATCH 01/20] Update pubspec.lock --- pubspec.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index af6112d..38cfc94 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.17.2" fake_async: dependency: transitive description: @@ -59,14 +59,6 @@ packages: description: flutter source: sdk version: "0.0.0" - js: - dependency: transitive - description: - name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 - url: "https://pub.dev" - source: hosted - version: "0.6.7" lint: dependency: "direct dev" description: @@ -79,18 +71,18 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" meta: dependency: transitive description: @@ -116,10 +108,10 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" stack_trace: dependency: transitive description: @@ -156,10 +148,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.6.0" vector_math: dependency: transitive description: @@ -168,6 +160,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" sdks: - dart: ">=3.0.0-0 <4.0.0" + dart: ">=3.1.0-185.0.dev <4.0.0" flutter: ">=2.2.2" From 04d05d628b241979dff412a7a09bfc6f71fc3bf5 Mon Sep 17 00:00:00 2001 From: "Mike O. Abidakun" Date: Sat, 24 Feb 2024 10:43:25 +0000 Subject: [PATCH 02/20] Modifications by code prettifier. --- test/iterable_flutter_test.dart | 58 +++++++++++---------------------- 1 file changed, 19 insertions(+), 39 deletions(-) diff --git a/test/iterable_flutter_test.dart b/test/iterable_flutter_test.dart index 75f4a23..45862e4 100644 --- a/test/iterable_flutter_test.dart +++ b/test/iterable_flutter_test.dart @@ -61,11 +61,7 @@ void main() { expect(calledMethod, [ isMethodCall( 'initialize', - arguments: { - apiKey: apiKey, - pushIntegrationName: pushIntegrationName, - activeLogDebug: false - }, + arguments: {apiKey: apiKey, pushIntegrationName: pushIntegrationName, activeLogDebug: false}, ), ]); }); @@ -136,16 +132,15 @@ void main() { pushData = openedResultMap; }); - await ServicesBinding.instance?.defaultBinaryMessenger - .handlePlatformMessage( - 'iterable_flutter', - const StandardMethodCodec().encodeMethodCall( - const MethodCall( - 'openedNotificationHandler', - {keyBody: contentBody}, - ), - ), - (ByteData? data) {}); + await ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( + 'iterable_flutter', + const StandardMethodCodec().encodeMethodCall( + const MethodCall( + 'openedNotificationHandler', + {keyBody: contentBody}, + ), + ), + (ByteData? data) {}); expect(contentBody, pushData[keyBody]); }); @@ -167,14 +162,9 @@ void main() { expect(result['body'], 'test'); expect(result['additionalData']['keyNumber'] as int, 1); expect(result['additionalData']['keyMap']['keyMap2'], 'value2'); - expect( - result['additionalData']['keyMapChild']['keyMapChild3'] - ['keyMapChild32'], - 'value3'); - expect( - result['additionalData']['itbl']['isGhostPush'] as bool, isFalse); - expect(result['additionalData']['itbl']['defaultAction']['type'], - 'openApp'); + expect(result['additionalData']['keyMapChild']['keyMapChild3']['keyMapChild32'], 'value3'); + expect(result['additionalData']['itbl']['isGhostPush'] as bool, isFalse); + expect(result['additionalData']['itbl']['defaultAction']['type'], 'openApp'); }); }); @@ -188,14 +178,9 @@ void main() { expect(result['body'], 'test'); expect(result['additionalData']['keyNumber'] as int, 1); expect(result['additionalData']['keyMap']['keyMap2'], 'value2'); - expect( - result['additionalData']['keyMapChild']['keyMapChild3'] - ['keyMapChild32'], - 'value3'); - expect( - result['additionalData']['itbl']['isGhostPush'] as bool, isFalse); - expect(result['additionalData']['itbl']['defaultAction']['type'], - 'openApp'); + expect(result['additionalData']['keyMapChild']['keyMapChild3']['keyMapChild32'], 'value3'); + expect(result['additionalData']['itbl']['isGhostPush'] as bool, isFalse); + expect(result['additionalData']['itbl']['defaultAction']['type'], 'openApp'); }); }); @@ -208,14 +193,9 @@ void main() { expect(result['body'], 'test'); expect(result['additionalData']['keyNumber'] as int, 1); expect(result['additionalData']['keyMap']['keyMap2'], 'value2'); - expect( - result['additionalData']['keyMapChild']['keyMapChild3'] - ['keyMapChild32'], - 'value3'); - expect( - result['additionalData']['itbl']['isGhostPush'] as bool, isFalse); - expect(result['additionalData']['itbl']['defaultAction']['type'], - 'openApp'); + expect(result['additionalData']['keyMapChild']['keyMapChild3']['keyMapChild32'], 'value3'); + expect(result['additionalData']['itbl']['isGhostPush'] as bool, isFalse); + expect(result['additionalData']['itbl']['defaultAction']['type'], 'openApp'); }); }); }); From 34834356771ddc7669821a6ff8a9337cd12a2bf5 Mon Sep 17 00:00:00 2001 From: "Mike O. Abidakun" Date: Sat, 24 Feb 2024 10:49:14 +0000 Subject: [PATCH 03/20] Updates version information in pubspec. --- pubspec.lock | 2 +- pubspec.yaml | 47 ++++++----------------------------------------- 2 files changed, 7 insertions(+), 42 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 38cfc94..ae320d2 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -170,4 +170,4 @@ packages: version: "0.1.4-beta" sdks: dart: ">=3.1.0-185.0.dev <4.0.0" - flutter: ">=2.2.2" + flutter: any diff --git a/pubspec.yaml b/pubspec.yaml index 393f0ff..3c9b778 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,14 +1,14 @@ name: iterable_flutter description: Flutter implementation for iterable.com Cross Channel Marketing Platform -version: 0.5.9 +version: 0.6.0 homepage: https://lahaus.com -repository: https://github.com/la-haus/iterable-flutter -issue_tracker: https://github.com/la-haus/iterable-flutter/issues -documentation: https://github.com/la-haus/iterable-flutter#readme +repository: https://github.com/mabidakun/iterable-flutter +issue_tracker: https://github.com/mabidakun/iterable-flutter/issues +documentation: https://github.com/mabidakun/iterable-flutter#readme environment: - sdk: '>=2.13.3 <3.0.0' - flutter: '>= 2.2.2' + sdk: ^3.0.0 + flutter: "any" dependencies: flutter: @@ -20,10 +20,6 @@ dev_dependencies: lint: 1.6.0 -# For information on the generic Dart part of this file, see the -# following page: https://dart.dev/tools/pub/pubspec - -# The following section is specific to Flutter. flutter: # This section identifies this Flutter project as a plugin project. # The 'pluginClass' and Android 'package' identifiers should not ordinarily @@ -36,34 +32,3 @@ flutter: pluginClass: IterableFlutterPlugin ios: pluginClass: IterableFlutterPlugin - - # To add assets to your plugin package, add an assets section, like this: - # assets: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg - # - # For details regarding assets in packages, see - # https://flutter.dev/assets-and-images/#from-packages - # - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.dev/assets-and-images/#resolution-aware. - - # To add custom fonts to your plugin package, add a fonts section here, - # in this "flutter" section. Each entry in this list should have a - # "family" key with the font family name, and a "fonts" key with a - # list giving the asset and other descriptors for the font. For - # example: - # fonts: - # - family: Schyler - # fonts: - # - asset: fonts/Schyler-Regular.ttf - # - asset: fonts/Schyler-Italic.ttf - # style: italic - # - family: Trajan Pro - # fonts: - # - asset: fonts/TrajanPro.ttf - # - asset: fonts/TrajanPro_Bold.ttf - # weight: 700 - # - # For details regarding fonts in packages, see - # https://flutter.dev/custom-fonts/#from-packages From 8ea6668749fb4fecd79c5022ebf2ac2b4f6d4523 Mon Sep 17 00:00:00 2001 From: "Mike O. Abidakun" Date: Sat, 24 Feb 2024 10:44:03 +0000 Subject: [PATCH 04/20] Updates .gitignore --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e4498c7..8ec873c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ +.dart_tool/ example/ios/Podfile.lock -example/pubspec.lock \ No newline at end of file +example/pubspec.lock + From 9cabae9790f9dbc2718c9940a8f05d994d2d5919 Mon Sep 17 00:00:00 2001 From: "Mike O. Abidakun" Date: Sat, 24 Feb 2024 10:53:29 +0000 Subject: [PATCH 05/20] Removes .dart_tool sub-folder from git. --- .dart_tool/package_config.json | 146 ------------------------------- .dart_tool/package_config_subset | 93 -------------------- .dart_tool/version | 1 - 3 files changed, 240 deletions(-) delete mode 100644 .dart_tool/package_config.json delete mode 100644 .dart_tool/package_config_subset delete mode 100644 .dart_tool/version diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json deleted file mode 100644 index 87a4e6d..0000000 --- a/.dart_tool/package_config.json +++ /dev/null @@ -1,146 +0,0 @@ -{ - "configVersion": 2, - "packages": [ - { - "name": "async", - "rootUri": "file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/async-2.11.0", - "packageUri": "lib/", - "languageVersion": "2.18" - }, - { - "name": "boolean_selector", - "rootUri": "file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/boolean_selector-2.1.1", - "packageUri": "lib/", - "languageVersion": "2.17" - }, - { - "name": "characters", - "rootUri": "file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/characters-1.3.0", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "clock", - "rootUri": "file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/clock-1.1.1", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "collection", - "rootUri": "file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/collection-1.17.1", - "packageUri": "lib/", - "languageVersion": "2.18" - }, - { - "name": "fake_async", - "rootUri": "file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/fake_async-1.3.1", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "flutter", - "rootUri": "file:///Users/carlosmunoz/flutter/packages/flutter", - "packageUri": "lib/", - "languageVersion": "3.0" - }, - { - "name": "flutter_test", - "rootUri": "file:///Users/carlosmunoz/flutter/packages/flutter_test", - "packageUri": "lib/", - "languageVersion": "3.0" - }, - { - "name": "js", - "rootUri": "file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/js-0.6.7", - "packageUri": "lib/", - "languageVersion": "2.19" - }, - { - "name": "lint", - "rootUri": "file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/lint-1.6.0", - "packageUri": "lib/", - "languageVersion": "2.13" - }, - { - "name": "matcher", - "rootUri": "file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/matcher-0.12.15", - "packageUri": "lib/", - "languageVersion": "2.18" - }, - { - "name": "material_color_utilities", - "rootUri": "file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/material_color_utilities-0.2.0", - "packageUri": "lib/", - "languageVersion": "2.13" - }, - { - "name": "meta", - "rootUri": "file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/meta-1.9.1", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "path", - "rootUri": "file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/path-1.8.3", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "sky_engine", - "rootUri": "file:///Users/carlosmunoz/flutter/bin/cache/pkg/sky_engine", - "packageUri": "lib/", - "languageVersion": "3.0" - }, - { - "name": "source_span", - "rootUri": "file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/source_span-1.9.1", - "packageUri": "lib/", - "languageVersion": "2.14" - }, - { - "name": "stack_trace", - "rootUri": "file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/stack_trace-1.11.0", - "packageUri": "lib/", - "languageVersion": "2.18" - }, - { - "name": "stream_channel", - "rootUri": "file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/stream_channel-2.1.1", - "packageUri": "lib/", - "languageVersion": "2.14" - }, - { - "name": "string_scanner", - "rootUri": "file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/string_scanner-1.2.0", - "packageUri": "lib/", - "languageVersion": "2.18" - }, - { - "name": "term_glyph", - "rootUri": "file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/term_glyph-1.2.1", - "packageUri": "lib/", - "languageVersion": "2.12" - }, - { - "name": "test_api", - "rootUri": "file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/test_api-0.5.1", - "packageUri": "lib/", - "languageVersion": "2.18" - }, - { - "name": "vector_math", - "rootUri": "file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/vector_math-2.1.4", - "packageUri": "lib/", - "languageVersion": "2.14" - }, - { - "name": "iterable_flutter", - "rootUri": "../", - "packageUri": "lib/", - "languageVersion": "2.13" - } - ], - "generated": "2023-09-07T19:53:55.090606Z", - "generator": "pub", - "generatorVersion": "3.0.6" -} diff --git a/.dart_tool/package_config_subset b/.dart_tool/package_config_subset deleted file mode 100644 index 193d183..0000000 --- a/.dart_tool/package_config_subset +++ /dev/null @@ -1,93 +0,0 @@ -async -2.18 -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/async-2.11.0/ -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/async-2.11.0/lib/ -boolean_selector -2.17 -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/boolean_selector-2.1.1/ -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/boolean_selector-2.1.1/lib/ -characters -2.12 -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/characters-1.3.0/ -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/characters-1.3.0/lib/ -clock -2.12 -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/clock-1.1.1/ -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/clock-1.1.1/lib/ -collection -2.18 -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/collection-1.17.1/ -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/collection-1.17.1/lib/ -fake_async -2.12 -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/fake_async-1.3.1/ -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/fake_async-1.3.1/lib/ -js -2.19 -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/js-0.6.7/ -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/js-0.6.7/lib/ -lint -2.13 -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/lint-1.6.0/ -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/lint-1.6.0/lib/ -matcher -2.18 -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/matcher-0.12.15/ -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/matcher-0.12.15/lib/ -material_color_utilities -2.13 -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/material_color_utilities-0.2.0/ -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/material_color_utilities-0.2.0/lib/ -meta -2.12 -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/meta-1.9.1/ -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/meta-1.9.1/lib/ -path -2.12 -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/path-1.8.3/ -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/path-1.8.3/lib/ -source_span -2.14 -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/source_span-1.9.1/ -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/source_span-1.9.1/lib/ -stack_trace -2.18 -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/stack_trace-1.11.0/ -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/stack_trace-1.11.0/lib/ -stream_channel -2.14 -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/stream_channel-2.1.1/ -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/stream_channel-2.1.1/lib/ -string_scanner -2.18 -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/string_scanner-1.2.0/ -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/string_scanner-1.2.0/lib/ -term_glyph -2.12 -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/term_glyph-1.2.1/ -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/term_glyph-1.2.1/lib/ -test_api -2.18 -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/test_api-0.5.1/ -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/test_api-0.5.1/lib/ -vector_math -2.14 -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/vector_math-2.1.4/ -file:///Users/carlosmunoz/.pub-cache/hosted/pub.dev/vector_math-2.1.4/lib/ -iterable_flutter -2.13 -file:///Users/carlosmunoz/FlutterDev/lahaus/iterable-flutter/ -file:///Users/carlosmunoz/FlutterDev/lahaus/iterable-flutter/lib/ -sky_engine -3.0 -file:///Users/carlosmunoz/flutter/bin/cache/pkg/sky_engine/ -file:///Users/carlosmunoz/flutter/bin/cache/pkg/sky_engine/lib/ -flutter -3.0 -file:///Users/carlosmunoz/flutter/packages/flutter/ -file:///Users/carlosmunoz/flutter/packages/flutter/lib/ -flutter_test -3.0 -file:///Users/carlosmunoz/flutter/packages/flutter_test/ -file:///Users/carlosmunoz/flutter/packages/flutter_test/lib/ -2 diff --git a/.dart_tool/version b/.dart_tool/version deleted file mode 100644 index 14fc9e9..0000000 --- a/.dart_tool/version +++ /dev/null @@ -1 +0,0 @@ -3.10.6 \ No newline at end of file From 1b9d25c2c32201e1960edff801216d7100b9e098 Mon Sep 17 00:00:00 2001 From: "Mike O. Abidakun" Date: Sat, 24 Feb 2024 11:01:50 +0000 Subject: [PATCH 06/20] Updates Iterable-iOS-SDK to version 6.5.0 --- example/ios/Flutter/AppFrameworkInfo.plist | 2 +- example/ios/Podfile | 2 +- example/ios/Runner.xcodeproj/project.pbxproj | 13 ++++++++----- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- example/ios/Runner/Info.plist | 4 ++++ ios/iterable_flutter.podspec | 2 +- 6 files changed, 16 insertions(+), 9 deletions(-) diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist index 9367d48..9625e10 100644 --- a/example/ios/Flutter/AppFrameworkInfo.plist +++ b/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 8.0 + 11.0 diff --git a/example/ios/Podfile b/example/ios/Podfile index 1e8c3c9..88359b2 100644 --- a/example/ios/Podfile +++ b/example/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '9.0' +# platform :ios, '11.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 969806c..0c158fd 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -157,7 +157,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -240,10 +240,12 @@ }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", ); name = "Thin Binary"; outputPaths = ( @@ -254,6 +256,7 @@ }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -341,7 +344,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -421,7 +424,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -470,7 +473,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index a28140c..b52b2e6 100644 --- a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ UIViewControllerBasedStatusBarAppearance + CADisableMinimumFrameDurationOnPhone + + UIApplicationSupportsIndirectInputEvents + diff --git a/ios/iterable_flutter.podspec b/ios/iterable_flutter.podspec index 5a559a4..3ef5a6a 100644 --- a/ios/iterable_flutter.podspec +++ b/ios/iterable_flutter.podspec @@ -15,7 +15,7 @@ Pod::Spec.new do |s| s.source = { :path => '.' } s.source_files = 'Classes/**/*' s.dependency 'Flutter' - s.dependency 'Iterable-iOS-SDK', '6.4.7' + s.dependency 'Iterable-iOS-SDK', '6.5.0' s.platform = :ios, '11.0' # Flutter.framework does not contain a i386 slice. From 02cf34167b91a4c47d592da7b4697f9f2c81b152 Mon Sep 17 00:00:00 2001 From: "Mike O. Abidakun" Date: Sat, 24 Feb 2024 11:04:25 +0000 Subject: [PATCH 07/20] Updates iterable-android-sdk to version 3.5.0 --- android/build.gradle | 2 +- example/android/build.gradle | 2 +- example/android/gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index f16601e..d1559a5 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -42,7 +42,7 @@ android { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'com.iterable:iterableapi:3.4.9' + implementation 'com.iterable:iterableapi:3.5.0' testImplementation 'junit:junit:4.13.2' testImplementation 'org.json:json:20210307' } diff --git a/example/android/build.gradle b/example/android/build.gradle index d77129e..88ad2bc 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -25,6 +25,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index bc6a58a..cfe88f6 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip From 1d6d4e36ad3947bf9ee25b87ee1146adc8af99fb Mon Sep 17 00:00:00 2001 From: "Mike O. Abidakun" Date: Sat, 24 Feb 2024 11:14:10 +0000 Subject: [PATCH 08/20] Bumps compileSdkVersion and minSdkVersion to resolve warnings. --- example/android/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 1ecbeb6..74bde5e 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -29,7 +29,7 @@ apply from: project(':flutter_config').projectDir.getPath() + "/dotenv.gradle" apply plugin: 'com.google.gms.google-services' android { - compileSdkVersion 31 + compileSdkVersion 33 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -38,7 +38,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.lahaus.iterable_flutter_example" - minSdkVersion 16 + minSdkVersion 21 targetSdkVersion 31 versionCode flutterVersionCode.toInteger() versionName flutterVersionName From a75689135271cda1733ebc7f6cf7277f203e73a5 Mon Sep 17 00:00:00 2001 From: "Mike O. Abidakun" Date: Sat, 24 Feb 2024 11:20:12 +0000 Subject: [PATCH 09/20] Bumps up Gradle versions. --- android/build.gradle | 2 +- android/gradle/wrapper/gradle-wrapper.properties | 2 +- example/android/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index d1559a5..7516d19 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:7.0.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 3c9d085..ceccc3a 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip diff --git a/example/android/build.gradle b/example/android/build.gradle index 88ad2bc..bdf6fc6 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:7.0.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.3.10' } From 9182fed4805a9d8386309a99cc6b81d8fb89c250 Mon Sep 17 00:00:00 2001 From: "Mike O. Abidakun" Date: Sat, 24 Feb 2024 11:25:50 +0000 Subject: [PATCH 10/20] Modified to include android:exported="true" on .MainActivity declaration. --- .../android/app/src/main/AndroidManifest.xml | 47 ++++++------------- 1 file changed, 15 insertions(+), 32 deletions(-) diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index eae816e..8cd308b 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -1,41 +1,24 @@ - - - - - - - - - - - - - - - + + From 0df489e57b3bc0aafc4fb71a63b732d02340be61 Mon Sep 17 00:00:00 2001 From: "Mike O. Abidakun" Date: Fri, 1 Mar 2024 15:11:58 +0000 Subject: [PATCH 11/20] Update README.md. --- README.md | 63 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index f8ed0d0..73cbe16 100644 --- a/README.md +++ b/README.md @@ -1,48 +1,47 @@ -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- - -⚠️ ⚠️ -We are no longer maintaining this library. Feel free to fork it and work on your own branch. -⚠️ ⚠️ - -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +# Iterable Flutter Plugin +Flutter plugin to support Android and iOS push notifications from [https://iterable.com/](https://iterable.com/). -# Iterable Plugin -[![Pub Version](https://img.shields.io/pub/v/iterable_flutter)](https://pub.dev/packages/iterable_flutter) -[![Build](https://github.com/la-haus/iterable-flutter/actions/workflows/build.yml/badge.svg)](https://github.com/la-haus/iterable-flutter/actions/workflows/build.yml) -[![Lint](https://github.com/la-haus/iterable-flutter/actions/workflows/lint.yml/badge.svg)](https://github.com/la-haus/iterable-flutter/actions/workflows/lint.yml) -[![Tests](https://github.com/la-haus/iterable-flutter/actions/workflows/test.yml/badge.svg)](https://github.com/la-haus/iterable-flutter/actions/workflows/test.yml) +--- -> **This library is in alpha** so the implementation details could change a lot from version to version, -> check releases and [CHANGELOG.md](CHANGELOG.md) to know how it changes over time. +This is the **Spring Health** fork of the (now abandoned) [iterable_flutter](https://github.com/la-haus/iterable-flutter) project. +As a result, this is not officially published via pub.dev, with the installation process being that of any, non-pub.dev published packag/plugin. -Flutter plugin to support Android and iOS push notifications from [https://iterable.com/](https://iterable.com/). +--- ## Usage + To use this plugin, add `iterable_flutter` as a [dependency in your pubspec.yaml file](https://flutter.io/platform-plugins/). ### Supported methods -| Method | Android | iOS | Web | MacOS | Windows | Linux | -|---|---|---|---|---|---|---| -| `initialize` | X | X | | | | | -| `setEmail` | X | X | | | | | -| `setUserId` | X | X | | | | | -| `registerForPush` | X | X | | | | | -| `updateUser` | X | X | | | | | -| `signOut` | X | X | | | | | -| `track` | X | X | | | | | -| `setNotificationOpenedHandler` | X | X | | | | | + +| Method | Android | iOS | Web | MacOS | Windows | Linux | +| ------------------------------ | ------- | --- | --- | ----- | ------- | ----- | +| `initialize` | X | X | | | | | +| `setEmail` | X | X | | | | | +| `setUserId` | X | X | | | | | +| `registerForPush` | X | X | | | | | +| `updateUser` | X | X | | | | | +| `signOut` | X | X | | | | | +| `track` | X | X | | | | | +| `setNotificationOpenedHandler` | X | X | | | | | ## Installation + 1. Add `iterable_flutter` as a plugin in `pubspec.yaml` with the version you need like this: + ```yaml -iterable_flutter: 0.5.4 +iterable_flutter: + git: + url: https://github.com/mabidakun/iterable-flutter.git + ref: 0.6.0-MA-SH ``` 2. Use `IterableFlutter.initialize` to set your iterable keys. -> First, create a mobile API Key from [Iterable](https://support.iterable.com/hc/en-us/articles/360043464871#creating-api-keys). -> Then, also from Iterable, [create a mobile app](https://support.iterable.com/hc/en-us/articles/115000331943#_2-create-a-mobile-app-in-iterable) and [assign a push integration](https://support.iterable.com/hc/en-us/articles/115000331943#_3-assign-a-push-integration-to-the-mobile-app) -to it. + > First, create a mobile API Key from [Iterable](https://support.iterable.com/hc/en-us/articles/360043464871#creating-api-keys). + > Then, also from Iterable, [create a mobile app](https://support.iterable.com/hc/en-us/articles/115000331943#_2-create-a-mobile-app-in-iterable) and [assign a push integration](https://support.iterable.com/hc/en-us/articles/115000331943#_3-assign-a-push-integration-to-the-mobile-app) + > to it. + ```dart class _MyAppState extends State { @override @@ -58,12 +57,14 @@ class _MyAppState extends State { ``` 3. Identify the user -> The identification can be done either using `IterableFlutter.setEmail` or `IterableFlutter.setUserId` methods. -> Don't set an email and user ID in the same session, doing so causes the SDK to treat them as different users. + + > The identification can be done either using `IterableFlutter.setEmail` or `IterableFlutter.setUserId` methods. + > Don't set an email and user ID in the same session, doing so causes the SDK to treat them as different users. 4. Call `IterableFlutter.registerForPush` to register the device for current user and listen for opened pushes with `IterableFlutter.setNotificationOpenedHandler` 5. Track your events and optional data fields, call `IterableFlutter.track` method. ### Example + Check the [example/](example/) folder to see an example project using this library. From 729a5d281571f8521ae440b0c373fa187b4a9b8b Mon Sep 17 00:00:00 2001 From: "Mike O. Abidakun" Date: Sat, 20 Apr 2024 17:13:28 +0100 Subject: [PATCH 12/20] Updates package to use Iterable-iOS-SDK version 6.5.2. --- ios/iterable_flutter.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/iterable_flutter.podspec b/ios/iterable_flutter.podspec index 3ef5a6a..5d91522 100644 --- a/ios/iterable_flutter.podspec +++ b/ios/iterable_flutter.podspec @@ -15,7 +15,7 @@ Pod::Spec.new do |s| s.source = { :path => '.' } s.source_files = 'Classes/**/*' s.dependency 'Flutter' - s.dependency 'Iterable-iOS-SDK', '6.5.0' + s.dependency 'Iterable-iOS-SDK', '6.5.2' s.platform = :ios, '11.0' # Flutter.framework does not contain a i386 slice. From 3f745604a4a2fe67b68669e9b66005b29001d827 Mon Sep 17 00:00:00 2001 From: "Mike O. Abidakun" Date: Sat, 20 Apr 2024 17:14:16 +0100 Subject: [PATCH 13/20] Updates plugin's Swift Version 5.3 and iOS platform version, to o match Iterable-iOS-SDK v6.5.2. --- ios/iterable_flutter.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/iterable_flutter.podspec b/ios/iterable_flutter.podspec index 5d91522..f1b5e40 100644 --- a/ios/iterable_flutter.podspec +++ b/ios/iterable_flutter.podspec @@ -16,9 +16,9 @@ Pod::Spec.new do |s| s.source_files = 'Classes/**/*' s.dependency 'Flutter' s.dependency 'Iterable-iOS-SDK', '6.5.2' - s.platform = :ios, '11.0' + s.platform = :ios, '10.0' # Flutter.framework does not contain a i386 slice. s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' } - s.swift_version = '5.0' + s.swift_version = '5.3' end From 52b1828dd8a05dbd7bf2eee805f2d0cf2b3957b6 Mon Sep 17 00:00:00 2001 From: "Mike O. Abidakun" Date: Sat, 20 Apr 2024 17:14:50 +0100 Subject: [PATCH 14/20] Updates plugin to use iterable-android-sdk version 3.5.1. --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 7516d19..5d750c3 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -42,7 +42,7 @@ android { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'com.iterable:iterableapi:3.5.0' + implementation 'com.iterable:iterableapi:3.5.1' testImplementation 'junit:junit:4.13.2' testImplementation 'org.json:json:20210307' } From 43744e0a3c75070009dc5823faf5b9705da2511c Mon Sep 17 00:00:00 2001 From: "Mike O. Abidakun" Date: Sat, 20 Apr 2024 17:24:14 +0100 Subject: [PATCH 15/20] Updates package version number. --- ios/iterable_flutter.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/iterable_flutter.podspec b/ios/iterable_flutter.podspec index f1b5e40..cb975c0 100644 --- a/ios/iterable_flutter.podspec +++ b/ios/iterable_flutter.podspec @@ -4,7 +4,7 @@ # Pod::Spec.new do |s| s.name = 'iterable_flutter' - s.version = '0.5.7' + s.version = '0.6.1' s.summary = 'Flutter implementation for iterable.com Cross Channel Marketing Platform' s.description = <<-DESC Flutter implementation for iterable.com Cross Channel Marketing Platform From 32e03136861a603923325405951f5eca7ef7ce09 Mon Sep 17 00:00:00 2001 From: "Mike O. Abidakun" Date: Sat, 20 Apr 2024 18:21:20 +0100 Subject: [PATCH 16/20] Automatic updates caused by running example project. --- example/ios/Flutter/AppFrameworkInfo.plist | 2 +- example/ios/Podfile | 2 +- example/ios/Runner.xcodeproj/project.pbxproj | 14 ++-- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- pubspec.lock | 66 +++++++++++++------ 5 files changed, 55 insertions(+), 31 deletions(-) diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist index 9625e10..7c56964 100644 --- a/example/ios/Flutter/AppFrameworkInfo.plist +++ b/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 11.0 + 12.0 diff --git a/example/ios/Podfile b/example/ios/Podfile index 88359b2..279576f 100644 --- a/example/ios/Podfile +++ b/example/ios/Podfile @@ -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' diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 0c158fd..3de7e65 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -157,7 +157,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -344,7 +344,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -364,7 +364,7 @@ DEVELOPMENT_TEAM = NNSGPL974Y; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -424,7 +424,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -473,7 +473,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -495,7 +495,7 @@ DEVELOPMENT_TEAM = NNSGPL974Y; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -520,7 +520,7 @@ DEVELOPMENT_TEAM = NNSGPL974Y; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index b52b2e6..e67b280 100644 --- a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ =3.1.0-185.0.dev <4.0.0" + dart: ">=3.2.0-0 <4.0.0" flutter: any From d8ca8c310760b2565c7e477dc16194a091bc75ca Mon Sep 17 00:00:00 2001 From: "Mike O. Abidakun" Date: Tue, 17 Sep 2024 07:19:00 +0100 Subject: [PATCH 17/20] Updates plugin to use Iterable-iOS-SDK v6.5.7 --- .gitignore | 1 + ios/iterable_flutter.podspec | 4 ++-- pubspec.lock | 28 ++++++++++++++-------------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 8ec873c..2cc7719 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .dart_tool/ example/ios/Podfile.lock example/pubspec.lock +build/ diff --git a/ios/iterable_flutter.podspec b/ios/iterable_flutter.podspec index cb975c0..509e85c 100644 --- a/ios/iterable_flutter.podspec +++ b/ios/iterable_flutter.podspec @@ -4,7 +4,7 @@ # Pod::Spec.new do |s| s.name = 'iterable_flutter' - s.version = '0.6.1' + s.version = '0.6.2' s.summary = 'Flutter implementation for iterable.com Cross Channel Marketing Platform' s.description = <<-DESC Flutter implementation for iterable.com Cross Channel Marketing Platform @@ -15,7 +15,7 @@ Pod::Spec.new do |s| s.source = { :path => '.' } s.source_files = 'Classes/**/*' s.dependency 'Flutter' - s.dependency 'Iterable-iOS-SDK', '6.5.2' + s.dependency 'Iterable-iOS-SDK', '6.5.7' s.platform = :ios, '10.0' # Flutter.framework does not contain a i386 slice. diff --git a/pubspec.lock b/pubspec.lock index f6db5a9..9c41d3f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -63,26 +63,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" url: "https://pub.dev" source: hosted - version: "10.0.0" + version: "10.0.4" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.3" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.1" lint: dependency: "direct dev" description: @@ -111,10 +111,10 @@ packages: dependency: transitive description: name: meta - sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.12.0" path: dependency: transitive description: @@ -172,10 +172,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.0" vector_math: dependency: transitive description: @@ -188,10 +188,10 @@ packages: dependency: transitive description: name: vm_service - sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" url: "https://pub.dev" source: hosted - version: "13.0.0" + version: "14.2.1" sdks: - dart: ">=3.2.0-0 <4.0.0" - flutter: any + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" From 4d2d4b25e3e28e2e5bb367d3438f388681c7ef7b Mon Sep 17 00:00:00 2001 From: "Mike O. Abidakun" Date: Tue, 17 Sep 2024 07:19:18 +0100 Subject: [PATCH 18/20] Bumps plugin version to 0.6.2 --- pubspec.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index 3c9b778..84b72ba 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,10 +1,10 @@ name: iterable_flutter description: Flutter implementation for iterable.com Cross Channel Marketing Platform -version: 0.6.0 +version: 0.6.2 homepage: https://lahaus.com -repository: https://github.com/mabidakun/iterable-flutter -issue_tracker: https://github.com/mabidakun/iterable-flutter/issues -documentation: https://github.com/mabidakun/iterable-flutter#readme +repository: https://github.com/SpringCare/iterable-flutter +issue_tracker: https://github.com/SpringCare/iterable-flutter/issues +documentation: https://github.com/SpringCare/iterable-flutter#readme environment: sdk: ^3.0.0 From 695dc2f54bc27611c35dc6bb2349ba34a5b92352 Mon Sep 17 00:00:00 2001 From: "Mike O. Abidakun" Date: Fri, 20 Dec 2024 15:28:54 +0000 Subject: [PATCH 19/20] Update to support Android 35 --- android/build.gradle | 24 ++++++++++++++----- .../gradle/wrapper/gradle-wrapper.properties | 4 +++- android/src/main/AndroidManifest.xml | 3 +-- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 5d750c3..b5e4430 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,14 +2,14 @@ group 'com.lahaus.iterable_flutter' version '0.5.7' buildscript { - ext.kotlin_version = '1.6.21' + ext.kotlin_version = '1.9.20' repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.0' + classpath 'com.android.tools.build:gradle:8.7.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -17,7 +17,7 @@ buildscript { rootProject.allprojects { repositories { google() - jcenter() + mavenCentral() } } @@ -25,12 +25,24 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 31 + if (project.hasProperty("android") && project.android.hasProperty("namespace")) { + namespace = "com.lahaus.iterable_flutter" + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8 + } sourceSets { main.java.srcDirs += 'src/main/kotlin' } defaultConfig { + compileSdk 34 minSdkVersion 16 } @@ -44,5 +56,5 @@ dependencies { implementation 'com.iterable:iterableapi:3.5.1' testImplementation 'junit:junit:4.13.2' - testImplementation 'org.json:json:20210307' + testImplementation 'org.json:json:20231013' } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index ceccc3a..09523c0 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 34532b9..a2f47b6 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,3 +1,2 @@ - + From af733aaa296e4459b9d8617dfc6a03d2c279e184 Mon Sep 17 00:00:00 2001 From: "Mike O. Abidakun" Date: Fri, 20 Dec 2024 15:35:39 +0000 Subject: [PATCH 20/20] Bumps up plugin version to 0.6.3 --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 84b72ba..39e1b0d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: iterable_flutter description: Flutter implementation for iterable.com Cross Channel Marketing Platform -version: 0.6.2 +version: 0.6.3 homepage: https://lahaus.com repository: https://github.com/SpringCare/iterable-flutter issue_tracker: https://github.com/SpringCare/iterable-flutter/issues