From a838014d2930b84e05aa3877582b7d84792d1b8d Mon Sep 17 00:00:00 2001
From: rahulraorefyne <rahul.rao@refyne.co.in>
Date: Sun, 11 Aug 2024 07:03:30 +0530
Subject: [PATCH 1/2] namespace added in gradle with compile sdk bump

---
 .gitignore                                  |  1 +
 android/build.gradle                        | 12 ++--
 android/src/main/AndroidManifest.xml        |  4 +-
 example_swift/.flutter-plugins              |  7 ++-
 example_swift/.flutter-plugins-dependencies |  2 +-
 example_swift/pubspec.lock                  | 70 ++++++++++++++-------
 example_swift/test/widget_test.dart         |  2 +-
 ios/webengage_flutter.podspec               |  2 +-
 pubspec.yaml                                |  2 +-
 9 files changed, 67 insertions(+), 35 deletions(-)

diff --git a/.gitignore b/.gitignore
index da4b62d..1a8ba37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 .pub/
 
 build/
+.fvm/
 
 .idea
 .vscode
diff --git a/android/build.gradle b/android/build.gradle
index dac1458..edf9769 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,5 +1,5 @@
 group 'com.webengage.webengage_plugin'
-version '1.5.0'
+version '1.5.1'
 
 buildscript {
     repositories {
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.4'
     }
 }
 
@@ -22,7 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 33
+    if (project.android.hasProperty("namespace")) {
+        namespace("com.webengage.webengage_plugin")
+    }
+
+    compileSdkVersion 34
 
     defaultConfig {
         minSdkVersion 21
@@ -57,5 +61,5 @@ String readVersion() {
 }
 
 dependencies {
-    api 'com.webengage:android-sdk:[4,)'
+    api 'com.webengage:android-sdk:4.16.0'
 }
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 0f4ea45..cd09758 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.webengage.webengage_plugin">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
     <application>
         <meta-data
             android:name="com.webengage.child.fl"
diff --git a/example_swift/.flutter-plugins b/example_swift/.flutter-plugins
index 3c41301..3b2b7b9 100644
--- a/example_swift/.flutter-plugins
+++ b/example_swift/.flutter-plugins
@@ -1,3 +1,6 @@
 # This is a generated file; do not edit or check into version control.
-fluttertoast=/Users/bhavesh/Development/flutter/.pub-cache/hosted/pub.dartlang.org/fluttertoast-8.0.8/
-webengage_flutter=/Users/bhavesh/Development/flutter/.pub-cache/hosted/pub.dartlang.org/webengage_flutter-1.0.3/
+permission_handler=/Users/rahul.rao/.pub-cache/hosted/pub.dev/permission_handler-10.4.5/
+permission_handler_android=/Users/rahul.rao/.pub-cache/hosted/pub.dev/permission_handler_android-10.3.6/
+permission_handler_apple=/Users/rahul.rao/.pub-cache/hosted/pub.dev/permission_handler_apple-9.1.4/
+permission_handler_windows=/Users/rahul.rao/.pub-cache/hosted/pub.dev/permission_handler_windows-0.1.3/
+webengage_flutter=/Users/rahul.rao/refyne/webengage-flutter/
diff --git a/example_swift/.flutter-plugins-dependencies b/example_swift/.flutter-plugins-dependencies
index c67360c..10bd7c3 100644
--- a/example_swift/.flutter-plugins-dependencies
+++ b/example_swift/.flutter-plugins-dependencies
@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"fluttertoast","path":"/Users/bhavesh/Development/flutter/.pub-cache/hosted/pub.dartlang.org/fluttertoast-8.0.8/","dependencies":[]},{"name":"webengage_flutter","path":"/Users/bhavesh/Development/flutter/.pub-cache/hosted/pub.dartlang.org/webengage_flutter-1.0.3/","dependencies":[]}],"android":[{"name":"fluttertoast","path":"/Users/bhavesh/Development/flutter/.pub-cache/hosted/pub.dartlang.org/fluttertoast-8.0.8/","dependencies":[]},{"name":"webengage_flutter","path":"/Users/bhavesh/Development/flutter/.pub-cache/hosted/pub.dartlang.org/webengage_flutter-1.0.3/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[{"name":"fluttertoast","path":"/Users/bhavesh/Development/flutter/.pub-cache/hosted/pub.dartlang.org/fluttertoast-8.0.8/","dependencies":[]}]},"dependencyGraph":[{"name":"fluttertoast","dependencies":[]},{"name":"webengage_flutter","dependencies":[]}],"date_created":"2022-06-20 09:42:08.573777","version":"2.5.3"}
\ No newline at end of file
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"permission_handler_apple","path":"/Users/rahul.rao/.pub-cache/hosted/pub.dev/permission_handler_apple-9.1.4/","native_build":true,"dependencies":[]},{"name":"webengage_flutter","path":"/Users/rahul.rao/refyne/webengage-flutter/","native_build":true,"dependencies":[]}],"android":[{"name":"permission_handler_android","path":"/Users/rahul.rao/.pub-cache/hosted/pub.dev/permission_handler_android-10.3.6/","native_build":true,"dependencies":[]},{"name":"webengage_flutter","path":"/Users/rahul.rao/refyne/webengage-flutter/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[{"name":"permission_handler_windows","path":"/Users/rahul.rao/.pub-cache/hosted/pub.dev/permission_handler_windows-0.1.3/","native_build":true,"dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"permission_handler","dependencies":["permission_handler_android","permission_handler_apple","permission_handler_windows"]},{"name":"permission_handler_android","dependencies":[]},{"name":"permission_handler_apple","dependencies":[]},{"name":"permission_handler_windows","dependencies":[]},{"name":"webengage_flutter","dependencies":[]}],"date_created":"2024-08-11 06:43:32.923222","version":"3.22.0"}
\ No newline at end of file
diff --git a/example_swift/pubspec.lock b/example_swift/pubspec.lock
index 717f1f3..bc96e59 100644
--- a/example_swift/pubspec.lock
+++ b/example_swift/pubspec.lock
@@ -37,10 +37,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.2"
+    version: "1.18.0"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -83,6 +83,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.17.0"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.4"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.3"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
   lints:
     dependency: transitive
     description:
