Merge branch 'staging' of https://github.com/Countly/countly-sdk-flutter-bridge into staging-np

ArtursKadikis · ArtursKadikis · commit 25db5e88a051 · 2023-02-24T16:32:23.000+02:00
Changing SDK version

# Conflicts:
#	ios/countly_flutter_np.podspec
#	pubspec.yaml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 23.02.0
+## 23.2.0
 * !! Major breaking change !! Resolved issue with handling push notification actions on iOS. 
   * To handle push notification actions, add the following call "CountlyFlutterPlugin.startObservingNotifications();" to "AppDelegate.swift"
   * For further information, refer to the "Handling Push Callbacks" section of the Countly SDK documentation at:
@@ -8,7 +8,7 @@
 * Updated Underlying android SDK version to 22.09.0
 * Updated Underlying iOS SDK version to 23.02.0
 * 
-## 23.02.0-np
+## 23.2.0-np
 * Updated Underlying android SDK version to 22.09.0
 * Updated Underlying iOS SDK version to 23.02.0
 
diff --git a/android/src/main/java/ly/count/dart/countly_flutter/CountlyFlutterPlugin.java b/android/src/main/java/ly/count/dart/countly_flutter/CountlyFlutterPlugin.java
@@ -58,7 +58,7 @@
  */
 public class CountlyFlutterPlugin implements MethodCallHandler, FlutterPlugin, ActivityAware, DefaultLifecycleObserver {
     private static final String TAG = "CountlyFlutterPlugin";
-    private final String COUNTLY_FLUTTER_SDK_VERSION_STRING = "23.02.0";
+    private final String COUNTLY_FLUTTER_SDK_VERSION_STRING = "23.2.0";
     private final String COUNTLY_FLUTTER_SDK_NAME = "dart-flutterb-android";
     private final String COUNTLY_FLUTTER_SDK_NAME_NO_PUSH = "dart-flutterbnp-android";
 
diff --git a/ios/Classes/CountlyFlutterPlugin.m b/ios/Classes/CountlyFlutterPlugin.m
@@ -23,7 +23,7 @@ + (CountlyFeedbackWidget *)createWithDictionary:(NSDictionary *)dictionary;
 
 CLYPushTestMode const CLYPushTestModeProduction = @"CLYPushTestModeProduction";
 
-NSString *const kCountlyFlutterSDKVersion = @"23.02.0";
+NSString *const kCountlyFlutterSDKVersion = @"23.2.0";
 NSString *const kCountlyFlutterSDKName = @"dart-flutterb-ios";
 NSString *const kCountlyFlutterSDKNameNoPush = @"dart-flutterbnp-ios";
 
diff --git a/ios/countly_flutter_np.podspec b/ios/countly_flutter_np.podspec
@@ -3,7 +3,7 @@
 #
 Pod::Spec.new do |s|
   s.name = 'countly_flutter_np'
-  s.version = '23.02.0'
+  s.version = '23.2.0'
   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'
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,29 +1,28 @@
 name: countly_flutter_np
 description: Countly is an innovative, real-time, open source mobile analytics. This plugin is a flavour of the SDK without push notifications.
-version: 23.02.0
+version: 23.2.0
 homepage: https://support.count.ly/hc/en-us/articles/360037944212-Flutter
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
-  flutter: ">=2.0.0"
+    sdk: ">=2.12.0 <3.0.0"
+    flutter: ">=2.0.0"
 
 dependencies:
-  flutter_plugin_android_lifecycle: ^2.0.2
-  flutter:
-    sdk: flutter
-  pedantic: ^1.11.0
+    flutter:
+        sdk: flutter
+    flutter_plugin_android_lifecycle: ^2.0.2
+    pedantic: ^1.11.0
 
 dev_dependencies:
-  flutter_lints: ^2.0.1
-  flutter_test:
-    sdk: flutter
+    flutter_lints: ^2.0.1
+    flutter_test:
+        sdk: flutter
 
 flutter:
-  plugin:
-    platforms:
-      android:
-        package: ly.count.dart.countly_flutter
-        pluginClass: CountlyFlutterPlugin
-      ios:
-        pluginClass: CountlyFlutterPlugin
-
+    plugin:
+        platforms:
+            android:
+                package: ly.count.dart.countly_flutter
+                pluginClass: CountlyFlutterPlugin
+            ios:
+                pluginClass: CountlyFlutterPlugin
diff --git a/scripts/no-push-files/countly_flutter_np.podspec b/scripts/no-push-files/countly_flutter_np.podspec
@@ -3,7 +3,7 @@
 #
 Pod::Spec.new do |s|
   s.name = 'countly_flutter_np'
-  s.version = '23.02.0'
+  s.version = '23.2.0'
   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'
diff --git a/scripts/no-push-files/pubspec.yaml b/scripts/no-push-files/pubspec.yaml
@@ -1,29 +1,28 @@
 name: countly_flutter_np
 description: Countly is an innovative, real-time, open source mobile analytics. This plugin is a flavour of the SDK without push notifications.
-version: 23.02.0
+version: 23.2.0
 homepage: https://support.count.ly/hc/en-us/articles/360037944212-Flutter
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
-  flutter: ">=2.0.0"
+    sdk: ">=2.12.0 <3.0.0"
+    flutter: ">=2.0.0"
 
 dependencies:
-  flutter_plugin_android_lifecycle: ^2.0.2
-  flutter:
-    sdk: flutter
-  pedantic: ^1.11.0
+    flutter_plugin_android_lifecycle: ^2.0.2
+    flutter:
+        sdk: flutter
+    pedantic: ^1.11.0
 
 dev_dependencies:
-  flutter_lints: ^2.0.1
-  flutter_test:
-    sdk: flutter
+    flutter_lints: ^2.0.1
+    flutter_test:
+        sdk: flutter
 
 flutter:
-  plugin:
-    platforms:
-      android:
-        package: ly.count.dart.countly_flutter
-        pluginClass: CountlyFlutterPlugin
-      ios:
-        pluginClass: CountlyFlutterPlugin
-
+    plugin:
+        platforms:
+            android:
+                package: ly.count.dart.countly_flutter
+                pluginClass: CountlyFlutterPlugin
+            ios:
+                pluginClass: CountlyFlutterPlugin

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#`
`4`	`4`	`Pod::Spec.new do \|s\|`
`5`	`5`	`s.name = 'countly_flutter_np'`
`6`		`- s.version = '23.02.0'`
	`6`	`+ s.version = '23.2.0'`
`7`	`7`	`s.summary = 'Countly is an innovative, real-time, open source mobile analytics platform.'`
`8`	`8`	`s.homepage = 'https://github.com/Countly/countly-sdk-flutter-bridge'`
`9`	`9`	`s.social_media_url = 'https://twitter.com/gocountly'`