diff --git a/agconnect_applinking/android/src/main/java/com/huawei/agc/flutter/applinking/AppLinkingPlugin.java b/agconnect_applinking/android/src/main/java/com/huawei/agc/flutter/applinking/AppLinkingPlugin.java index 586dfcf..3a552f8 100644 --- a/agconnect_applinking/android/src/main/java/com/huawei/agc/flutter/applinking/AppLinkingPlugin.java +++ b/agconnect_applinking/android/src/main/java/com/huawei/agc/flutter/applinking/AppLinkingPlugin.java @@ -31,7 +31,6 @@ import io.flutter.plugin.common.BinaryMessenger; import io.flutter.plugin.common.EventChannel; import io.flutter.plugin.common.MethodChannel; -import io.flutter.plugin.common.PluginRegistry.Registrar; public class AppLinkingPlugin implements FlutterPlugin, ActivityAware { private MethodChannel methodChannel; @@ -41,11 +40,7 @@ public class AppLinkingPlugin implements FlutterPlugin, ActivityAware { private EventChannel.StreamHandler streamHandler; private FlutterPluginBinding flutterPluginBinding; - public static void registerWith(Registrar registrar) { - AppLinkingPlugin appLinkingPlugin = new AppLinkingPlugin(); - registrar.publish(appLinkingPlugin); - appLinkingPlugin.onAttachedToEngine(registrar.messenger(), registrar.activity()); - } + private void onAttachedToEngine(final BinaryMessenger messenger, final Activity activity) { if (AGConnectInstance.getInstance() == null) { diff --git a/agconnect_auth/android/src/main/java/com/huawei/agconnectauth/AGConnectAuthPlugin.java b/agconnect_auth/android/src/main/java/com/huawei/agconnectauth/AGConnectAuthPlugin.java index c8f61b5..688f2e3 100644 --- a/agconnect_auth/android/src/main/java/com/huawei/agconnectauth/AGConnectAuthPlugin.java +++ b/agconnect_auth/android/src/main/java/com/huawei/agconnectauth/AGConnectAuthPlugin.java @@ -22,7 +22,7 @@ import io.flutter.plugin.common.EventChannel; import io.flutter.plugin.common.MethodChannel; import io.flutter.plugin.common.MethodChannel.MethodCallHandler; -import io.flutter.plugin.common.PluginRegistry.Registrar; + public class AGConnectAuthPlugin implements FlutterPlugin, EventChannel.StreamHandler { private MethodChannel channel; @@ -31,10 +31,6 @@ public class AGConnectAuthPlugin implements FlutterPlugin, EventChannel.StreamHa private MethodCallHandler methodCallHandler; private AGConnectAuthModule agConnectAuthModule; - public static void registerWith(Registrar registrar) { - AGConnectAuthPlugin instance = new AGConnectAuthPlugin(); - instance.initPlugin(registrar.messenger(), registrar.context().getApplicationContext()); - } @Override public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBinding) { diff --git a/agconnect_core/android/build.gradle b/agconnect_core/android/build.gradle index d93245e..5eab16f 100644 --- a/agconnect_core/android/build.gradle +++ b/agconnect_core/android/build.gradle @@ -9,8 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' - } + classpath 'com.android.tools.build:gradle:8.1.2' } } rootProject.allprojects { @@ -24,17 +23,19 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { - compileSdkVersion 30 + compileSdkVersion 34 buildToolsVersion "30.0.3" - + if (project.android.hasProperty('namespace')) { + namespace 'com.huawei.agconnectcore' + } defaultConfig { - minSdkVersion 18 - targetSdkVersion 30 + minSdkVersion 21 + targetSdkVersion 34 } lintOptions { disable 'InvalidPackage' } dependencies { - implementation 'com.huawei.agconnect:agconnect-core:1.9.0.300' + implementation 'com.huawei.agconnect:agconnect-core:1.9.1.300' } } diff --git a/agconnect_core/android/gradle/wrapper/gradle-wrapper.properties b/agconnect_core/android/gradle/wrapper/gradle-wrapper.properties index 01a286e..573ad69 100644 --- a/agconnect_core/android/gradle/wrapper/gradle-wrapper.properties +++ b/agconnect_core/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Wed Jun 05 14:28:30 PYT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/agconnect_core/android/src/main/AndroidManifest.xml b/agconnect_core/android/src/main/AndroidManifest.xml index 76873d8..a2f47b6 100644 --- a/agconnect_core/android/src/main/AndroidManifest.xml +++ b/agconnect_core/android/src/main/AndroidManifest.xml @@ -1,3 +1,2 @@ - + diff --git a/agconnect_core/android/src/main/java/com/huawei/agconnectcore/AGConnectCorePlugin.java b/agconnect_core/android/src/main/java/com/huawei/agconnectcore/AGConnectCorePlugin.java index 5084c74..bd1136f 100644 --- a/agconnect_core/android/src/main/java/com/huawei/agconnectcore/AGConnectCorePlugin.java +++ b/agconnect_core/android/src/main/java/com/huawei/agconnectcore/AGConnectCorePlugin.java @@ -36,7 +36,6 @@ 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; public class AGConnectCorePlugin implements FlutterPlugin, ActivityAware { private MethodChannel channel; diff --git a/agconnect_crash/android/build.gradle b/agconnect_crash/android/build.gradle index c665832..c512d42 100644 --- a/agconnect_crash/android/build.gradle +++ b/agconnect_crash/android/build.gradle @@ -9,8 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.4' - } + classpath 'com.android.tools.build:gradle:8.1.2' } } rootProject.allprojects { @@ -24,12 +23,14 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { - compileSdkVersion 30 - buildToolsVersion "30.0.3" + compileSdkVersion 34 + if (project.android.hasProperty('namespace')) { + namespace 'com.huawei.agconnectcrash' + } defaultConfig { - minSdkVersion 18 - targetSdkVersion 30 + minSdkVersion 21 + targetSdkVersion 34 } lintOptions { disable 'InvalidPackage' @@ -40,5 +41,5 @@ android { } dependencies { - implementation 'androidx.annotation:annotation:1.5.0' + implementation 'androidx.annotation:annotation:1.8.0' } diff --git a/agconnect_crash/android/gradle.properties b/agconnect_crash/android/gradle.properties index 38c8d45..94adc3a 100644 --- a/agconnect_crash/android/gradle.properties +++ b/agconnect_crash/android/gradle.properties @@ -1,4 +1,3 @@ org.gradle.jvmargs=-Xmx1536M -android.enableR8=true android.useAndroidX=true android.enableJetifier=true diff --git a/agconnect_crash/android/gradle/wrapper/gradle-wrapper.properties b/agconnect_crash/android/gradle/wrapper/gradle-wrapper.properties index 8205549..da1db5f 100644 --- a/agconnect_crash/android/gradle/wrapper/gradle-wrapper.properties +++ b/agconnect_crash/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip diff --git a/agconnect_crash/android/src/main/AndroidManifest.xml b/agconnect_crash/android/src/main/AndroidManifest.xml index 04ac191..a2f47b6 100644 --- a/agconnect_crash/android/src/main/AndroidManifest.xml +++ b/agconnect_crash/android/src/main/AndroidManifest.xml @@ -1,3 +1,2 @@ - + diff --git a/agconnect_crash/android/src/main/java/com/huawei/agconnectcrash/AGConnectCrashPlugin.java b/agconnect_crash/android/src/main/java/com/huawei/agconnectcrash/AGConnectCrashPlugin.java index 83f511d..4239a08 100644 --- a/agconnect_crash/android/src/main/java/com/huawei/agconnectcrash/AGConnectCrashPlugin.java +++ b/agconnect_crash/android/src/main/java/com/huawei/agconnectcrash/AGConnectCrashPlugin.java @@ -33,7 +33,7 @@ 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; + public class AGConnectCrashPlugin implements FlutterPlugin, MethodCallHandler { private MethodChannel channel; @@ -45,11 +45,6 @@ public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBindin channel.setMethodCallHandler(this); } - public static void registerWith(Registrar registrar) { - initAGConnectSDK(registrar.context().getApplicationContext()); - final MethodChannel channel = new MethodChannel(registrar.messenger(), "com.huawei.flutter/agconnect_crash"); - channel.setMethodCallHandler(new AGConnectCrashPlugin()); - } static void initAGConnectSDK(Context context) { if (AGConnectInstance.getInstance() == null) { diff --git a/agconnect_remote_config/android/src/main/java/com/huawei/agconnectremoteconfig/AGConnectRemoteConfigPlugin.java b/agconnect_remote_config/android/src/main/java/com/huawei/agconnectremoteconfig/AGConnectRemoteConfigPlugin.java index 7a57dc4..1056c78 100644 --- a/agconnect_remote_config/android/src/main/java/com/huawei/agconnectremoteconfig/AGConnectRemoteConfigPlugin.java +++ b/agconnect_remote_config/android/src/main/java/com/huawei/agconnectremoteconfig/AGConnectRemoteConfigPlugin.java @@ -36,7 +36,7 @@ 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; + public class AGConnectRemoteConfigPlugin implements FlutterPlugin, MethodCallHandler { private MethodChannel channel; @@ -49,12 +49,7 @@ public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBindin channel.setMethodCallHandler(this); } - public static void registerWith(Registrar registrar) { - initAGConnectSDK(registrar.context().getApplicationContext()); - final MethodChannel channel = new MethodChannel(registrar.messenger(), - "com.huawei.flutter/agconnect_remote_config"); - channel.setMethodCallHandler(new AGConnectRemoteConfigPlugin()); - } + static void initAGConnectSDK(Context context) { if (AGConnectInstance.getInstance() == null) {