@@ -95,34 +119,34 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16"
+    version: "0.12.16+1"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.8.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.12.0"
   path:
     dependency: transitive
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
   permission_handler:
     dependency: "direct main"
     description:
@@ -196,18 +220,18 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   string_scanner:
     dependency: transitive
     description:
@@ -228,10 +252,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.0"
+    version: "0.7.0"
   vector_math:
     dependency: transitive
     description:
@@ -240,21 +264,21 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
-  web:
+  vm_service:
     dependency: transitive
     description:
-      name: web
-      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      name: vm_service
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.4-beta"
+    version: "14.2.1"
   webengage_flutter:
     dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "1.3.0"
+    version: "1.5.0"
 sdks:
-  dart: ">=3.1.0-185.0.dev <4.0.0"
-  flutter: ">=2.8.0"
+  dart: ">=3.3.0 <4.0.0"
+  flutter: ">=3.18.0-18.0.pre.54"
diff --git a/example_swift/test/widget_test.dart b/example_swift/test/widget_test.dart
index 0b11f65..aebc4b1 100644
--- a/example_swift/test/widget_test.dart
+++ b/example_swift/test/widget_test.dart
@@ -13,7 +13,7 @@ import 'package:flutter_demo/main.dart';
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
     // Build our app and trigger a frame.
-    await tester.pumpWidget(const MyApp());
+    await tester.pumpWidget(MyApp());
 
     // Verify that our counter starts at 0.
     expect(find.text('0'), findsOneWidget);
diff --git a/ios/webengage_flutter.podspec b/ios/webengage_flutter.podspec
index d404219..7fd3b0c 100644
--- a/ios/webengage_flutter.podspec
+++ b/ios/webengage_flutter.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'webengage_flutter'
-  s.version          = '1.5.0'
+  s.version          = '1.5.1'
   s.summary          = 'WebEngage Flutter iOS SDK.'
   s.description      = <<-DESC
   WebEngage Flutter iOS SDK.
diff --git a/pubspec.yaml b/pubspec.yaml
index 44dcb2e..d15f3bf 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webengage_flutter
 description: The WebEngage Flutter SDK offers solutions for mobile customer engagement, analytics, and retention.
-version: 1.5.0
+version: 1.5.1
 homepage: https://webengage.com/
 repository: https://github.com/WebEngage/webengage-flutter
 

From 5ad5c3d85103f935ec8a6a6a6d2ecdf0933db91e Mon Sep 17 00:00:00 2001
From: rahulraorefyne <rahul.rao@refyne.co.in>
Date: Sun, 11 Aug 2024 15:59:10 +0530
Subject: [PATCH 2/2] gradle upgraded to 8.2

---
 android/build.gradle                             | 4 +++-
 android/gradle/wrapper/gradle-wrapper.properties | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index edf9769..cc19885 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.4'
+        classpath 'com.android.tools.build:gradle:8.2.2'
     }
 }
 
@@ -27,9 +27,11 @@ android {
     }
 
     compileSdkVersion 34
+    compileSdk 34
 
     defaultConfig {
         minSdkVersion 21
+        minSdk 21
         manifestPlaceholders = [we_fl_version: readVersion()]
         versionCode 1
         versionName "1.0"
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index ffed3a2..1acfbc6 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Sun Aug 11 15:48:17 IST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists