Update for v2.2.0

- Upgrade Flurry iOS SDK version to 12.1.1 - Fix iOS CocoaPods build failures
flurry · Jul 11, 2022 · e77d0c0 · e77d0c0
1 parent 4d2a66a
commit e77d0c0
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,16 @@
 * [Flurry Android SDK Release Notes](https://developer.yahoo.com/flurry/docs/releasenotes/android/)
 * [Flurry iOS SDK Release Notes](https://developer.yahoo.com/flurry/docs/releasenotes/ios/)
 
+# v2.2.0 (2022-07-12)
+
+#### Features
+
+* Upgrade Flurry iOS SDK version to 12.1.1
+
+#### Bug Fixes
+
+* Fix iOS CocoaPods build failures
+
 # v2.1.0 (2022-05-26)
 
 #### Features

diff --git a/android/src/main/java/com/flurry/android/flutter/FlurryFlutterPlugin.java b/android/src/main/java/com/flurry/android/flutter/FlurryFlutterPlugin.java
@@ -54,7 +54,7 @@ public class FlurryFlutterPlugin implements FlutterPlugin, MethodCallHandler, Ac
     private static final String TAG = "FlurryFlutterPlugin";
 
     private static final String ORIGIN_NAME = "flutter-flurry-sdk";
-    private static final String ORIGIN_VERSION = "2.1.0";
+    private static final String ORIGIN_VERSION = "2.2.0";
 
     private Context context;
 

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -1,16 +1,16 @@
 PODS:
-  - Flurry-iOS-SDK/CrashReporter (12.0.0)
-  - Flurry-iOS-SDK/FlurryConfig (12.0.0):
+  - Flurry-iOS-SDK/CrashReporter (12.1.1)
+  - Flurry-iOS-SDK/FlurryConfig (12.1.1):
     - Flurry-iOS-SDK/FlurrySDK
-  - Flurry-iOS-SDK/FlurryMessaging (12.0.0):
+  - Flurry-iOS-SDK/FlurryMessaging (12.1.1):
     - Flurry-iOS-SDK/FlurrySDK
-  - Flurry-iOS-SDK/FlurrySDK (12.0.0):
+  - Flurry-iOS-SDK/FlurrySDK (12.1.1):
     - Flurry-iOS-SDK/CrashReporter
   - Flutter (1.0.0)
   - flutter_flurry_sdk (0.0.1):
-    - Flurry-iOS-SDK/FlurryConfig (~> 12.0.0)
-    - Flurry-iOS-SDK/FlurryMessaging (~> 12.0.0)
-    - Flurry-iOS-SDK/FlurrySDK (~> 12.0.0)
+    - Flurry-iOS-SDK/FlurryConfig (~> 12.1.1)
+    - Flurry-iOS-SDK/FlurryMessaging (~> 12.1.1)
+    - Flurry-iOS-SDK/FlurrySDK (~> 12.1.1)
     - Flutter
 
 DEPENDENCIES:
@@ -28,9 +28,9 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_flurry_sdk/ios"
 
 SPEC CHECKSUMS:
-  Flurry-iOS-SDK: 9fe953e13199a56c93d769d51abeb042fe45b02c
+  Flurry-iOS-SDK: 2ae2391515ae3248a63e95a397c1b393ae52b3a9
   Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
-  flutter_flurry_sdk: 072f0687b8567f6dd4497fc401401121781b6916
+  flutter_flurry_sdk: 0fe83e49d614e9304cc5ba950e6262bb80bfdc3f
 
 PODFILE CHECKSUM: 1d5103e59c34489a395ae7f46690437f27451f42
 

diff --git a/ios/Classes/FlurryFlutterPlugin.m b/ios/Classes/FlurryFlutterPlugin.m
@@ -1,23 +1,17 @@
 #import "FlurryFlutterPlugin.h"
-#import "FlurryCCPA.h"
-#import "FlurryUserProperties.h"
-#import "Flurry.h"
-#import "Flurry+Event.h"
 
-#if __has_include("FlurryMessaging.h")
-#import "FlurryMessaging.h"
-#endif
+#import <Flurry_iOS_SDK/Flurry_iOS_SDK.h>
 
-#if __has_include(<StoreKit/SKAdNetwork.h>)
-#import "FlurrySKAdNetwork.h"
+#if __has_include(<Flurry_Messaging/Flurry_Messaging.h>)
+#import <Flurry_Messaging/Flurry_Messaging.h>
 #endif
 
-#if __has_include("FConfig.h")
-#import "FConfig.h"
+#if __has_include(<Flurry_Config/Flurry_Config.h>)
+#import <Flurry_Config/Flurry_Config.h>
 #endif
 
 NSString *originName = @"flutter-flurry-sdk";
-NSString *originVersion = @"2.1.0";
+NSString *originVersion = @"2.2.0";
 
 static FlurryFlutterPlugin* sharedInstance;
 
@@ -34,11 +28,11 @@
 bool FlurryLogEnabled = true;
 bool hasSetUpDummyListener_messaging = false;
 
-#if __has_include("FlurryMessaging.h") && __has_include("FConfig.h")
+#if __has_include(<Flurry_Config/Flurry_Config.h>) && __has_include(<Flurry_Messaging/Flurry_Messaging.h>)
 @interface FlurryFlutterPlugin()<FlurryMessagingDelegate, FConfigObserver, FlurryFetchObserver>
-#elif __has_include("FlurryMessaging.h")
+#elif __has_include(<Flurry_Messaging/Flurry_Messaging.h>)
 @interface FlurryFlutterPlugin()<FlurryMessagingDelegate>
-#elif __has_include("FConfig.h")
+#elif __has_include(<Flurry_Config/Flurry_Config.h>)
 @interface FlurryFlutterPlugin()<FConfigObserver>
 #else
 @interface FlurryFlutterPlugin()
@@ -72,7 +66,7 @@ -(instancetype)init {
 #pragma mark - FlurryMessaging
 
 - (void) flurrySetAutoIntegrationForMessaging {
-    #if __has_include("FlurryMessaging.h")
+    #if __has_include(<Flurry_Messaging/Flurry_Messaging.h>)
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         if(!hasSetUpDummyListener_messaging){
@@ -86,7 +80,7 @@ - (void) flurrySetAutoIntegrationForMessaging {
 }
 
 - (void) flurrySetMessagingDelegate{
-#if __has_include("FlurryMessaging.h")
+#if __has_include(<Flurry_Messaging/Flurry_Messaging.h>)
     if(!hasSetUpDummyListener_messaging){
         [FlurryMessaging setMessagingDelegate:[FlurryFlutterPlugin shared]];
         hasSetUpDummyListener_messaging = !hasSetUpDummyListener_messaging;
@@ -96,7 +90,7 @@ - (void) flurrySetMessagingDelegate{
 }
 
 #pragma mark - FlurryMessageDelegate
-#if __has_include("FlurryMessaging.h")
+#if __has_include(<Flurry_Messaging/Flurry_Messaging.h>)
 - (void) didReceiveMessage:(nonnull FlurryMessage*)message {
     NSLog(@"didReceiveMessage = %@", [message description]);
 
@@ -138,7 +132,7 @@ - (FlutterError* _Nullable)onCancelWithArguments:(id _Nullable)arguments {
 #pragma mark - FluryConfig
 
 - (void)flurryRegisterConfigListener{
-#if __has_include("FConfig.h")
+#if __has_include(<Flurry_Config/Flurry_Config.h>)
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         [[FConfig sharedInstance] registerObserver:[FlurryFlutterPlugin shared] withExecutionQueue:dispatch_get_main_queue()];
@@ -147,13 +141,13 @@ - (void)flurryRegisterConfigListener{
 }
 
 - (void)flurryFetchConfig{
-#if __has_include("FConfig.h")
+#if __has_include(<Flurry_Config/Flurry_Config.h>)
     [[FConfig sharedInstance] fetchConfig];
 #endif
 }
 
 - (void)flurryActivateConfig{
-#if __has_include("FConfig.h")
+#if __has_include(<Flurry_Config/Flurry_Config.h>)
     [[FConfig sharedInstance] activateConfig];
 #endif
 }
@@ -166,7 +160,7 @@ - (NSString *)flurryGetConfigString:(NSDictionary *)dict{
     return value;
 }
 
-#if __has_include("FConfig.h")
+#if __has_include(<Flurry_Config/Flurry_Config.h>)
 
 - (void) fetchComplete{
     NSDictionary *msg = @{@"type" : kConfigFetchCompleteMessage};

diff --git a/ios/flutter_flurry_sdk.podspec b/ios/flutter_flurry_sdk.podspec
@@ -3,7 +3,7 @@
 # Run `pod lib lint flutter_flurry_sdk.podspec` to validate before publishing.
 #
 
-sdkVersion = '12.0.0'
+sdkVersion = '12.1.1'
 
 Pod::Spec.new do |s|
   s.name             = 'flutter_flurry_sdk'

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_flurry_sdk
 description: A Flutter plugin for Flurry Analytics SDK. Flurry Push for messaging and Flurry Config for remote configuration are supported by our plugin as well!
-version: 2.1.0
+version: 2.2.0
 homepage: https://www.flurry.com/
 repository: https://github.com/flurry/flutter-flurry-sdk