Merge branch 'hotfix/1.3.1'

Author: MilindWebEngage

CHANGELOG.md

@@ -1,41 +1,56 @@
 ## CHANGE LOG
 
+### Version 1.3.1 (Jan 12, 2024)
+
+- Resolved Android Gradle compatibility issue
+- Fixed a bug affecting iOS user attributes
+
 ### Version 1.3.0 (Dec 19, 2023)
-* Viber Channel Support Added 
-* Version tracking 
+
+- Viber Channel Support Added
+- Version tracking
 
 ### Version 1.2.4 (April 25, 2023)
-* Isolate issue fixed :[#issue-32](https://github.com/WebEngage/webengage-flutter/issues/32), [#issue-24](https://github.com/WebEngage/webengage-flutter/issues/24)
+
+- Isolate issue fixed :[#issue-32](https://github.com/WebEngage/webengage-flutter/issues/32), [#issue-24](https://github.com/WebEngage/webengage-flutter/issues/24)
 
 ### Version 1.2.3 (March 22, 2023)
-* Plugin singleton issue fixed : [#issue-31](https://github.com/WebEngage/webengage-flutter/issues/31)
+
+- Plugin singleton issue fixed : [#issue-31](https://github.com/WebEngage/webengage-flutter/issues/31)
 
 ### Version 1.2.2 (March 13, 2023)
-* iOS SDK updated to XCFramework 
-* Plugin has been updated to Singlton Instance
+
+- iOS SDK updated to XCFramework
+- Plugin has been updated to Singlton Instance
 
 ### Version 1.2.1 (October 31, 2022)
-* Push callback in Background state
-* jcenter moved to mavencentral
-* Supports WebEngage Android SDK v4.+
+
+- Push callback in Background state
+- jcenter moved to mavencentral
+- Supports WebEngage Android SDK v4.+
 
 ### Version 1.2.0 (September 20, 2022)
-* iOS XCFramework suppport
-* Anonymous id callback
+
+- iOS XCFramework suppport
+- Anonymous id callback
 
 ### Version 1.0.3 (August 10, 2021)
-* Support for Flutter 2.2 (Null Safety)
+
+- Support for Flutter 2.2 (Null Safety)
 
 ### Version 1.0.2 (Februrary 11, 2021)
-* Improvements for handling Push callbacks in killed state.
-* Support for universal link (iOS)
+
+- Improvements for handling Push callbacks in killed state.
+- Support for universal link (iOS)
 
 ### Version 1.0.1 (November 09, 2020)
-* Fixes and README.md updates.
-* Supports WebEngage Android SDK v3.18+
-* Supports WebEngage iOS SDK v5.0+
+
+- Fixes and README.md updates.
+- Supports WebEngage Android SDK v3.18+
+- Supports WebEngage iOS SDK v5.0+
 
 ### Version 1.0.0 (November 09, 2020)
-* Initial Release.
-* Supports WebEngage Android SDK v3.18+
-* Supports WebEngage iOS SDK v5.0+
+
+- Initial Release.
+- Supports WebEngage Android SDK v3.18+
+- Supports WebEngage iOS SDK v5.0+

android/build.gradle

@@ -1,5 +1,5 @@
 group 'com.webengage.webengage_plugin'
-version '1.3.0'
+version '1.3.1'
 
 buildscript {
     repositories {
@@ -57,5 +57,5 @@ String readVersion() {
 }
 
 dependencies {
-    implementation 'com.webengage:android-sdk:4.+'
+    api 'com.webengage:android-sdk:[4,)'
 }

android/version.properties

@@ -1,3 +1,3 @@
 major=1
 minor=3
-patch=0
+patch=1

ios/Classes/WebEngagePlugin.m

@@ -3,7 +3,7 @@
 #import "WebEngageConstants.h"
 
 static FlutterMethodChannel* channel = nil;
-NSString * const WEGPluginVersion = @"1.3.0";
+NSString * const WEGPluginVersion = @"1.3.1";
 NSString * const DATE_FORMAT = @"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
 int const DATE_FORMAT_LENGTH = 24;
 
@@ -211,9 +211,26 @@ - (void) trackScreen:(FlutterMethodCall *)call withResult:(FlutterResult)result
 - (void) setUserAttribute:(FlutterMethodCall *)call withResult:(FlutterResult)result {
     NSString* attributeName = call.arguments[ATTRIBUTE_NAME];
     id value = call.arguments[ATTRIBUTES];
+    [self setUserAttribute:attributeName withValue:value];
+}
+
+- (void) setUserAttributes:(FlutterMethodCall *)call withResult:(FlutterResult)result {
+    id _dictionary = call.arguments[ATTRIBUTES];
+    if ([_dictionary isKindOfClass:[NSDictionary class]]) {
+        NSDictionary *dictionary = (NSDictionary *)_dictionary;
+
+        for (NSString *attributeName in dictionary) {
+            id value = [dictionary objectForKey:attributeName];
+            [self setUserAttribute:attributeName withValue:value];
+        }
+    }
+
+}
+
+- (void)setUserAttribute:(NSString *)attributeName withValue:(id)value {
     if ([value isKindOfClass:[NSString class]]) {
         if ([value length] == DATE_FORMAT_LENGTH) {
-            NSDate * date = [self getDate:value];
+            NSDate *date = [self getDate:value];
             if (date != nil) {
                 [[WebEngage sharedInstance].user setAttribute:attributeName withDateValue:date];
             } else {
@@ -222,27 +239,15 @@ - (void) setUserAttribute:(FlutterMethodCall *)call withResult:(FlutterResult)re
         } else {
             [[WebEngage sharedInstance].user setAttribute:attributeName withStringValue:value];
         }
-    }
-    else if ([value isKindOfClass:[NSNumber class]]) {
+    } else if ([value isKindOfClass:[NSNumber class]]) {
         [[WebEngage sharedInstance].user setAttribute:attributeName withValue:value];
-    }
-    else if ([value isKindOfClass:[NSArray class]]) {
+    } else if ([value isKindOfClass:[NSArray class]]) {
         [[WebEngage sharedInstance].user setAttribute:attributeName withArrayValue:value];
-    }
-    else if ([value isKindOfClass:[NSDate class]]) {
+    } else if ([value isKindOfClass:[NSDate class]]) {
         [[WebEngage sharedInstance].user setAttribute:attributeName withDateValue:value];
     }
 }
 
-- (void) setUserAttributes:(FlutterMethodCall *)call withResult:(FlutterResult)result {
-    NSString* attributeName = call.arguments[ATTRIBUTE_NAME];
-    id value = call.arguments[ATTRIBUTES];
-    if ([value isKindOfClass:[NSDictionary class]]) {
-        [[WebEngage sharedInstance].user setAttribute:attributeName withDictionaryValue:value];
-    }
-
-}
-
 - (NSDate *)getDate:(NSString *)strValue {
     NSDateFormatter * dateFormatter = [[NSDateFormatter alloc] init];
     [dateFormatter setDateFormat:DATE_FORMAT];

ios/webengage_flutter.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'webengage_flutter'
-  s.version          = '1.3.0'
+  s.version          = '1.3.1'
   s.summary          = 'WebEngage Flutter iOS SDK.'
   s.description      = <<-DESC
   WebEngage Flutter iOS SDK.

pubspec.yaml

@@ -1,6 +1,6 @@
 name: webengage_flutter
 description: WebEngage Flutter plugin.
-version: 1.3.0
+version: 1.3.1
 homepage: https://webengage.com/
 repository: https://github.com/WebEngage/webengage-flutter