refac: clean up

Author: uerceg

example/pubspec.yaml

@@ -12,6 +12,11 @@ dependencies:
   adjust_sdk:
     path: ../
 
+dependency_overrides:
+  characters: ^1.4.1
+  material_color_utilities: ^0.13.0
+  meta: ^1.17.0
+
 dev_dependencies:
   flutter_test:
     sdk: flutter

lib/adjust_app_store_purchase.dart

@@ -15,12 +15,8 @@ class AdjustAppStorePurchase {
   Map<String, String?> get toMap {
     Map<String, String?> purchaseMap = new Map<String, String?>();
 
-    if (_productId != null) {
-      purchaseMap['productId'] = _productId;
-    }
-    if (_transactionId != null) {
-      purchaseMap['transactionId'] = _transactionId;
-    }
+    purchaseMap['productId'] = _productId;
+    purchaseMap['transactionId'] = _transactionId;
 
     return purchaseMap;
   }

lib/adjust_app_store_subscription.dart

@@ -35,15 +35,9 @@ class AdjustAppStoreSubscription {
   Map<String, String?> get toMap {
     Map<String, String?> subscriptionMap = new Map<String, String?>();
 
-    if (_price != null) {
-      subscriptionMap['price'] = _price;
-    }
-    if (_currency != null) {
-      subscriptionMap['currency'] = _currency;
-    }
-    if (_transactionId != null) {
-      subscriptionMap['transactionId'] = _transactionId;
-    }
+    subscriptionMap['price'] = _price;
+    subscriptionMap['currency'] = _currency;
+    subscriptionMap['transactionId'] = _transactionId;
     if (transactionDate != null) {
       subscriptionMap['transactionDate'] = transactionDate;
     }

lib/adjust_deeplink.dart

@@ -6,8 +6,6 @@
 //  Copyright (c) 2024-Present Adjust GmbH. All rights reserved.
 //
 
-import 'dart:convert';
-
 class AdjustDeeplink {
   String deeplink;
   String? referrer;
@@ -17,9 +15,7 @@ class AdjustDeeplink {
   Map<String, String?> get toMap {
     Map<String, String?> deeplinkMap = new Map<String, String?>();
 
-    if (deeplink != null) {
-      deeplinkMap['deeplink'] = deeplink;
-    }
+    deeplinkMap['deeplink'] = deeplink;
     if (referrer != null) {
       deeplinkMap['referrer'] = referrer;
     }

lib/adjust_play_store_purchase.dart

@@ -15,12 +15,8 @@ class AdjustPlayStorePurchase {
   Map<String, String?> get toMap {
     Map<String, String?> purchaseMap = new Map<String, String?>();
 
-    if (_productId != null) {
-      purchaseMap['productId'] = _productId;
-    }
-    if (_purchaseToken != null) {
-      purchaseMap['purchaseToken'] = _purchaseToken;
-    }
+    purchaseMap['productId'] = _productId;
+    purchaseMap['purchaseToken'] = _purchaseToken;
 
     return purchaseMap;
   }

lib/adjust_play_store_subscription.dart

@@ -41,26 +41,14 @@ class AdjustPlayStoreSubscription {
   }
 
   Map<String, String?> get toMap {
-    Map<String, String?> subscriptionMap = new Map<String, String>();
+    Map<String, String?> subscriptionMap = new Map<String, String?>();
 
-    if (_price != null) {
-      subscriptionMap['price'] = _price;
-    }
-    if (_currency != null) {
-      subscriptionMap['currency'] = _currency;
-    }
-    if (_sku != null) {
-      subscriptionMap['sku'] = _sku;
-    }
-    if (_orderId != null) {
-      subscriptionMap['orderId'] = _orderId;
-    }
-    if (_signature != null) {
-      subscriptionMap['signature'] = _signature;
-    }
-    if (_purchaseToken != null) {
-      subscriptionMap['purchaseToken'] = _purchaseToken;
-    }
+    subscriptionMap['price'] = _price;
+    subscriptionMap['currency'] = _currency;
+    subscriptionMap['sku'] = _sku;
+    subscriptionMap['orderId'] = _orderId;
+    subscriptionMap['signature'] = _signature;
+    subscriptionMap['purchaseToken'] = _purchaseToken;
     if (_billingStore != null) {
       subscriptionMap['billingStore'] = _billingStore;
     }

lib/adjust_purchase_verification_result.dart

@@ -6,8 +6,6 @@
 //  Copyright (c) 2020-Present Adjust GmbH. All rights reserved.
 //
 
-import 'dart:convert';
-
 class AdjustPurchaseVerificationResult {
   final num code;
   final String message;
@@ -35,15 +33,9 @@ class AdjustPurchaseVerificationResult {
   Map<String, String?> get toMap {
     Map<String, String?> verificationInfoMap = new Map<String, String?>();
 
-    if (code != null) {
-      verificationInfoMap['code'] = code.toString();
-    }
-    if (message != null) {
-      verificationInfoMap['message'] = message;
-    }
-    if (verificationStatus != null) {
-      verificationInfoMap['verificationStatus'] = verificationStatus;
-    }
+    verificationInfoMap['code'] = code.toString();
+    verificationInfoMap['message'] = message;
+    verificationInfoMap['verificationStatus'] = verificationStatus;
 
     return verificationInfoMap;
   }

lib/adjust_store_info.dart

@@ -6,8 +6,6 @@
 //  Copyright (c) 2025-Present Adjust GmbH. All rights reserved.
 //
 
-import 'dart:convert';
-
 class AdjustStoreInfo {
   String? storeName;
   String? storeAppId;

pubspec.yaml

@@ -4,7 +4,7 @@ homepage: https://github.com/adjust/flutter_sdk
 version: 5.4.1
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.12.0 <4.0.0"
   flutter: ">=1.10.0"
 
 dependencies:

test/android/src/main/java/com/adjust/test/lib/TestLibPlugin.java

@@ -3,7 +3,7 @@
 //  Adjust SDK
 //
 //  Created by Srdjan Tubin (@2beens) on 1st October 2018.
-//  Copyright (c) 2018-2021 Adjust GmbH. All rights reserved.
+//  Copyright (c) 2018-Present Adjust GmbH. All rights reserved.
 //
 
 package com.adjust.test.lib;