Remove AndroidX references from no-op android implementations (flutte…

…r#2411) Adding an android/ folder as a temporary mitigation for: flutter/flutter#46898
FlutterSu · Nov 20, 2020 · c25b515 · c25b515
1 parent df3cab4
commit c25b515
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 24 deletions.
diff --git a/packages/url_launcher/url_launcher_macos/android/build.gradle b/packages/url_launcher/url_launcher_macos/android/build.gradle
@@ -26,7 +26,6 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'

diff --git a/packages/url_launcher/url_launcher_macos/android/gradle.properties b/packages/url_launcher/url_launcher_macos/android/gradle.properties
@@ -1,4 +1,2 @@
 org.gradle.jvmargs=-Xmx1536M
 android.enableR8=true
-android.useAndroidX=true
-android.enableJetifier=true
diff --git a/...s/android/src/main/java/io/flutter/plugins/url_launcher_macos/UrlLauncherMacosPlugin.java b/...s/android/src/main/java/io/flutter/plugins/url_launcher_macos/UrlLauncherMacosPlugin.java
@@ -1,15 +1,14 @@
 package io.flutter.plugins.url_launcher_macos;
 
-import androidx.annotation.NonNull;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 public class UrlLauncherMacosPlugin implements FlutterPlugin {
   @Override
-  public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBinding) {}
+  public void onAttachedToEngine(FlutterPluginBinding flutterPluginBinding) {}
 
   public static void registerWith(Registrar registrar) {}
 
   @Override
-  public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {}
+  public void onDetachedFromEngine(FlutterPluginBinding binding) {}
 }
diff --git a/packages/url_launcher/url_launcher_web/CHANGELOG.md b/packages/url_launcher/url_launcher_web/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.1.0+2
+
+- Remove androidx references from the no-op android implemenation.
+
 # 0.1.0+1
 
 - Add an android/ folder with no-op implementation to workaround https://github.com/flutter/flutter/issues/46304.

diff --git a/packages/url_launcher/url_launcher_web/android/build.gradle b/packages/url_launcher/url_launcher_web/android/build.gradle
@@ -26,7 +26,6 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'

diff --git a/packages/url_launcher/url_launcher_web/android/gradle.properties b/packages/url_launcher/url_launcher_web/android/gradle.properties
@@ -1,4 +1,2 @@
 org.gradle.jvmargs=-Xmx1536M
 android.enableR8=true
-android.useAndroidX=true
-android.enableJetifier=true
diff --git a/..._launcher_web/android/src/main/java/io/flutter/url_launcher_web/UrlLauncherWebPlugin.java b/..._launcher_web/android/src/main/java/io/flutter/url_launcher_web/UrlLauncherWebPlugin.java
@@ -4,14 +4,13 @@
 
 package io.flutter.url_launcher_web;
 
-import androidx.annotation.NonNull;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 /** UrlLauncherWebPlugin */
 public class UrlLauncherWebPlugin implements FlutterPlugin {
   @Override
-  public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBinding) {}
+  public void onAttachedToEngine(FlutterPluginBinding 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
@@ -25,5 +24,5 @@ public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBindin
   public static void registerWith(Registrar registrar) {}
 
   @Override
-  public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {}
+  public void onDetachedFromEngine(FlutterPluginBinding binding) {}
 }
diff --git a/packages/url_launcher/url_launcher_web/pubspec.yaml b/packages/url_launcher/url_launcher_web/pubspec.yaml
@@ -1,7 +1,7 @@
 name: url_launcher_web
 description: Web platform implementation of url_launcher
 homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher/url_launcher_web
-version: 0.1.0+1
+version: 0.1.0+2
 
 flutter:
   plugin:

diff --git a/packages/video_player/video_player_web/android/build.gradle b/packages/video_player/video_player_web/android/build.gradle
@@ -26,7 +26,6 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'

diff --git a/packages/video_player/video_player_web/android/gradle.properties b/packages/video_player/video_player_web/android/gradle.properties
@@ -1,4 +1,2 @@
 org.gradle.jvmargs=-Xmx1536M
 android.enableR8=true
-android.useAndroidX=true
-android.enableJetifier=true
diff --git a/...r_web/android/src/main/java/io/flutter/plugins/video_player_web/VideoPlayerWebPlugin.java b/...r_web/android/src/main/java/io/flutter/plugins/video_player_web/VideoPlayerWebPlugin.java
@@ -1,21 +1,15 @@
 package io.flutter.plugins.video_player_web;
 
-import androidx.annotation.NonNull;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
-import io.flutter.plugin.common.MethodCall;
-import io.flutter.plugin.common.MethodChannel.Result;
 import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 /** VideoPlayerWebPlugin */
 public class VideoPlayerWebPlugin implements FlutterPlugin {
   @Override
-  public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBinding) {}
+  public void onAttachedToEngine(FlutterPluginBinding flutterPluginBinding) {}
 
   public static void registerWith(Registrar registrar) {}
 
   @Override
-  public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {}
-
-  @Override
-  public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {}
+  public void onDetachedFromEngine(FlutterPluginBinding binding) {}
 }