diff --git a/CHANGELOG.md b/CHANGELOG.md index 2046cad..6b97fb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# next + +* Android: Removed jetifier +* Android: Removed V1 plugin APIs - this is now a Android V2 plugin only + # 0.5.2 * Android: Bump to workmanager 2.8.1 diff --git a/android/build.gradle b/android/build.gradle index 44f13da..054d1af 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -36,7 +36,7 @@ android { defaultConfig { compileSdk 33 minSdkVersion 19 - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { disable 'InvalidPackage' diff --git a/android/gradle.properties b/android/gradle.properties index e6299f2..2d223a0 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true -android.enableJetifier=true \ No newline at end of file +android.enableJetifier=false \ No newline at end of file diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 92a5a43..a323395 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,2 +1,3 @@ - + + diff --git a/android/src/main/kotlin/dev/fluttercommunity/workmanager/BackgroundWorker.kt b/android/src/main/kotlin/dev/fluttercommunity/workmanager/BackgroundWorker.kt index ec8c868..c433a3f 100644 --- a/android/src/main/kotlin/dev/fluttercommunity/workmanager/BackgroundWorker.kt +++ b/android/src/main/kotlin/dev/fluttercommunity/workmanager/BackgroundWorker.kt @@ -94,9 +94,6 @@ class BackgroundWorker( ) } - // Backwards compatibility with v1. We register all the user's plugins. - WorkmanagerPlugin.pluginRegistryCallback?.registerWith(ShimPluginRegistry(engine!!)) - engine?.let { engine -> backgroundChannel = MethodChannel(engine.dartExecutor, BACKGROUND_CHANNEL_NAME) backgroundChannel.setMethodCallHandler(this@BackgroundWorker) diff --git a/android/src/main/kotlin/dev/fluttercommunity/workmanager/WorkmanagerPlugin.kt b/android/src/main/kotlin/dev/fluttercommunity/workmanager/WorkmanagerPlugin.kt index eacaf04..4ec1db6 100644 --- a/android/src/main/kotlin/dev/fluttercommunity/workmanager/WorkmanagerPlugin.kt +++ b/android/src/main/kotlin/dev/fluttercommunity/workmanager/WorkmanagerPlugin.kt @@ -4,7 +4,6 @@ import android.content.Context import io.flutter.embedding.engine.plugins.FlutterPlugin import io.flutter.plugin.common.BinaryMessenger import io.flutter.plugin.common.MethodChannel -import io.flutter.plugin.common.PluginRegistry class WorkmanagerPlugin : FlutterPlugin { @@ -30,24 +29,4 @@ class WorkmanagerPlugin : FlutterPlugin { methodChannel = null workmanagerCallHandler = null } - - companion object { - var pluginRegistryCallback: PluginRegistry.PluginRegistrantCallback? = null - - @JvmStatic - fun registerWith(registrar: PluginRegistry.Registrar) { - val plugin = WorkmanagerPlugin() - plugin.onAttachedToEngine(registrar.context(), registrar.messenger()) - registrar.addViewDestroyListener { - plugin.onDetachedFromEngine() - false - } - } - - @Deprecated(message = "Use the Android v2 embedding method.") - @JvmStatic - fun setPluginRegistrantCallback(pluginRegistryCallback: PluginRegistry.PluginRegistrantCallback) { - Companion.pluginRegistryCallback = pluginRegistryCallback - } - } } diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 38835d1..e878147 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -42,7 +42,7 @@ android { targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -76,6 +76,6 @@ flutter { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test:runner:1.5.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' }