diff --git a/packages/cloud_functions/cloud_functions_web/CHANGELOG.md b/packages/cloud_functions/cloud_functions_web/CHANGELOG.md index 0951f97152a6..cc79a6aa0a12 100644 --- a/packages/cloud_functions/cloud_functions_web/CHANGELOG.md +++ b/packages/cloud_functions/cloud_functions_web/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.0.2 + +Delete Kotlin no-op plugin and replace with Java. + ## 1.0.1 Add no-op plugin implementations for iOS and Android to enable builds. diff --git a/packages/cloud_functions/cloud_functions_web/android/build.gradle b/packages/cloud_functions/cloud_functions_web/android/build.gradle index ecbd398ba2f0..518254672dee 100644 --- a/packages/cloud_functions/cloud_functions_web/android/build.gradle +++ b/packages/cloud_functions/cloud_functions_web/android/build.gradle @@ -2,7 +2,6 @@ group 'io.flutter.plugins.cloud_functions_web' version '1.0' buildscript { - ext.kotlin_version = '1.3.50' repositories { google() jcenter() @@ -10,7 +9,6 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:3.5.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -22,14 +20,10 @@ rootProject.allprojects { } apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' android { compileSdkVersion 28 - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } defaultConfig { minSdkVersion 16 } @@ -37,7 +31,3 @@ android { disable 'InvalidPackage' } } - -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} diff --git a/packages/cloud_functions/cloud_functions_web/android/src/main/java/io/flutter/plugins/cloud_functions_web/CloudFunctionsWebPlugin.java b/packages/cloud_functions/cloud_functions_web/android/src/main/java/io/flutter/plugins/cloud_functions_web/CloudFunctionsWebPlugin.java new file mode 100644 index 000000000000..bd2140e72b2c --- /dev/null +++ b/packages/cloud_functions/cloud_functions_web/android/src/main/java/io/flutter/plugins/cloud_functions_web/CloudFunctionsWebPlugin.java @@ -0,0 +1,21 @@ +/* + * Copyright 2020 The Chromium Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +package io.flutter.plugins.cloud_functions_web; + +import io.flutter.embedding.engine.plugins.FlutterPlugin; +import io.flutter.plugin.common.PluginRegistry.Registrar; + +/** CloudFunctionsWebPlugin */ +public class CloudFunctionsWebPlugin implements FlutterPlugin { + @Override + public void onAttachedToEngine(FlutterPluginBinding flutterPluginBinding) {} + + public static void registerWith(Registrar registrar) {} + + @Override + public void onDetachedFromEngine(FlutterPluginBinding binding) {} +} diff --git a/packages/cloud_functions/cloud_functions_web/android/src/main/kotlin/io/flutter/plugins/cloud_functions_web/CloudFunctionsWebPlugin.kt b/packages/cloud_functions/cloud_functions_web/android/src/main/kotlin/io/flutter/plugins/cloud_functions_web/CloudFunctionsWebPlugin.kt deleted file mode 100644 index 68ffbc59de3e..000000000000 --- a/packages/cloud_functions/cloud_functions_web/android/src/main/kotlin/io/flutter/plugins/cloud_functions_web/CloudFunctionsWebPlugin.kt +++ /dev/null @@ -1,30 +0,0 @@ -package io.flutter.plugins.cloud_functions_web - -import io.flutter.embedding.engine.plugins.FlutterPlugin -import io.flutter.plugin.common.MethodCall -import io.flutter.plugin.common.MethodChannel -import io.flutter.plugin.common.MethodChannel.MethodCallHandler -import io.flutter.plugin.common.MethodChannel.Result -import io.flutter.plugin.common.PluginRegistry.Registrar - -/** CloudFunctionsWebPlugin */ -public class CloudFunctionsWebPlugin: FlutterPlugin, MethodCallHandler { - override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) { } - - // This static function is optional and equivalent to onAttachedToEngine. It supports the old - // pre-Flutter-1.12 Android projects. You are encouraged to continue supporting - // plugin registration via this function while apps migrate to use the new Android APIs - // post-flutter-1.12 via https://flutter.dev/go/android-project-migration. - // - // It is encouraged to share logic between onAttachedToEngine and registerWith to keep - // them functionally equivalent. Only one of onAttachedToEngine or registerWith will be called - // depending on the user's project. onAttachedToEngine or registerWith must both be defined - // in the same class. - companion object { - @JvmStatic - fun registerWith(registrar: Registrar) { } - } - - override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) { - } -} diff --git a/packages/cloud_functions/cloud_functions_web/pubspec.yaml b/packages/cloud_functions/cloud_functions_web/pubspec.yaml index 6b38eeea4220..f70034035eac 100644 --- a/packages/cloud_functions/cloud_functions_web/pubspec.yaml +++ b/packages/cloud_functions/cloud_functions_web/pubspec.yaml @@ -1,7 +1,7 @@ name: cloud_functions_web description: The web implementation of cloud_functions homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/cloud_functions/cloud_functions_web -version: 1.0.1 +version: 1.0.2 flutter: plugin: