Merge pull request #339 from Countly/v1-embedding-drop-np

V1 embedding drop np

Author: turtledreams

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 25.1.1-np
+* Removed Android v1 embedding support
+
+* Underlying Android SDK version is 25.1.1
+* Underlying iOS SDK version is 25.1.1
+* Underlying Web SDK version is 25.1.0
+
 ## 25.1.0-np
 * Added experimental support for the web platform in the Countly Flutter SDK. Some functionalities are not yet fully supported. Below is the list of limitations for the web platform:
   * Hybrid sessions are the default; full manual sessions are not supported.

android/src/main/java/ly/count/dart/countly_flutter/CountlyFlutterPlugin.java

@@ -9,7 +9,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;
+// import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 import ly.count.android.sdk.Countly;
 import ly.count.android.sdk.CountlyConfig;
@@ -62,7 +62,7 @@
  */
 public class CountlyFlutterPlugin implements MethodCallHandler, FlutterPlugin, ActivityAware, DefaultLifecycleObserver {
     private static final String TAG = "CountlyFlutterPlugin";
-    private final String COUNTLY_FLUTTER_SDK_VERSION_STRING = "25.1.0";
+    private final String COUNTLY_FLUTTER_SDK_VERSION_STRING = "25.1.1";
     private final String COUNTLY_FLUTTER_SDK_NAME = "dart-flutterb-android";
     private final String COUNTLY_FLUTTER_SDK_NAME_NO_PUSH = "dart-flutterbnp-android";
 
@@ -136,13 +136,13 @@ public final int resultResponder(RequestResult rResult) {
     //----------PLUGIN REGISTRATION (FlutterPlugin)-------------------
 
     // Required for pre Flutter 1.12 projects
-    public static void registerWith(Registrar registrar) {
-        final CountlyFlutterPlugin instance = new CountlyFlutterPlugin();
-        instance.activity = registrar.activity();
-        final Context __context = registrar.context();
-        instance.onAttachedToEngineInternal(__context, registrar.messenger());
-        log("registerWith", LogLevel.INFO);
-    }
+    // public static void registerWith(Registrar registrar) {
+    //     final CountlyFlutterPlugin instance = new CountlyFlutterPlugin();
+    //     instance.activity = registrar.activity();
+    //     final Context __context = registrar.context();
+    //     instance.onAttachedToEngineInternal(__context, registrar.messenger());
+    //     log("registerWith", LogLevel.INFO);
+    // }
 
     // Called from Android embedding v2
     @Override

example/.gitignore

@@ -33,6 +33,7 @@
 # Android related
 **/android/**/gradle-wrapper.jar
 **/android/.gradle
+**/android/app/.cxx/
 **/android/captures/
 **/android/gradlew
 **/android/gradlew.bat

example/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-7.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip

example/android/settings.gradle

@@ -19,8 +19,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+    id 'com.android.application' version '8.8.0' apply false
+    id 'org.jetbrains.kotlin.android' version '2.1.10' apply false
 }
 
 include ":app"

example/integration_test/utils.dart

@@ -32,7 +32,7 @@ void testCommonRequestParams(Map<String, List<String>> requestObject) {
   expect(
       requestObject['sdk_name']?[0],
       "dart-flutterbnp-${kIsWeb ? 'web' : Platform.isIOS ? 'ios' : 'android'}");
-  expect(requestObject['sdk_version']?[0], '25.1.0');
+  expect(requestObject['sdk_version']?[0], '25.1.1');
   expect(
       requestObject['av']?[0],
       kIsWeb

example/pubspec.yaml

@@ -27,7 +27,7 @@ dev_dependencies:
     sdk: flutter
   integration_test:
     sdk: flutter
-  flutter_foreground_task: 6.0.0+1
+  flutter_foreground_task: ^8.0.0
   flutter_lints: ^2.0.0
 
 # For information on the generic Dart part of this file, see the

ios/Classes/CountlyFlutterPlugin.m

@@ -28,7 +28,7 @@ @interface CountlyPersistency ()
 
 CLYPushTestMode const CLYPushTestModeProduction = @"CLYPushTestModeProduction";
 
-NSString *const kCountlyFlutterSDKVersion = @"25.1.0";
+NSString *const kCountlyFlutterSDKVersion = @"25.1.1";
 NSString *const kCountlyFlutterSDKName = @"dart-flutterb-ios";
 NSString *const kCountlyFlutterSDKNameNoPush = @"dart-flutterbnp-ios";
 

ios/countly_flutter_np.podspec

@@ -3,7 +3,7 @@
 #
 Pod::Spec.new do |s|
   s.name = 'countly_flutter_np'
-  s.version = '25.1.0'
+  s.version = '25.1.1'
   s.summary = 'Countly is an innovative, real-time, open source mobile analytics platform.'
   s.homepage = 'https://github.com/Countly/countly-sdk-flutter-bridge'
   s.social_media_url = 'https://twitter.com/gocountly'

lib/src/web/plugin_config.dart

@@ -1,5 +1,5 @@
 class CountlyFlutterPluginConfig {
-  static const String SDK_VERSION_STRING = '25.1.0';
+  static const String SDK_VERSION_STRING = '25.1.1';
   static const String SDK_NAME = 'dart-flutterb-web';
   static const String WEB_SDK_URL = 'https://cdn.jsdelivr.net/npm/[email protected]/lib/countly.min.js';
 }