Merge remote-tracking branch 'upstream/main' into fix/screen_view_params

Author: mohamedzakaria974

packages/core/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.8
+
+- Reverting fix for #152
+
 ## 1.1.7
 
 - Fix for setFlushPolicies method is overwriting Configuration properties #144

packages/core/README.md

@@ -578,6 +578,10 @@ See the [example app](../../example/README.md) to check a full test app of how t
 
 ## Release Notes
 
+### Version 1.1.8 (10 Jul 2025)
+
+Reverting fix for #152
+
 ### Version 1.1.7 (21 May 2025)
 
 1. **Fixes Github Issue [#144](https://github.com/segmentio/analytics_flutter/issues/144)** - Up to version 1.1.6, the `setFlushPolicies` method inadvertently overwrote the `Configuration.collectDeviceId`property. This issue has been resolved in version 1.1.7.

packages/core/lib/analytics.dart

@@ -69,7 +69,7 @@ class Analytics with ClientMethods {
       addPlugin(segmentDestination);
     }
 
-    if(config.token != null) {
+    if (config.token != null) {
       _platformPlugins.add(InjectToken(config.token!));
     }
 
@@ -210,30 +210,26 @@ class Analytics with ClientMethods {
 
   @override
   Future track(String event, {Map<String, dynamic>? properties}) async {
-    await _process(TrackEvent(event, properties: properties ?? {}, 
-    integrations: _state.integrations.state)); // Patch for Github Issue #152
+    await _process(TrackEvent(event, properties: properties ?? {}));
   }
 
   @override
   Future screen(String name, {Map<String, dynamic>? properties}) async {
-    final event = ScreenEvent(name, properties: properties ?? {}, 
-    integrations: _state.integrations.state); // Patch for Github Issue #152
+    final event = ScreenEvent(name, properties: properties ?? {});
 
     await _process(event);
   }
 
   @override
   Future identify({String? userId, UserTraits? userTraits}) async {
-    final event = IdentifyEvent(userId: userId, traits: userTraits, 
-    integrations: _state.integrations.state); // Patch for Github Issue #152
+    final event = IdentifyEvent(userId: userId, traits: userTraits);
 
     await _process(event);
   }
 
   @override
   Future group(String groupId, {GroupTraits? groupTraits}) async {
-    final event = GroupEvent(groupId, traits: groupTraits, 
-    integrations: _state.integrations.state); // Patch for Github Issue #152
+    final event = GroupEvent(groupId, traits: groupTraits);
 
     await _process(event);
   }
@@ -242,8 +238,7 @@ class Analytics with ClientMethods {
   Future alias(String newUserId) async {
     final userInfo = await state.userInfo.state;
     final event =
-        AliasEvent(userInfo.userId ?? userInfo.anonymousId, userId: newUserId, 
-        integrations: _state.integrations.state); // Patch for Github Issue #152
+        AliasEvent(userInfo.userId ?? userInfo.anonymousId, userId: newUserId);
 
     await _process(event);
   }

packages/core/lib/event.dart

@@ -55,7 +55,7 @@ abstract class RawEvent with JSONSerialisable {
   @JsonKey(name: "_metadata")
   DestinationMetadata? metadata;
 
-  RawEvent(this.type, {this.anonymousId, this.userId, this.integrations,}); // Patch for Github Issue #152
+  RawEvent(this.type, {this.anonymousId, this.userId});
 }
 
 @JsonSerializable(explicitToJson: true)
@@ -79,7 +79,7 @@ class TrackEvent extends RawEvent {
   String event;
   Map<String, dynamic>? properties;
 
-  TrackEvent(this.event, {this.properties, Map<String, dynamic>? integrations,}) : super(EventType.track, integrations: integrations,); // Patch for Github Issue #152
+  TrackEvent(this.event, {this.properties}) : super(EventType.track);
 
   factory TrackEvent.fromJson(Map<String, dynamic> json) =>
       _$TrackEventFromJson(json);
@@ -90,8 +90,8 @@ class TrackEvent extends RawEvent {
 @JsonSerializable(explicitToJson: true)
 class IdentifyEvent extends RawEvent {
   UserTraits? traits;
-  IdentifyEvent({this.traits, String? userId, Map<String, dynamic>? integrations})
-      : super(EventType.identify, userId: userId, integrations: integrations); // Patch for Github Issue #152
+  IdentifyEvent({this.traits, String? userId})
+      : super(EventType.identify, userId: userId);
 
   factory IdentifyEvent.fromJson(Map<String, dynamic> json) =>
       _$IdentifyEventFromJson(json);
@@ -105,7 +105,7 @@ class GroupEvent extends RawEvent {
   String groupId;
   GroupTraits? traits;
 
-  GroupEvent(this.groupId, {this.traits, Map<String, dynamic>? integrations}) : super(EventType.group, integrations: integrations); // Patch for Github Issue #152
+  GroupEvent(this.groupId, {this.traits}) : super(EventType.group);
 
   factory GroupEvent.fromJson(Map<String, dynamic> json) =>
       _$GroupEventFromJson(json);
@@ -117,8 +117,8 @@ class GroupEvent extends RawEvent {
 class AliasEvent extends RawEvent {
   String previousId;
 
-  AliasEvent(this.previousId, {String? userId, Map<String, dynamic>? integrations})
-      : super(EventType.alias, userId: userId, integrations: integrations); // Patch for Github Issue #152
+  AliasEvent(this.previousId, {String? userId})
+      : super(EventType.alias, userId: userId);
 
   factory AliasEvent.fromJson(Map<String, dynamic> json) =>
       _$AliasEventFromJson(json);
@@ -134,7 +134,7 @@ class ScreenEvent extends RawEvent {
   ScreenEvent(
     this.name, {
     this.properties,
-    Map<String, dynamic>? integrations}) : super(EventType.screen, integrations: integrations); // Patch for Github Issue #152
+  }) : super(EventType.screen);
 
   factory ScreenEvent.fromJson(Map<String, dynamic> json) =>
       _$ScreenEventFromJson(json);

packages/core/lib/version.dart

@@ -1 +1 @@
-const segmentVersion = "1.1.7";
+const segmentVersion = "1.1.8";

packages/core/pubspec.yaml

@@ -1,6 +1,6 @@
 name: segment_analytics
 description: The hassle-free way to add Segment analytics to your Flutter app.
-version: 1.1.7
+version: 1.1.8
 homepage: https://github.com/segmentio/analytics_flutter#readme
 repository: https://github.com/segmentio/analytics_flutter/tree/main/packages/core#readme
 issue_tracker: https://github.com/segmentio/analytics_flutter/issues