From 7a6e4f9caea5f778d20a10c0f8c37314f1e533fc Mon Sep 17 00:00:00 2001
From: Rehan <mrehan.official@gmail.com>
Date: Tue, 9 Apr 2024 05:53:40 +0500
Subject: [PATCH 1/9] updated package

---
 android/build.gradle                             | 9 +++++----
 android/gradle/wrapper/gradle-wrapper.properties | 2 +-
 android/src/main/AndroidManifest.xml             | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index d9c777f..d100217 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath 'com.android.tools.build:gradle:8.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -26,15 +26,16 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
+    namespace 'io.customer.customer_io'
     compileSdkVersion 33
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 
     sourceSets {
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 41dfb87..e411586 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/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.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 3c591b3..cc947c5 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="io.customer.customer_io"></manifest>
+<manifest />

From 68f7f112c3ca8f064b75532aa81d428b4fd0ae25 Mon Sep 17 00:00:00 2001
From: Rehan <mrehan.official@gmail.com>
Date: Tue, 9 Apr 2024 05:54:18 +0500
Subject: [PATCH 2/9] updated amiapp

---
 apps/amiapp_flutter/android/app/build.gradle                   | 1 +
 apps/amiapp_flutter/android/app/src/main/AndroidManifest.xml   | 3 +--
 .../amiapp_flutter/android/app/src/profile/AndroidManifest.xml | 3 +--
 .../android/gradle/wrapper/gradle-wrapper.properties           | 2 +-
 apps/amiapp_flutter/android/settings.gradle                    | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/amiapp_flutter/android/app/build.gradle b/apps/amiapp_flutter/android/app/build.gradle
index 76dd6ce..d1730a6 100644
--- a/apps/amiapp_flutter/android/app/build.gradle
+++ b/apps/amiapp_flutter/android/app/build.gradle
@@ -6,6 +6,7 @@ plugins {
 }
 
 android {
+    namespace 'io.customer.amiapp_flutter'
     compileSdkVersion 33
     ndkVersion flutter.ndkVersion
 
diff --git a/apps/amiapp_flutter/android/app/src/main/AndroidManifest.xml b/apps/amiapp_flutter/android/app/src/main/AndroidManifest.xml
index 36d3cdd..2cd560e 100644
--- a/apps/amiapp_flutter/android/app/src/main/AndroidManifest.xml
+++ b/apps/amiapp_flutter/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.customer.amiapp_flutter">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
diff --git a/apps/amiapp_flutter/android/app/src/profile/AndroidManifest.xml b/apps/amiapp_flutter/android/app/src/profile/AndroidManifest.xml
index 16c82b3..399f698 100644
--- a/apps/amiapp_flutter/android/app/src/profile/AndroidManifest.xml
+++ b/apps/amiapp_flutter/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.customer.amiapp_flutter">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/apps/amiapp_flutter/android/gradle/wrapper/gradle-wrapper.properties b/apps/amiapp_flutter/android/gradle/wrapper/gradle-wrapper.properties
index cb24abd..4d6272d 100644
--- a/apps/amiapp_flutter/android/gradle/wrapper/gradle-wrapper.properties
+++ b/apps/amiapp_flutter/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-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
diff --git a/apps/amiapp_flutter/android/settings.gradle b/apps/amiapp_flutter/android/settings.gradle
index d3bcc7b..4949dfd 100644
--- a/apps/amiapp_flutter/android/settings.gradle
+++ b/apps/amiapp_flutter/android/settings.gradle
@@ -18,7 +18,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.2.0" apply false
+    id "com.android.application" version "8.3.1" apply false
     id "org.jetbrains.kotlin.android" version "1.7.21" apply false
     id "com.google.gms.google-services" version "4.3.15" apply false
 }

From 9bed93bb0fe8b862f881aad05684a1512921bae4 Mon Sep 17 00:00:00 2001
From: Rehan <mrehan.official@gmail.com>
Date: Tue, 9 Apr 2024 05:55:35 +0500
Subject: [PATCH 3/9] repo updates

---
 apps/amiapp_flutter/android/build.gradle | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/amiapp_flutter/android/build.gradle b/apps/amiapp_flutter/android/build.gradle
index 133c863..7d78a82 100644
--- a/apps/amiapp_flutter/android/build.gradle
+++ b/apps/amiapp_flutter/android/build.gradle
@@ -2,7 +2,10 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        maven { url 'https://maven.gist.build' }
+        // For locally deployed builds
+        mavenLocal()
+        // For snapshot builds
+        maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' }
     }
 }
 

From 8c5ea7c9134c2eb36af5ac9a83322de39ffda594 Mon Sep 17 00:00:00 2001
From: Rehan <mrehan.official@gmail.com>
Date: Tue, 9 Apr 2024 11:35:27 +0500
Subject: [PATCH 4/9] updated to expected version

---
 android/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/build.gradle b/android/build.gradle
