Merge branch 'staging-np' of github.com:Countly/countly-sdk-flutter-b…

…ridge into staging-np
Countly · Nov 7, 2024 · 1c644f9 · 1c644f9
2 parents 27524ee + d121299
commit 1c644f9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/scripts/no-push-files/AndroidManifest.xml b/scripts/no-push-files/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="ly.count.dart.countly_flutter">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <application>

diff --git a/scripts/no-push-files/README.md b/scripts/no-push-files/README.md
@@ -151,18 +151,18 @@ await Countly.instance.views.stopAllViews(segmentation);
 
 // Change device ID with merge.
 // Here, the data associated with the previous device ID is merged with the new ID.
-await Countly.changeDeviceId('123456', true);
+await Countly.instance.deviceId.changeWithMerge('123456');
 
 // Change device ID without merge.
 // Here, the new device ID is counted as a new device.
-await Countly.changeDeviceId('123456', false);
+await Countly.instance.deviceId.changeWithoutMerge('123456');
 ```
 
 ## Get Device ID Type
 
 ```dart
 // To fetch the device ID type
-final DeviceIdType? deviceIdtype = await Countly.getDeviceIDType();
+final DeviceIdType? deviceIdtype = await Countly.instance.deviceId.getIDType();
 // DeviceIdType: DEVELOPER_SUPPLIED, SDK_GENERATED, TEMPORARY_ID
 ```
 

diff --git a/scripts/no-push-files/build.gradle b/scripts/no-push-files/build.gradle
@@ -22,10 +22,14 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdk 33
+    // Conditional for compatibility with AGP <4.2.
+    if (project.android.hasProperty("namespace")) {
+        namespace 'ly.count.dart.countly_flutter'
+    }
+    compileSdk 35
 
     defaultConfig {
-        minSdkVersion 17
+        minSdkVersion 21
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     lintOptions {