diff --git a/.github/workflows/android_alarm_manager_plus.yaml b/.github/workflows/android_alarm_manager_plus.yaml
index d471acb5d8..93b7ac1a39 100644
--- a/.github/workflows/android_alarm_manager_plus.yaml
+++ b/.github/workflows/android_alarm_manager_plus.yaml
@@ -59,7 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        android-api-level: [22, 26, 31, 34]
+        android-api-level: [22, 26, 31, 34, 36]
 
     steps:
       - name: "Checkout repository"
diff --git a/.github/workflows/android_intent_plus.yaml b/.github/workflows/android_intent_plus.yaml
index e49dfbdcf0..55f4a7f5cb 100644
--- a/.github/workflows/android_intent_plus.yaml
+++ b/.github/workflows/android_intent_plus.yaml
@@ -59,7 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        android-api-level: [ 22, 26, 31, 34 ]
+        android-api-level: [ 22, 26, 31, 34, 36 ]
 
     steps:
       - name: "Checkout repository"
diff --git a/.github/workflows/battery_plus.yaml b/.github/workflows/battery_plus.yaml
index 5152b7a3de..27d3bfa41c 100644
--- a/.github/workflows/battery_plus.yaml
+++ b/.github/workflows/battery_plus.yaml
@@ -63,7 +63,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        android-api-level: [ 22, 26, 31, 34 ]
+        android-api-level: [ 22, 26, 31, 34, 36 ]
 
     steps:
       - name: "Checkout repository"
diff --git a/.github/workflows/device_info_plus.yaml b/.github/workflows/device_info_plus.yaml
index 2580c61be8..fd9119e8bd 100644
--- a/.github/workflows/device_info_plus.yaml
+++ b/.github/workflows/device_info_plus.yaml
@@ -63,7 +63,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        android-api-level: [ 22, 26, 31, 34 ]
+        android-api-level: [ 22, 26, 31, 34, 36 ]
 
     steps:
       - name: "Checkout repository"
diff --git a/.github/workflows/network_info_plus.yaml b/.github/workflows/network_info_plus.yaml
index 3a236dd597..7df3a80aff 100644
--- a/.github/workflows/network_info_plus.yaml
+++ b/.github/workflows/network_info_plus.yaml
@@ -62,7 +62,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        android-api-level: [ 22, 26, 31, 34 ]
+        android-api-level: [ 22, 26, 31, 34, 36 ]
 
     steps:
       - name: "Checkout repository"
diff --git a/.github/workflows/package_info_plus.yaml b/.github/workflows/package_info_plus.yaml
index c3ec3c84f8..1c64badf3d 100644
--- a/.github/workflows/package_info_plus.yaml
+++ b/.github/workflows/package_info_plus.yaml
@@ -63,7 +63,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        android-api-level: [ 22, 26, 31, 34 ]
+        android-api-level: [ 22, 26, 31, 34, 36 ]
 
     steps:
       - name: "Checkout repository"
diff --git a/.github/workflows/sensors_plus.yaml b/.github/workflows/sensors_plus.yaml
index e862cddeb7..b17d22b5be 100644
--- a/.github/workflows/sensors_plus.yaml
+++ b/.github/workflows/sensors_plus.yaml
@@ -59,7 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        android-api-level: [ 22, 26, 31, 34 ]
+        android-api-level: [ 22, 26, 31, 34, 36 ]
 
     steps:
       - name: "Checkout repository"
diff --git a/.github/workflows/share_plus.yaml b/.github/workflows/share_plus.yaml
index f195c07a5d..c1d6be7019 100644
--- a/.github/workflows/share_plus.yaml
+++ b/.github/workflows/share_plus.yaml
@@ -62,7 +62,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        android-api-level: [ 22, 26, 31, 34 ]
+        android-api-level: [ 22, 26, 31, 34, 36 ]
 
     steps:
       - name: "Checkout repository"
diff --git a/packages/android_alarm_manager_plus/android/build.gradle b/packages/android_alarm_manager_plus/android/build.gradle
index 9cfc9732ff..939e05abac 100644
--- a/packages/android_alarm_manager_plus/android/build.gradle
+++ b/packages/android_alarm_manager_plus/android/build.gradle
@@ -2,14 +2,14 @@ group 'dev.fluttercommunity.plus.androidalarmmanager'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.9.23'
+    ext.kotlin_version = '2.1.0'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.1'
+        classpath 'com.android.tools.build:gradle:8.6.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -25,7 +25,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdk 34
+    compileSdk 36
 
     namespace 'dev.fluttercommunity.plus.androidalarmmanager'
 
