diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index ea0d35b..09523c0 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Fri Jun 23 08:50:38 CEST 2017
 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-8.1.1-all.zip
diff --git a/android/src/main/java/com/appspector/flutter/AppSpectorPlugin.java b/android/src/main/java/com/appspector/flutter/AppSpectorPlugin.java
index 08a129e..78bd1cf 100644
--- a/android/src/main/java/com/appspector/flutter/AppSpectorPlugin.java
+++ b/android/src/main/java/com/appspector/flutter/AppSpectorPlugin.java
@@ -1,9 +1,10 @@
 package com.appspector.flutter;
-
+import android.content.Context;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
+import io.flutter.plugin.common.BinaryMessenger;
+import io.flutter.plugin.common.PluginRegistry;
 
 import static com.appspector.flutter.MainAppSpectorHandler.internalRegister;
 
@@ -17,7 +18,9 @@ public class AppSpectorPlugin implements FlutterPlugin {
 
     @Override
     public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
-        mainAppSpectorHandler = internalRegister(binding.getApplicationContext(), binding.getBinaryMessenger());
+        Context context = binding.getApplicationContext();
+        BinaryMessenger messenger = binding.getBinaryMessenger();
+        mainAppSpectorHandler = internalRegister(context, messenger);
     }
 
     @Override
@@ -29,12 +32,12 @@ public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
     }
 
     /**
-     * Plugin registration.
-     * Deprecated: it's old plugin registration which is needed for Flutter v1
+     * Plugin registration (for Flutter v1 embedding only).
+     * Deprecated: Needed only for apps still using v1 embedding.
      */
     @SuppressWarnings("deprecation")
     @Deprecated
-    public static void registerWith(Registrar registrar) {
+    public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
         internalRegister(registrar.context().getApplicationContext(), registrar.messenger());
     }
 }