index d100217..3040eb7 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -59,7 +59,7 @@ android {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     // Customer.io SDK
-    def cioVersion = "3.9.2"
+    def cioVersion = "3.10.0"
     implementation "io.customer.android:tracking:$cioVersion"
     implementation "io.customer.android:messaging-push-fcm:$cioVersion"
     implementation "io.customer.android:messaging-in-app:$cioVersion"

From 965a16e737605c902d715b9e911b951e3458cc98 Mon Sep 17 00:00:00 2001
From: Rehan <mrehan.official@gmail.com>
Date: Tue, 9 Apr 2024 11:38:32 +0500
Subject: [PATCH 5/9] comment updates

---
 apps/amiapp_flutter/android/build.gradle | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/amiapp_flutter/android/build.gradle b/apps/amiapp_flutter/android/build.gradle
index 7d78a82..b86a7bf 100644
--- a/apps/amiapp_flutter/android/build.gradle
+++ b/apps/amiapp_flutter/android/build.gradle
@@ -1,10 +1,12 @@
+package apps.amiapp_flutter.android
+
 allprojects {
     repositories {
         google()
         mavenCentral()
-        // For locally deployed builds
+        // Only required for using locally deployed versions of the SDK
         mavenLocal()
-        // For snapshot builds
+        // Only required for using SNAPSHOT versions of the SDK
         maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' }
     }
 }

From 65361ed775b505e3b595a22a39617aa1cca59bf9 Mon Sep 17 00:00:00 2001
From: Rehan <mrehan.official@gmail.com>
Date: Tue, 9 Apr 2024 11:39:40 +0500
Subject: [PATCH 6/9] removed unused package

---
 apps/amiapp_flutter/android/build.gradle | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/amiapp_flutter/android/build.gradle b/apps/amiapp_flutter/android/build.gradle
index b86a7bf..2a72be8 100644
--- a/apps/amiapp_flutter/android/build.gradle
+++ b/apps/amiapp_flutter/android/build.gradle
@@ -1,5 +1,3 @@
-package apps.amiapp_flutter.android
-
 allprojects {
     repositories {
         google()

From 10527298ec09c475de8501a6bf4285da75e505aa Mon Sep 17 00:00:00 2001
From: Rehan <mrehan.official@gmail.com>
Date: Tue, 9 Apr 2024 15:37:51 +0500
Subject: [PATCH 7/9] registered push service in app

---
 .../android/app/src/main/AndroidManifest.xml             | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/apps/amiapp_flutter/android/app/src/main/AndroidManifest.xml b/apps/amiapp_flutter/android/app/src/main/AndroidManifest.xml
index 2cd560e..96e6454 100644
--- a/apps/amiapp_flutter/android/app/src/main/AndroidManifest.xml
+++ b/apps/amiapp_flutter/android/app/src/main/AndroidManifest.xml
@@ -58,6 +58,15 @@
                 <data android:pathPrefix="/dashboard" />
             </intent-filter>
         </activity>
+        <!-- Register Customer.io Firebase Messaging Service as we want our SDK to handle all push
+             notifications -->
+       <service
+           android:name="io.customer.messagingpush.CustomerIOFirebaseMessagingService"
+           android:exported="false">
+           <intent-filter>
+               <action android:name="com.google.firebase.MESSAGING_EVENT" />
+           </intent-filter>
+       </service>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data

From 521a64baf18ff5a54056d0b1e68664e923076d7d Mon Sep 17 00:00:00 2001
From: Rehan <mrehan.official@gmail.com>
Date: Tue, 9 Apr 2024 15:39:52 +0500
Subject: [PATCH 8/9] formatted manifest

---
 .../android/app/src/main/AndroidManifest.xml  | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/apps/amiapp_flutter/android/app/src/main/AndroidManifest.xml b/apps/amiapp_flutter/android/app/src/main/AndroidManifest.xml
index 96e6454..533322d 100644
--- a/apps/amiapp_flutter/android/app/src/main/AndroidManifest.xml
+++ b/apps/amiapp_flutter/android/app/src/main/AndroidManifest.xml
@@ -2,32 +2,33 @@
 
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
-   <application
-        android:label="Flutter Sample"
+    <application
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:label="Flutter Sample">
         <activity
             android:name=".MainActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:exported="true"
+            android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
                  to determine the Window background behind the Flutter UI. -->
             <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme" />
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <!-- Deep linking -->
-            <meta-data android:name="flutter_deeplinking_enabled" android:value="true" />
+            <meta-data
+                android:name="flutter_deeplinking_enabled"
+                android:value="true" />
 
             <intent-filter android:label="@string/filter_view_app_link">
                 <action android:name="android.intent.action.VIEW" />
@@ -60,13 +61,13 @@
         </activity>
         <!-- Register Customer.io Firebase Messaging Service as we want our SDK to handle all push
              notifications -->
-       <service
-           android:name="io.customer.messagingpush.CustomerIOFirebaseMessagingService"
-           android:exported="false">
-           <intent-filter>
-               <action android:name="com.google.firebase.MESSAGING_EVENT" />
-           </intent-filter>
-       </service>
+        <service
+            android:name="io.customer.messagingpush.CustomerIOFirebaseMessagingService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data

From 2d859bec664fde89bb3f8a2572f279dc72bdac82 Mon Sep 17 00:00:00 2001
From: Rehan <mrehan.official@gmail.com>
Date: Tue, 9 Apr 2024 17:13:28 +0500
Subject: [PATCH 9/9] code comment update

---
 apps/amiapp_flutter/android/app/src/main/AndroidManifest.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/amiapp_flutter/android/app/src/main/AndroidManifest.xml b/apps/amiapp_flutter/android/app/src/main/AndroidManifest.xml
index 533322d..09de26d 100644
--- a/apps/amiapp_flutter/android/app/src/main/AndroidManifest.xml
+++ b/apps/amiapp_flutter/android/app/src/main/AndroidManifest.xml
@@ -60,7 +60,10 @@
             </intent-filter>
         </activity>
         <!-- Register Customer.io Firebase Messaging Service as we want our SDK to handle all push
-             notifications -->
+             notifications. This is not required. However, if you have multiple services added for
+             handling push notifications, you might need to add this service to ensure all
+             notifications are handled by Customer.io. Read more:
+             https://www.customer.io/docs/sdk/flutter/push-notifications/multiple-push-providers/ -->
         <service
             android:name="io.customer.messagingpush.CustomerIOFirebaseMessagingService"
             android:exported="false">