diff --git a/packages/android_alarm_manager_plus/android/gradle/wrapper/gradle-wrapper.properties b/packages/android_alarm_manager_plus/android/gradle/wrapper/gradle-wrapper.properties
index 7825683d62..8914ec5fcb 100644
--- a/packages/android_alarm_manager_plus/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/android_alarm_manager_plus/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Oct 05 10:00:26 EEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/packages/android_alarm_manager_plus/example/android/app/build.gradle b/packages/android_alarm_manager_plus/example/android/app/build.gradle
index 1c776ac6f2..e232f403cb 100644
--- a/packages/android_alarm_manager_plus/example/android/app/build.gradle
+++ b/packages/android_alarm_manager_plus/example/android/app/build.gradle
@@ -23,7 +23,8 @@ if (flutterVersionName == null) {
 }
 
 android {
-    compileSdk 34
+    compileSdk 36
+    ndkVersion "27.0.12077973"
 
     namespace 'com.example.example'
 
diff --git a/packages/android_alarm_manager_plus/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/android_alarm_manager_plus/example/android/gradle/wrapper/gradle-wrapper.properties
index e1bda4fd50..210ae1c487 100644
--- a/packages/android_alarm_manager_plus/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/android_alarm_manager_plus/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Oct 05 12:15:50 EEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/packages/android_alarm_manager_plus/example/android/settings.gradle b/packages/android_alarm_manager_plus/example/android/settings.gradle
index fa3b4d0878..4f520718dc 100644
--- a/packages/android_alarm_manager_plus/example/android/settings.gradle
+++ b/packages/android_alarm_manager_plus/example/android/settings.gradle
@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.3.1" apply false
-    id "org.jetbrains.kotlin.android" version "1.9.23" apply false
+    id "com.android.application" version "8.6.0" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }
 
 include ":app"
diff --git a/packages/android_alarm_manager_plus/example/lib/main.dart b/packages/android_alarm_manager_plus/example/lib/main.dart
index 2eefbc0353..150edc8e06 100644
--- a/packages/android_alarm_manager_plus/example/lib/main.dart
+++ b/packages/android_alarm_manager_plus/example/lib/main.dart
@@ -82,6 +82,7 @@ class _AlarmHomePageState extends State<_AlarmHomePage> {
 
   void _checkExactAlarmPermission() async {
     final currentStatus = await Permission.scheduleExactAlarm.status;
+    if (!mounted) return;
     setState(() {
       _exactAlarmPermissionStatus = currentStatus;
     });
@@ -91,7 +92,7 @@ class _AlarmHomePageState extends State<_AlarmHomePage> {
     developer.log('Increment counter!');
     // Ensure we've loaded the updated count from the background isolate.
     await prefs?.reload();
-
+    if (!mounted) return;
     setState(() {
       _counter++;
     });
diff --git a/packages/android_intent_plus/android/build.gradle b/packages/android_intent_plus/android/build.gradle
index fcc7295eb0..f81c67b6dd 100644
--- a/packages/android_intent_plus/android/build.gradle
+++ b/packages/android_intent_plus/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.1'
+        classpath 'com.android.tools.build:gradle:8.6.0'
     }
 }
 
@@ -22,7 +22,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdk 34
+    compileSdk 36
 
     namespace 'dev.fluttercommunity.plus.androidintent'
 
diff --git a/packages/android_intent_plus/android/gradle/wrapper/gradle-wrapper.properties b/packages/android_intent_plus/android/gradle/wrapper/gradle-wrapper.properties
index e411586a54..48c0a02ca4 100644
--- a/packages/android_intent_plus/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/android_intent_plus/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/packages/android_intent_plus/example/android/app/build.gradle b/packages/android_intent_plus/example/android/app/build.gradle
index ed42698bfe..d954814b66 100644
--- a/packages/android_intent_plus/example/android/app/build.gradle
+++ b/packages/android_intent_plus/example/android/app/build.gradle
@@ -23,7 +23,8 @@ if (flutterVersionName == null) {
 }
 
 android {
-    compileSdk 34
+    compileSdk 36
+    ndkVersion "27.0.12077973"
 
     namespace 'io.flutter.plugins.androidintentexample'
 
diff --git a/packages/android_intent_plus/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/android_intent_plus/example/android/app/gradle/wrapper/gradle-wrapper.properties
index e411586a54..48c0a02ca4 100644
--- a/packages/android_intent_plus/example/android/app/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/android_intent_plus/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/packages/android_intent_plus/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/android_intent_plus/example/android/gradle/wrapper/gradle-wrapper.properties
index 8dee89d1a6..81a370832b 100644
--- a/packages/android_intent_plus/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/android_intent_plus/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Oct 02 17:46:54 EEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/packages/android_intent_plus/example/android/settings.gradle b/packages/android_intent_plus/example/android/settings.gradle
index 5133de22fb..4f520718dc 100644
--- a/packages/android_intent_plus/example/android/settings.gradle
+++ b/packages/android_intent_plus/example/android/settings.gradle
@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.3.1" apply false
-    id "org.jetbrains.kotlin.android" version "1.7.22" apply false
+    id "com.android.application" version "8.6.0" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }
 
 include ":app"
diff --git a/packages/battery_plus/battery_plus/android/build.gradle b/packages/battery_plus/battery_plus/android/build.gradle
index 14033b8153..07d332b817 100644
--- a/packages/battery_plus/battery_plus/android/build.gradle
+++ b/packages/battery_plus/battery_plus/android/build.gradle
@@ -2,14 +2,14 @@ group 'dev.fluttercommunity.plus.battery'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.7.22'
+    ext.kotlin_version = '2.1.0'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.1'
+        classpath 'com.android.tools.build:gradle:8.6.0'
     }
 }
 
