Skip to content

fix: migrate to Flutter v2 embedding while keeping v1 support #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sahad2701 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: migrate to Flutter v2 embedding while keeping v1 support #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
15 changes: 9 additions & 6 deletions android/src/main/java/com/appspector/flutter/AppSpectorPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -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
Expand All @@ -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());
}
}