diff --git a/.idea/caches/deviceStreaming.xml b/.idea/caches/deviceStreaming.xml new file mode 100644 index 0000000..5c90e4f --- /dev/null +++ b/.idea/caches/deviceStreaming.xml @@ -0,0 +1,921 @@ + + + + + + \ No newline at end of file diff --git a/agconnect_applinking/android/build.gradle b/agconnect_applinking/android/build.gradle index 3d1c6a2..a13b898 100644 --- a/agconnect_applinking/android/build.gradle +++ b/agconnect_applinking/android/build.gradle @@ -25,6 +25,10 @@ android { compileSdkVersion 30 buildToolsVersion = '30.0.3' + if (project.android.hasProperty("namespace")) { + namespace 'com.huawei.agc.flutter.applinking' + } + defaultConfig { minSdkVersion 19 targetSdkVersion 30 diff --git a/agconnect_appmessaging/android/build.gradle b/agconnect_appmessaging/android/build.gradle index 39a85eb..2a4ad85 100644 --- a/agconnect_appmessaging/android/build.gradle +++ b/agconnect_appmessaging/android/build.gradle @@ -26,6 +26,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion 30 buildToolsVersion "30.0.3" + + if (project.android.hasProperty("namespace")) { + namespace 'com.huawei.agc.flutter.appmessaging.agconnect_appmessaging' + } defaultConfig { minSdkVersion 19 diff --git a/agconnect_auth/android/build.gradle b/agconnect_auth/android/build.gradle index 7f758e9..adec855 100644 --- a/agconnect_auth/android/build.gradle +++ b/agconnect_auth/android/build.gradle @@ -27,6 +27,10 @@ android { compileSdkVersion 30 buildToolsVersion "30.0.3" + if (project.android.hasProperty("namespace")) { + namespace 'com.huawei.agconnectauth' + } + defaultConfig { minSdkVersion 18 targetSdkVersion 30 diff --git a/agconnect_clouddb/android/build.gradle b/agconnect_clouddb/android/build.gradle index 297d3e5..81d558e 100644 --- a/agconnect_clouddb/android/build.gradle +++ b/agconnect_clouddb/android/build.gradle @@ -25,6 +25,11 @@ apply plugin: "com.android.library" android { compileSdkVersion 29 buildToolsVersion "29.0.3" + + if (project.android.hasProperty("namespace")) { + namespace 'com.huawei.agconnectclouddb' + } + defaultConfig { minSdkVersion 19 targetSdkVersion 29 @@ -38,6 +43,6 @@ android { } } -dependencies { +dependencies { implementation "com.huawei.agconnect:agconnect-cloud-database:1.9.1.300" } diff --git a/agconnect_cloudfunctions/android/build.gradle b/agconnect_cloudfunctions/android/build.gradle index a8bdf01..55438bf 100644 --- a/agconnect_cloudfunctions/android/build.gradle +++ b/agconnect_cloudfunctions/android/build.gradle @@ -27,6 +27,10 @@ android { compileSdkVersion 30 buildToolsVersion "30.0.1" + if (project.android.hasProperty("namespace")) { + namespace 'com.huawei.agc.flutter.cloudfunctions' + } + defaultConfig { minSdkVersion 18 targetSdkVersion 30 diff --git a/agconnect_core/android/build.gradle b/agconnect_core/android/build.gradle index d93245e..630e7f7 100644 --- a/agconnect_core/android/build.gradle +++ b/agconnect_core/android/build.gradle @@ -27,6 +27,10 @@ android { compileSdkVersion 30 buildToolsVersion "30.0.3" + if (project.android.hasProperty("namespace")) { + namespace 'com.huawei.agconnectcore' + } + defaultConfig { minSdkVersion 18 targetSdkVersion 30 diff --git a/agconnect_crash/android/build.gradle b/agconnect_crash/android/build.gradle index c665832..46810fa 100644 --- a/agconnect_crash/android/build.gradle +++ b/agconnect_crash/android/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.4' + classpath 'com.android.tools.build:gradle:8.1.4' } } @@ -27,6 +27,10 @@ android { compileSdkVersion 30 buildToolsVersion "30.0.3" + if (project.android.hasProperty("namespace")) { + namespace 'com.huawei.agconnectcrash' + } + defaultConfig { minSdkVersion 18 targetSdkVersion 30 diff --git a/agconnect_crash/android/gradle/wrapper/gradle-wrapper.properties b/agconnect_crash/android/gradle/wrapper/gradle-wrapper.properties index 8205549..6b74f0f 100644 --- a/agconnect_crash/android/gradle/wrapper/gradle-wrapper.properties +++ b/agconnect_crash/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip 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..5cde4c2 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,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 AGConnectCrashPlugin implements FlutterPlugin, MethodCallHandler { private MethodChannel channel; @@ -45,11 +44,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/build.gradle b/agconnect_remote_config/android/build.gradle index a482d0d..809e349 100644 --- a/agconnect_remote_config/android/build.gradle +++ b/agconnect_remote_config/android/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:8.1.4' } } @@ -27,6 +27,10 @@ android { compileSdkVersion 30 buildToolsVersion "30.0.3" + if (project.android.hasProperty("namespace")) { + namespace 'com.huawei.agconnectremoteconfig' + } + defaultConfig { minSdkVersion 18 targetSdkVersion 30 diff --git a/agconnect_remote_config/android/gradle/wrapper/gradle-wrapper.properties b/agconnect_remote_config/android/gradle/wrapper/gradle-wrapper.properties index 84337ad..afa1e8e 100644 --- a/agconnect_remote_config/android/gradle/wrapper/gradle-wrapper.properties +++ b/agconnect_remote_config/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip 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..4429928 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 @@ -31,12 +31,12 @@ import java.util.Map; import androidx.annotation.NonNull; + 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; public class AGConnectRemoteConfigPlugin implements FlutterPlugin, MethodCallHandler { private MethodChannel channel; @@ -44,18 +44,10 @@ public class AGConnectRemoteConfigPlugin implements FlutterPlugin, MethodCallHan @Override public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBinding) { initAGConnectSDK(flutterPluginBinding.getApplicationContext()); - channel = new MethodChannel(flutterPluginBinding.getBinaryMessenger(), - "com.huawei.flutter/agconnect_remote_config"); + channel = new MethodChannel(flutterPluginBinding.getBinaryMessenger(), "com.huawei.flutter/agconnect_remote_config"); 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) { AGConnectInstance.initialize(context); @@ -95,9 +87,7 @@ public void onFailure(Exception e) { if (e instanceof AGCConfigException) { AGCConfigException exception = (AGCConfigException) e; HashMap detail = new HashMap<>(); - detail.put( - "throttleEndTime", - exception.getThrottleEndTimeMillis()); + detail.put("throttleEndTime", exception.getThrottleEndTimeMillis()); result.error(String.valueOf(exception.getCode()), exception.getErrMsg(), detail); } else if (e instanceof AGCException) { AGCException exception = (AGCException) e; diff --git a/agconnect_storage/android/build.gradle b/agconnect_storage/android/build.gradle index c40918c..fb706fa 100644 --- a/agconnect_storage/android/build.gradle +++ b/agconnect_storage/android/build.gradle @@ -27,6 +27,10 @@ android { compileSdkVersion 30 buildToolsVersion "30.0.3" + if (project.android.hasProperty("namespace")) { + namespace 'com.huawei.agconnect.cloudstorage' + } + defaultConfig { minSdkVersion 18 targetSdkVersion 30