@@ -24,7 +24,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdk 34
+    compileSdk 36
 
     namespace 'dev.fluttercommunity.plus.battery'
 
diff --git a/packages/battery_plus/battery_plus/example/android/app/build.gradle b/packages/battery_plus/battery_plus/example/android/app/build.gradle
index 52b4b07259..5d9744d7ab 100644
--- a/packages/battery_plus/battery_plus/example/android/app/build.gradle
+++ b/packages/battery_plus/battery_plus/example/android/app/build.gradle
@@ -23,7 +23,8 @@ if (flutterVersionName == null) {
 }
 
 android {
-    compileSdk 34
+    compileSdk 36
+    ndkVersion "27.0.12077973"
 
     namespace 'io.flutter.plugins.batteryexample.example'
 
diff --git a/packages/battery_plus/battery_plus/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/battery_plus/battery_plus/example/android/gradle/wrapper/gradle-wrapper.properties
index 825c34f1c4..98df907d2d 100644
--- a/packages/battery_plus/battery_plus/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/battery_plus/battery_plus/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Oct 05 14:03:03 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/packages/battery_plus/battery_plus/example/android/settings.gradle b/packages/battery_plus/battery_plus/example/android/settings.gradle
index fa3b4d0878..4f520718dc 100644
--- a/packages/battery_plus/battery_plus/example/android/settings.gradle
+++ b/packages/battery_plus/battery_plus/example/android/settings.gradle
@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.3.1" apply false
-    id "org.jetbrains.kotlin.android" version "1.9.23" apply false
+    id "com.android.application" version "8.6.0" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }
 
 include ":app"
