diff --git a/lib/eval/dart/bridge/m_provider.dart b/lib/eval/dart/bridge/m_provider.dart index 4d54d6ab..0f312a96 100644 --- a/lib/eval/dart/bridge/m_provider.dart +++ b/lib/eval/dart/bridge/m_provider.dart @@ -308,6 +308,11 @@ class MProviderBridged { (visitor, positionalArgs, namedArgs, _) => getJavascriptRuntime().evaluateAsync(positionalArgs[0] as String), ); + interpreter.registertopLevelFunction( + 'evalJsSync', + (visitor, positionalArgs, namedArgs, _) => + getJavascriptRuntime().evaluate(positionalArgs[0] as String), + ); interpreter.registertopLevelFunction( 'regExp', (visitor, positionalArgs, namedArgs, _) => MBridge.regExp( diff --git a/rust_builder/cargokit/gradle/plugin.gradle b/rust_builder/cargokit/gradle/plugin.gradle index 2fc1d705..51b550b9 100644 --- a/rust_builder/cargokit/gradle/plugin.gradle +++ b/rust_builder/cargokit/gradle/plugin.gradle @@ -95,7 +95,7 @@ class CargoKitPlugin implements Plugin { private Plugin _findFlutterPlugin(Map projects) { for (project in projects) { for (plugin in project.value.getPlugins()) { - if (plugin.class.name == "FlutterPlugin") { + if (plugin.class.name == "com.flutter.gradle.FlutterPlugin") { return plugin; } } @@ -128,7 +128,7 @@ class CargoKitPlugin implements Plugin { def jniLibs = project.android.sourceSets.maybeCreate(buildType).jniLibs; jniLibs.srcDir(new File(cargoOutputDir)) - def platforms = plugin.getTargetPlatforms().collect() + def platforms = com.flutter.gradle.FlutterPluginUtils.getTargetPlatforms(project).collect() // Same thing addFlutterDependencies does in flutter.gradle if (buildType == "debug") {