Release 10.3.0

crow · crow · commit 7aff0dfd0590 · 2025-05-01T17:05:27.000-07:00
diff --git a/.pubignore b/.pubignore
@@ -0,0 +1 @@
+example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Flutter Plugin Changelog
 
+## Version 10.3.0 - May 1, 2025
+Minor release that updates the Android SDK to 19.6.2 and the iOS SDK to 19.3.1.
+
+### Changes
+- Updated Android SDK to [19.6.2](https://github.com/urbanairship/android-library/releases/tag/19.6.2)
+- Updated iOS SDK to [19.3.1](https://github.com/urbanairship/ios-library/releases/tag/19.3.1)
+- Added support for JSON attributes
+- Added new method `Airship.channel.waitForChannelId()` that waits for the channel ID to be created
+
 ## Version 10.2.0 - March 27, 2025
 
 Minor release that updates the Android SDK to 19.4.0 and the iOS SDK to 19.1.1
diff --git a/android/build.gradle b/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     ext.kotlin_version = '1.9.0'
     ext.coroutine_version = '1.5.2'
     ext.datastore_preferences_version = '1.1.1'
-    ext.airship_framework_proxy_version = '13.3.0'
+    ext.airship_framework_proxy_version = '14.2.1'
 
 
     repositories {
diff --git a/android/src/main/kotlin/com/airship/flutter/AirshipPlugin.kt b/android/src/main/kotlin/com/airship/flutter/AirshipPlugin.kt
@@ -119,6 +119,7 @@ class AirshipPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
 
             // Channel
             "channel#getChannelId" -> result.resolve(scope, call) { proxy.channel.getChannelId() }
+            "channel#waitForChannelId" -> result.resolve(scope, call) { proxy.channel.waitForChannelId() }
             "channel#addTags" -> result.resolve(scope, call) {
                 call.stringList().forEach {
                     proxy.channel.addTag(it)
diff --git a/android/src/main/kotlin/com/airship/flutter/AirshipPluginVersion.kt b/android/src/main/kotlin/com/airship/flutter/AirshipPluginVersion.kt
@@ -2,6 +2,6 @@ package com.airship.flutter
 
 class AirshipPluginVersion {
     companion object {
-        const val AIRSHIP_PLUGIN_VERSION = "10.2.0"
+        const val AIRSHIP_PLUGIN_VERSION = "10.3.0"
     }
 }
diff --git a/example/.pubignore b/example/.pubignore
@@ -0,0 +1 @@
+example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Package.swift b/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Package.swift
@@ -0,0 +1,28 @@
+// swift-tools-version: 5.9
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+//
+//  Generated file. Do not edit.
+//
+
+import PackageDescription
+
+let package = Package(
+    name: "FlutterGeneratedPluginSwiftPackage",
+    platforms: [
+        .iOS("16.1")
+    ],
+    products: [
+        .library(name: "FlutterGeneratedPluginSwiftPackage", type: .static, targets: ["FlutterGeneratedPluginSwiftPackage"])
+    ],
+    dependencies: [
+        .package(name: "airship_flutter", path: "/Users/david.crow/source/airship-flutter/ios/airship_flutter")
+    ],
+    targets: [
+        .target(
+            name: "FlutterGeneratedPluginSwiftPackage",
+            dependencies: [
+                .product(name: "airship-flutter", package: "airship_flutter")
+            ]
+        )
+    ]
+)
diff --git a/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift b/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift
@@ -0,0 +1,3 @@
+//
+//  Generated file. Do not edit.
+//
diff --git a/example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved b/example/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/ios/.pubignore b/ios/.pubignore
@@ -0,0 +1 @@
+example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/ios/airship_flutter.podspec b/ios/airship_flutter.podspec
@@ -1,5 +1,5 @@
 
-AIRSHIP_FLUTTER_VERSION="10.2.0"
+AIRSHIP_FLUTTER_VERSION="10.3.0"
 
 #
 # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
@@ -19,7 +19,7 @@ Airship flutter plugin.
   s.source_files = 'airship_flutter/Sources/airship_flutter/**/*'
   s.dependency 'Flutter'
   s.ios.deployment_target      = "15.0"
-  s.dependency "AirshipFrameworkProxy", "13.3.0"
+  s.dependency "AirshipFrameworkProxy", "14.2.1"
   s.swift_version = "5.0.0"
   s.resource_bundles = {'airship_flutter_privacy' => ['airship_flutter/Sources/airship_flutter/PrivacyInfo.xcprivacy']}
 end
diff --git a/ios/airship_flutter/Package.resolved b/ios/airship_flutter/Package.resolved
diff --git a/ios/airship_flutter/Package.swift b/ios/airship_flutter/Package.swift
@@ -10,7 +10,7 @@ let package = Package(
         .library( name: "airship-flutter", targets: ["airship_flutter"])
     ],
     dependencies: [
-        .package(url: "https://github.com/urbanairship/airship-mobile-framework-proxy.git", from: "13.0.0")
+        .package(url: "https://github.com/urbanairship/airship-mobile-framework-proxy.git", from: "14.2.1")
     ],
     targets: [
         .target(
diff --git a/ios/airship_flutter/Sources/airship_flutter/AirshipPlugin.swift b/ios/airship_flutter/Sources/airship_flutter/AirshipPlugin.swift
@@ -117,6 +117,9 @@ public class AirshipPlugin: NSObject, FlutterPlugin {
         case "channel#getChannelId":
             return try AirshipProxy.shared.channel.channelID
             
+        case "channel#waitForChannelId":
+            return try await AirshipProxy.shared.channel.waitForChannelID()
+
         case "channel#addTags":
             try AirshipProxy.shared.channel.addTags(
                 try call.requireStringArrayArg()
diff --git a/ios/airship_flutter/Sources/airship_flutter/AirshipPluginVersion.swift b/ios/airship_flutter/Sources/airship_flutter/AirshipPluginVersion.swift
@@ -1,5 +1,5 @@
 import Foundation
 
 class AirshipPluginVersion {
-    static let pluginVersion = "10.2.0"
+    static let pluginVersion = "10.3.0"
 }
diff --git a/lib/src/airship_channel.dart b/lib/src/airship_channel.dart
@@ -15,6 +15,14 @@ class AirshipChannel {
     return await _module.channel.invokeMethod('channel#getChannelId');
   }
 
+  /// Returns the channel ID. If the channel ID is not yet created the function it will wait for it before returning. After
+  /// the channel ID is created, this method functions the same as `identifier`.
+  /// 
+  /// @returns A future with the channel ID.
+  Future<String?> waitForChannelId() async {
+    return await _module.channel.invokeMethod('channel#waitForChannelId');
+  }
+
   /// Creates a [SubscriptionListEditor] to modify the subscription lists associated with the channel.
   SubscriptionListEditor editSubscriptionLists() {
     return SubscriptionListEditor("channel#editSubscriptionLists", _module.channel);
diff --git a/lib/src/attribute_editor.dart b/lib/src/attribute_editor.dart
@@ -9,6 +9,8 @@ class AttributeEditor {
   static const ATTRIBUTE_OPERATION_SET = "set";
   static const ATTRIBUTE_OPERATION_VALUE = "value";
   static const ATTRIBUTE_OPERATION_VALUE_TYPE = "type";
+  static const ATTRIBUTE_OPERATION_INSTANCE_ID = "instance_id";
+  static const ATTRIBUTE_OPERATION_EXPIRATION_MS = "expiration_milliseconds";
 
   final MethodChannel channel;
 
@@ -18,8 +20,7 @@ class AttributeEditor {
   /// The attribute operation list.
   final List<Map<String, dynamic>> operations;
 
-  AttributeEditor(this.type, this.channel)
-      : operations = [];
+  AttributeEditor(this.type, this.channel) : operations = [];
 
   /// Removes an attribute.
   void removeAttribute(String name) {
@@ -59,6 +60,43 @@ class AttributeEditor {
     });
   }
 
+  /// Adds a JSON attribute.
+  ///
+  /// @param name The attribute name.
+  /// @param instanceId The instance ID.
+  /// @param json The json value.
+  /// @param expiration Optional expiration date.
+  void setJsonAttribute(
+      String name, String instanceId, Map<String, dynamic> json,
+      [DateTime? expiration]) {
+    final operation = {
+      ATTRIBUTE_OPERATION_TYPE: ATTRIBUTE_OPERATION_SET,
+      ATTRIBUTE_OPERATION_KEY: name,
+      ATTRIBUTE_OPERATION_INSTANCE_ID: instanceId,
+      ATTRIBUTE_OPERATION_VALUE: json,
+      ATTRIBUTE_OPERATION_VALUE_TYPE: "json"
+    };
+
+    if (expiration != null) {
+      operation[ATTRIBUTE_OPERATION_EXPIRATION_MS] =
+          expiration.millisecondsSinceEpoch;
+    }
+
+    operations.add(operation);
+  }
+
+  /// Removes a JSON attribute.
+  ///
+  /// @param name The attribute name.
+  /// @param instanceId The instance ID.
+  void removeJsonAttribute(String name, String instanceId) {
+    operations.add({
+      ATTRIBUTE_OPERATION_TYPE: ATTRIBUTE_OPERATION_REMOVE,
+      ATTRIBUTE_OPERATION_KEY: name,
+      ATTRIBUTE_OPERATION_INSTANCE_ID: instanceId
+    });
+  }
+
   /// Applies the attribute operations.
   Future<void> apply() async {
     return await channel.invokeMethod(type, operations);
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: airship_flutter
 description: "Cross-platform plugin interface for the native Airship iOS and Android SDKs. Simplifies adding Airship to Flutter apps."
-version: 10.2.0
+version: 10.3.0
 homepage: https://www.airship.com/
 repository: https://github.com/urbanairship/airship-flutter
 issue_tracker: https://github.com/urbanairship/airship-flutter/issues

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@ package com.airship.flutter`
`2`	`2`
`3`	`3`	`class AirshipPluginVersion {`
`4`	`4`	`companion object {`
`5`		`- const val AIRSHIP_PLUGIN_VERSION = "10.2.0"`
	`5`	`+ const val AIRSHIP_PLUGIN_VERSION = "10.3.0"`
`6`	`6`	`}`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+//`
	`2`	`+// Generated file. Do not edit.`
	`3`	`+//`