diff --git a/packages/connectivity_plus/connectivity_plus/android/build.gradle b/packages/connectivity_plus/connectivity_plus/android/build.gradle
index 6d8c5881be..aad57c467e 100644
--- a/packages/connectivity_plus/connectivity_plus/android/build.gradle
+++ b/packages/connectivity_plus/connectivity_plus/android/build.gradle
@@ -2,13 +2,15 @@ group 'dev.fluttercommunity.plus.connectivity'
 version '1.0-SNAPSHOT'
 
 buildscript {
+    ext.kotlin_version = '2.1.0'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.1'
+        classpath 'com.android.tools.build:gradle:8.6.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
@@ -20,9 +22,10 @@ rootProject.allprojects {
 }
 
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
 
 android {
-    compileSdk 34
+    compileSdk 36
 
     namespace 'dev.fluttercommunity.plus.connectivity'
 
diff --git a/packages/connectivity_plus/connectivity_plus/android/gradle/wrapper/gradle-wrapper.properties b/packages/connectivity_plus/connectivity_plus/android/gradle/wrapper/gradle-wrapper.properties
index cae4528dfb..32830d3dde 100644
--- a/packages/connectivity_plus/connectivity_plus/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/connectivity_plus/connectivity_plus/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/packages/connectivity_plus/connectivity_plus/example/android/app/build.gradle b/packages/connectivity_plus/connectivity_plus/example/android/app/build.gradle
index 3efaaa1a6e..161465017e 100644
--- a/packages/connectivity_plus/connectivity_plus/example/android/app/build.gradle
+++ b/packages/connectivity_plus/connectivity_plus/example/android/app/build.gradle
@@ -27,7 +27,8 @@ if (flutterVersionName == null) {
 }
 
 android {
-    compileSdk 34
+    compileSdk 36
+    ndkVersion "27.0.12077973"
 
     namespace 'io.flutter.plugins.connectivityexample'
 
diff --git a/packages/connectivity_plus/connectivity_plus/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/connectivity_plus/connectivity_plus/example/android/gradle/wrapper/gradle-wrapper.properties
index 032437da60..602c7ad0f6 100644
--- a/packages/connectivity_plus/connectivity_plus/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/connectivity_plus/connectivity_plus/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Oct 05 14:43:11 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/packages/connectivity_plus/connectivity_plus/example/android/settings.gradle b/packages/connectivity_plus/connectivity_plus/example/android/settings.gradle
index 5fad357a02..4f520718dc 100644
--- a/packages/connectivity_plus/connectivity_plus/example/android/settings.gradle
+++ b/packages/connectivity_plus/connectivity_plus/example/android/settings.gradle
@@ -18,7 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.3.1" apply false
+    id "com.android.application" version "8.6.0" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }
 
 include ":app"
diff --git a/packages/device_info_plus/device_info_plus/android/build.gradle b/packages/device_info_plus/device_info_plus/android/build.gradle
index 5213cd0a10..c56fffdaf2 100644
--- a/packages/device_info_plus/device_info_plus/android/build.gradle
+++ b/packages/device_info_plus/device_info_plus/android/build.gradle
@@ -2,14 +2,14 @@ group 'dev.fluttercommunity.plus.device_info'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.7.22'
+    ext.kotlin_version = '2.1.0'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.1'
+        classpath 'com.android.tools.build:gradle:8.6.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -25,7 +25,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdk 34
+    compileSdk 36
 
     namespace 'dev.fluttercommunity.plus.device_info'
 
diff --git a/packages/device_info_plus/device_info_plus/android/gradle/wrapper/gradle-wrapper.properties b/packages/device_info_plus/device_info_plus/android/gradle/wrapper/gradle-wrapper.properties
index e411586a54..48c0a02ca4 100644
--- a/packages/device_info_plus/device_info_plus/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/device_info_plus/device_info_plus/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/packages/device_info_plus/device_info_plus/example/android/app/build.gradle b/packages/device_info_plus/device_info_plus/example/android/app/build.gradle
index 1e70360c4e..c98d844602 100644
--- a/packages/device_info_plus/device_info_plus/example/android/app/build.gradle
+++ b/packages/device_info_plus/device_info_plus/example/android/app/build.gradle
@@ -23,7 +23,8 @@ if (flutterVersionName == null) {
 }
 
 android {
-    compileSdk 34
+    compileSdk 36
+    ndkVersion "27.0.12077973"
 
     namespace 'io.flutter.plugins.deviceinfoexample.example'
 
diff --git a/packages/device_info_plus/device_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/device_info_plus/device_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties
index 448814c79e..8ec30e8ae6 100644
--- a/packages/device_info_plus/device_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/device_info_plus/device_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Oct 05 15:15:38 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/packages/device_info_plus/device_info_plus/example/android/settings.gradle b/packages/device_info_plus/device_info_plus/example/android/settings.gradle
index fa3b4d0878..4f520718dc 100644
--- a/packages/device_info_plus/device_info_plus/example/android/settings.gradle
+++ b/packages/device_info_plus/device_info_plus/example/android/settings.gradle
@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.3.1" apply false
-    id "org.jetbrains.kotlin.android" version "1.9.23" apply false
+    id "com.android.application" version "8.6.0" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }
 
 include ":app"
diff --git a/packages/network_info_plus/network_info_plus/android/build.gradle b/packages/network_info_plus/network_info_plus/android/build.gradle
index b653c42794..305a3ad902 100644
--- a/packages/network_info_plus/network_info_plus/android/build.gradle
+++ b/packages/network_info_plus/network_info_plus/android/build.gradle
@@ -2,14 +2,14 @@ group 'dev.fluttercommunity.plus.network_info'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.7.22'
+    ext.kotlin_version = '2.1.0'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.1'
+        classpath 'com.android.tools.build:gradle:8.6.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -25,7 +25,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdk 34
+    compileSdk 36
 
     namespace 'dev.fluttercommunity.plus.network_info'
 
diff --git a/packages/network_info_plus/network_info_plus/example/android/app/build.gradle b/packages/network_info_plus/network_info_plus/example/android/app/build.gradle
index 6e56eead76..610cfdf2ad 100644
--- a/packages/network_info_plus/network_info_plus/example/android/app/build.gradle
+++ b/packages/network_info_plus/network_info_plus/example/android/app/build.gradle
@@ -22,7 +22,8 @@ if (flutterVersionName == null) {
 }
 
 android {
-    compileSdk 34
+    compileSdk 36
+    ndkVersion "27.0.12077973"
 
     namespace 'dev.fluttercommunity.plus.network_info_plus_example'
 
diff --git a/packages/network_info_plus/network_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/network_info_plus/network_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties
index 10c8c0167e..c8d5437ff8 100644
--- a/packages/network_info_plus/network_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/network_info_plus/network_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Oct 05 15:29:21 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/packages/network_info_plus/network_info_plus/example/android/settings.gradle b/packages/network_info_plus/network_info_plus/example/android/settings.gradle
index 5fad357a02..4f520718dc 100644
--- a/packages/network_info_plus/network_info_plus/example/android/settings.gradle
+++ b/packages/network_info_plus/network_info_plus/example/android/settings.gradle
@@ -18,7 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.3.1" apply false
+    id "com.android.application" version "8.6.0" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }
 
 include ":app"
diff --git a/packages/package_info_plus/package_info_plus/android/build.gradle b/packages/package_info_plus/package_info_plus/android/build.gradle
index 56b6a2beb1..eb341d350a 100644
--- a/packages/package_info_plus/package_info_plus/android/build.gradle
+++ b/packages/package_info_plus/package_info_plus/android/build.gradle
@@ -2,7 +2,7 @@ group 'dev.fluttercommunity.plus.packageinfo'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.7.22'
+    ext.kotlin_version = '2.1.0'
 
     repositories {
         google()
@@ -10,7 +10,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.1'
+        classpath 'com.android.tools.build:gradle:8.6.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -26,7 +26,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdk 34
+    compileSdk 36
 
     namespace 'dev.fluttercommunity.plus.packageinfo'
 
diff --git a/packages/package_info_plus/package_info_plus/android/gradle/wrapper/gradle-wrapper.properties b/packages/package_info_plus/package_info_plus/android/gradle/wrapper/gradle-wrapper.properties
index e411586a54..48c0a02ca4 100644
--- a/packages/package_info_plus/package_info_plus/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/package_info_plus/package_info_plus/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/packages/package_info_plus/package_info_plus/example/android/app/build.gradle b/packages/package_info_plus/package_info_plus/example/android/app/build.gradle
index a03abe94af..14b5f8c341 100644
--- a/packages/package_info_plus/package_info_plus/example/android/app/build.gradle
+++ b/packages/package_info_plus/package_info_plus/example/android/app/build.gradle
@@ -23,7 +23,8 @@ if (flutterVersionName == null) {
 }
 
 android {
-    compileSdk 34
+    compileSdk 36
+    ndkVersion "27.0.12077973"
 
     namespace 'io.flutter.plugins.packageinfoexample'
 
diff --git a/packages/package_info_plus/package_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/package_info_plus/package_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties
index 4d6272d996..45181329e9 100644
--- a/packages/package_info_plus/package_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/package_info_plus/package_info_plus/example/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-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
diff --git a/packages/package_info_plus/package_info_plus/example/android/settings.gradle b/packages/package_info_plus/package_info_plus/example/android/settings.gradle
index fa3b4d0878..4f520718dc 100644
--- a/packages/package_info_plus/package_info_plus/example/android/settings.gradle
+++ b/packages/package_info_plus/package_info_plus/example/android/settings.gradle
@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.3.1" apply false
-    id "org.jetbrains.kotlin.android" version "1.9.23" apply false
+    id "com.android.application" version "8.6.0" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }
 
 include ":app"
diff --git a/packages/sensors_plus/sensors_plus/android/build.gradle b/packages/sensors_plus/sensors_plus/android/build.gradle
index 915ddac953..211d687d89 100644
--- a/packages/sensors_plus/sensors_plus/android/build.gradle
+++ b/packages/sensors_plus/sensors_plus/android/build.gradle
@@ -2,14 +2,14 @@ group 'dev.fluttercommunity.plus.sensors'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.7.22'
+    ext.kotlin_version = '2.1.0'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.1'
+        classpath 'com.android.tools.build:gradle:8.6.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -25,7 +25,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdk 34
+    compileSdk 36
 
     namespace 'dev.fluttercommunity.plus.sensors'
 
diff --git a/packages/sensors_plus/sensors_plus/android/gradle/wrapper/gradle-wrapper.properties b/packages/sensors_plus/sensors_plus/android/gradle/wrapper/gradle-wrapper.properties
index e411586a54..48c0a02ca4 100644
--- a/packages/sensors_plus/sensors_plus/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/sensors_plus/sensors_plus/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/packages/sensors_plus/sensors_plus/example/android/app/build.gradle b/packages/sensors_plus/sensors_plus/example/android/app/build.gradle
index 7ec46491a4..5c4046c623 100644
--- a/packages/sensors_plus/sensors_plus/example/android/app/build.gradle
+++ b/packages/sensors_plus/sensors_plus/example/android/app/build.gradle
@@ -22,7 +22,8 @@ if (flutterVersionName == null) {
 }
 
 android {
-    compileSdk 34
+    compileSdk 36
+    ndkVersion "27.0.12077973"
 
     namespace 'io.flutter.plugins.sensorsexample'
 
diff --git a/packages/sensors_plus/sensors_plus/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/sensors_plus/sensors_plus/example/android/gradle/wrapper/gradle-wrapper.properties
index cae4528dfb..32830d3dde 100644
--- a/packages/sensors_plus/sensors_plus/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/sensors_plus/sensors_plus/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/packages/sensors_plus/sensors_plus/example/android/settings.gradle b/packages/sensors_plus/sensors_plus/example/android/settings.gradle
index 5fad357a02..4f520718dc 100644
--- a/packages/sensors_plus/sensors_plus/example/android/settings.gradle
+++ b/packages/sensors_plus/sensors_plus/example/android/settings.gradle
@@ -18,7 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.3.1" apply false
+    id "com.android.application" version "8.6.0" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }
 
 include ":app"
diff --git a/packages/share_plus/share_plus/android/build.gradle b/packages/share_plus/share_plus/android/build.gradle
index 56b97cf921..4b5a5aee37 100644
--- a/packages/share_plus/share_plus/android/build.gradle
+++ b/packages/share_plus/share_plus/android/build.gradle
@@ -2,14 +2,14 @@ group 'dev.fluttercommunity.plus.share'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.7.22'
+    ext.kotlin_version = '2.1.0'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.1'
+        classpath 'com.android.tools.build:gradle:8.6.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -25,7 +25,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdk 34
+    compileSdk 36
 
     namespace 'dev.fluttercommunity.plus.share'
 
diff --git a/packages/share_plus/share_plus/android/gradle/wrapper/gradle-wrapper.properties b/packages/share_plus/share_plus/android/gradle/wrapper/gradle-wrapper.properties
index e411586a54..48c0a02ca4 100644
--- a/packages/share_plus/share_plus/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/share_plus/share_plus/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/packages/share_plus/share_plus/example/android/app/build.gradle b/packages/share_plus/share_plus/example/android/app/build.gradle
index 239a45415a..9a14265f03 100644
--- a/packages/share_plus/share_plus/example/android/app/build.gradle
+++ b/packages/share_plus/share_plus/example/android/app/build.gradle
@@ -22,7 +22,8 @@ if (flutterVersionName == null) {
 }
 
 android {
-    compileSdk 34
+    compileSdk 36
+    ndkVersion "27.0.12077973"
 
     namespace 'io.flutter.plugins.shareexample'
 
diff --git a/packages/share_plus/share_plus/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/share_plus/share_plus/example/android/gradle/wrapper/gradle-wrapper.properties
index cae4528dfb..32830d3dde 100644
--- a/packages/share_plus/share_plus/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/share_plus/share_plus/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/packages/share_plus/share_plus/example/android/settings.gradle b/packages/share_plus/share_plus/example/android/settings.gradle
index 5fad357a02..4f520718dc 100644
--- a/packages/share_plus/share_plus/example/android/settings.gradle
+++ b/packages/share_plus/share_plus/example/android/settings.gradle
@@ -18,7 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.3.1" apply false
+    id "com.android.application" version "8.6.0" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }
 
 include ":app"