Merge pull request #219 from adjust/v4351

Version 4.35.1

Author: uerceg

CHANGELOG.md

@@ -1,3 +1,12 @@
+### Version 4.35.1 (10th October 2023)
+#### Added
+- Added sending of `event_callback_id` parameter (if set) with the event payload.
+
+#### Native SDKs
+- [[email protected]][ios_sdk_v4.35.2]
+- [[email protected]][android_sdk_v4.35.1]
+---
+
 ### Version 4.35.0 (6th October 2023)
 #### Added
 - Added ability to read App Set ID on Android platform in case you opt in by adding the `com.google.android.gms:play-services-appset` dependency to your Android app.
@@ -579,6 +588,7 @@
 [ios_sdk_v4.32.1]: https://github.com/adjust/ios_sdk/tree/v4.32.1
 [ios_sdk_v4.33.3]: https://github.com/adjust/ios_sdk/tree/v4.33.3
 [ios_sdk_v4.35.1]: https://github.com/adjust/ios_sdk/tree/v4.35.1
+[ios_sdk_v4.35.2]: https://github.com/adjust/ios_sdk/tree/v4.35.2
 
 [android_sdk_v4.10.4]: https://github.com/adjust/android_sdk/tree/v4.10.4
 [android_sdk_v4.11.0]: https://github.com/adjust/android_sdk/tree/v4.11.0
@@ -612,3 +622,4 @@
 [android_sdk_v4.32.0]: https://github.com/adjust/android_sdk/tree/v4.32.0
 [android_sdk_v4.33.2]: https://github.com/adjust/android_sdk/tree/v4.33.2
 [android_sdk_v4.35.0]: https://github.com/adjust/android_sdk/tree/v4.35.0
+[android_sdk_v4.35.1]: https://github.com/adjust/android_sdk/tree/v4.35.1

README.md

@@ -263,7 +263,6 @@ As of v4.22.0, the Adjust SDK supports install tracking on Huawei devices with H
 
 Select your project in the Project Navigator. In the left hand side of the main view, select your target. In the tab `Build Phases`, expand the group `Link Binary with Libraries`. On the bottom of that section click on the `+` button. Select below mentioned frameworks and make sure to change the `Status` of frameworks to `Optional`. Adjust SDK uses these frameworks with following purpose:
 
-* `iAd.framework` - to support Apple Search Ads campaigns
 * `AdServices.framework` - to support Apple Search Ads campaigns
 * `AdSupport.framework` - to read iOS Advertising Id (IDFA) value
 * `StoreKit.framework` - to communicate with `SKAdNetwork` framework

VERSION

@@ -1 +1 @@
-4.35.0
+4.35.1

android/libs/adjust-android.jar

@@ -1,7 +1,7 @@
 PODS:
-  - Adjust (4.35.1):
-    - Adjust/Core (= 4.35.1)
-  - Adjust/Core (4.35.1)
+  - Adjust (4.35.2):
+    - Adjust/Core (= 4.35.2)
+  - Adjust/Core (4.35.2)
   - boost (1.76.0)
   - CocoaAsyncSocket (7.6.5)
   - DoubleConversion (1.1.6)
@@ -287,8 +287,8 @@ PODS:
   - React-jsinspector (0.69.4)
   - React-logger (0.69.4):
     - glog
-  - react-native-adjust (4.35.0):
-    - Adjust (= 4.35.1)
+  - react-native-adjust (4.35.1):
+    - Adjust (= 4.35.2)
     - React-Core
   - React-perflogger (0.69.4)
   - React-RCTActionSheet (0.69.4):
@@ -508,7 +508,7 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  Adjust: 63c56c81b420738f927fbc19e5cf4f34fd39d572
+  Adjust: cac836ba910f868b38d0350045aaf498f794719a
   boost: a7c83b31436843459a1961bfd74b96033dc77234
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
@@ -541,7 +541,7 @@ SPEC CHECKSUMS:
   React-jsiexecutor: a27badbbdbc0ff781813370736a2d1c7261181d4
   React-jsinspector: 8a3d3f5dcd23a91e8c80b1bf0e96902cd1dca999
   React-logger: 1088859f145b8f6dd0d3ed051a647ef0e3e80fad
-  react-native-adjust: 9812c952950dd8dc8eff4f5b42fe1a7d659683c9
+  react-native-adjust: 4bbce119ab6613cfa7b95af94e5802ab492dcf07
   React-perflogger: cb386fd44c97ec7f8199c04c12b22066b0f2e1e0
   React-RCTActionSheet: f803a85e46cf5b4066c2ac5e122447f918e9c6e5
   React-RCTAnimation: 19c80fa950ccce7f4db76a2a7f2cf79baae07fc7

example/ios/Podfile.lock

@@ -1369,9 +1369,11 @@
   integrity sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==
 
 "@types/node@*":
-  version "20.8.2"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.2.tgz#d76fb80d87d0d8abfe334fc6d292e83e5524efc4"
-  integrity sha512-Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w==
+  version "20.8.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.4.tgz#0e9ebb2ff29d5c3302fc84477d066fa7c6b441aa"
+  integrity sha512-ZVPnqU58giiCjSxjVUESDtdPk4QR5WQhhINbc9UBrKLU68MX5BF6kbQzTrkwbolyr0X8ChBpXfavr5mZFKZQ5A==
+  dependencies:
+    undici-types "~5.25.1"
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.2"
@@ -2073,9 +2075,9 @@ camelcase@^6.0.0:
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
 caniuse-lite@^1.0.30001541:
-  version "1.0.30001546"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001546.tgz#10fdad03436cfe3cc632d3af7a99a0fb497407f0"
-  integrity sha512-zvtSJwuQFpewSyRrI3AsftF6rM0X80mZkChIt1spBGEvRglCrjTniXvinc8JKRoqTwXAgvqTImaN9igfSMtUBw==
+  version "1.0.30001547"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001547.tgz#d4f92efc488aab3c7f92c738d3977c2a3180472b"
+  integrity sha512-W7CrtIModMAxobGhz8iXmDfuJiiKg1WADMO/9x7/CLNin5cpSbuBjooyoIUVB5eyCc36QuTVlkVa1iB2S5+/eA==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -2516,9 +2518,9 @@ [email protected]:
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
 electron-to-chromium@^1.4.535:
-  version "1.4.543"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.543.tgz#51116ffc9fba1ee93514d6a40d34676aa6d7d1c4"
-  integrity sha512-t2ZP4AcGE0iKCCQCBx/K2426crYdxD3YU6l0uK2EO3FZH0pbC4pFz/sZm2ruZsND6hQBTcDWWlo/MLpiOdif5g==
+  version "1.4.548"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.548.tgz#e695d769e0e801fa6d438b63f6bc9b80372000d6"
+  integrity sha512-R77KD6mXv37DOyKLN/eW1rGS61N6yHOfapNSX9w+y9DdPG83l9Gkuv7qkCFZ4Ta4JPhrjgQfYbv4Y3TnM1Hi2Q==
 
 emittery@^0.7.1:
   version "0.7.2"
@@ -3090,15 +3092,15 @@ find-up@^5.0.0:
     path-exists "^4.0.0"
 
 flat-cache@^3.0.4:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.1.0.tgz#0e54ab4a1a60fe87e2946b6b00657f1c99e1af3f"
-  integrity sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.1.1.tgz#a02a15fdec25a8f844ff7cc658f03dd99eb4609b"
+  integrity sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==
   dependencies:
-    flatted "^3.2.7"
+    flatted "^3.2.9"
     keyv "^4.5.3"
     rimraf "^3.0.2"
 
-flatted@^3.2.7:
+flatted@^3.2.9:
   version "3.2.9"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf"
   integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==
@@ -4554,9 +4556,9 @@ jsonfile@^4.0.0:
     object.values "^1.1.6"
 
 keyv@^4.5.3:
-  version "4.5.3"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.3.tgz#00873d2b046df737963157bd04f294ca818c9c25"
-  integrity sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
+  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
   dependencies:
     json-buffer "3.0.1"
 
@@ -5766,10 +5768,10 @@ react-is@^17.0.1:
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
 react-native-adjust-oaid@../plugins/oaid:
-  version "4.35.0"
+  version "4.35.1"
 
 react-native-adjust@../temp:
-  version "4.35.0"
+  version "4.35.1"
 
 react-native-codegen@^0.69.1:
   version "0.69.2"
@@ -6885,6 +6887,11 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
+undici-types@~5.25.1:
+  version "5.25.3"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.25.3.tgz#e044115914c85f0bcbb229f346ab739f064998c3"
+  integrity sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA==
+
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"

example/yarn.lock

@@ -132,7 +132,7 @@ Adjust.getAmazonAdId = function(callback) {
 };
 
 Adjust.getSdkVersion = function(callback) {
-    module_adjust.getSdkVersion("react-native4.35.0", callback);
+    module_adjust.getSdkVersion("react-native4.35.1", callback);
 };
 
 Adjust.setReferrer = function(referrer) {
@@ -262,7 +262,7 @@ Adjust.onPause = function(testParam) {
 // AdjustConfig
 
 var AdjustConfig = function(appToken, environment) {
-    this.sdkPrefix = "react-native4.35.0";
+    this.sdkPrefix = "react-native4.35.1";
     this.appToken = appToken;
     this.environment = environment;
     this.logLevel = null;

ext/android/sdk

@@ -15,7 +15,13 @@ @implementation ADJActivityPackage
 
 - (NSString *)extendedString {
     NSMutableString *builder = [NSMutableString string];
-    NSArray *excludedKeys = @[@"secret_id", @"app_secret", @"signature", @"headers_id", @"native_version", @"event_callback_id", @"adj_signing_id"];
+    NSArray *excludedKeys = @[
+        @"secret_id",
+        @"app_secret",
+        @"signature",
+        @"headers_id",
+        @"native_version",
+        @"adj_signing_id"];
 
     [builder appendFormat:@"Path:      %@\n", self.path];
     [builder appendFormat:@"ClientSdk: %@\n", self.clientSdk];

ext/ios/sdk

@@ -55,15 +55,14 @@ - (id)initWithResponseCallback:(id<ADJResponseCallback>)responseCallback
     self.logger = ADJAdjustFactory.logger;
     self.defaultSessionConfiguration = [NSURLSessionConfiguration defaultSessionConfiguration];
 
-    self.exceptionKeys =
-        [NSHashTable hashTableWithOptions:NSHashTableStrongMemory];
-    [self.exceptionKeys addObject:@"event_callback_id"];
+    self.exceptionKeys = [NSHashTable hashTableWithOptions:NSHashTableStrongMemory];
     [self.exceptionKeys addObject:@"secret_id"];
     [self.exceptionKeys addObject:@"signature"];
     [self.exceptionKeys addObject:@"headers_id"];
     [self.exceptionKeys addObject:@"native_version"];
     [self.exceptionKeys addObject:@"algorithm"];
     [self.exceptionKeys addObject:@"app_secret"];
+    [self.exceptionKeys addObject:@"adj_signing_id"];
 
     return self;
 }
@@ -659,6 +658,8 @@ - (void)signWithSigV2Plugin:(ADJActivityPackage *)activityPackage {
         return;
     }
 
+    [activityPackage.parameters removeObjectForKey:@"app_secret"];
+    [activityPackage.parameters removeObjectForKey:@"secret_id"];
     NSMutableDictionary *parameters = activityPackage.parameters;
     const char *activityKindChar = [[ADJActivityKindUtil activityKindToString:activityPackage.activityKind] UTF8String];
     const char *sdkVersionChar = [activityPackage.clientSdk UTF8String];

index.js

@@ -35,7 +35,7 @@
 static NSRegularExpression *shortUniversalLinkRegex = nil;
 static NSRegularExpression *excludedDeeplinkRegex = nil;
 
-static NSString * const kClientSdk                  = @"ios4.35.1";
+static NSString * const kClientSdk                  = @"ios4.35.2";
 static NSString * const kDeeplinkParam              = @"deep_link=";
 static NSString * const kSchemeDelimiter            = @"://";
 static NSString * const kDefaultScheme              = @"AdjustUniversalScheme";

ios/Adjust/ADJActivityPackage.m

@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust SDK
 //
-//  V4.35.1
+//  V4.35.2
 //  Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
 //  Copyright (c) 2012-2021 Adjust GmbH. All rights reserved.
 //

ios/Adjust/ADJRequestHandler.m

@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust SDK
 //
-//  V4.35.1
+//  V4.35.2
 //  Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
 //  Copyright (c) 2012-2021 Adjust GmbH. All rights reserved.
 //

ios/Adjust/ADJUtil.m

@@ -1,7 +1,7 @@
 {
     "name": "react-native-adjust",
     "description": "Adjust React Native SDK",
-    "version": "4.35.0",
+    "version": "4.35.1",
     "main": "index.js",
     "author": "Adjust",
     "license": "MIT",

ios/Adjust/Adjust.h

@@ -1,7 +1,7 @@
 {
     "name": "react-native-adjust-oaid",
     "description": "Adjust React Native OAID plugin",
-    "version": "4.35.0",
+    "version": "4.35.1",
     "main": "index.js",
     "author": "Adjust",
     "license": "MIT",

ios/Adjust/include/Adjust.h

@@ -18,6 +18,6 @@ Pod::Spec.new do |s|
   s.preserve_paths = 'LICENSE', 'README.md', 'package.json', 'index.js'
   s.source_files   = 'ios/*.{h,m}'
 
-  s.dependency 'Adjust', '4.35.1'
+  s.dependency 'Adjust', '4.35.2'
   s.dependency 'React-Core'
 end

package.json

@@ -50,7 +50,7 @@ const App: () => React$Node = () => {
   var baseUrl = "";
   var gdprUrl = "";
   var subscriptionUrl = "";
-  var ipAddress = "192.168.86.40";
+  var ipAddress = "192.168.8.39";
   if (Platform.OS === "android") {
     baseUrl = "https://" + ipAddress + ":8443";
     gdprUrl = "https://" + ipAddress + ":8443";

plugins/oaid/android/libs/adjust-android-oaid.jar

@@ -15,7 +15,6 @@
 		7699B88040F8A987B510C191 /* libPods-AdjustTest-AdjustTestTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-AdjustTest-AdjustTestTests.a */; };
 		81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
 		9D325AEC28A3CD1C000883A2 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D325AEB28A3CD1C000883A2 /* AdSupport.framework */; };
-		9D325AEE28A3CD20000883A2 /* iAd.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D325AED28A3CD20000883A2 /* iAd.framework */; };
 		9D325AF028A3CD24000883A2 /* AdServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D325AEF28A3CD24000883A2 /* AdServices.framework */; };
 		9D325AF228A3CD51000883A2 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D325AF128A3CD51000883A2 /* StoreKit.framework */; };
 		9D325AF428A3CD57000883A2 /* AppTrackingTransparency.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D325AF328A3CD57000883A2 /* AppTrackingTransparency.framework */; };
@@ -69,7 +68,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9D325AEE28A3CD20000883A2 /* iAd.framework in Frameworks */,
 				9D325AF028A3CD24000883A2 /* AdServices.framework in Frameworks */,
 				9D325AF228A3CD51000883A2 /* StoreKit.framework in Frameworks */,
 				9D325AF428A3CD57000883A2 /* AppTrackingTransparency.framework in Frameworks */,

plugins/oaid/package.json

@@ -1,7 +1,7 @@
 PODS:
-  - Adjust (4.35.1):
-    - Adjust/Core (= 4.35.1)
-  - Adjust/Core (4.35.1)
+  - Adjust (4.35.2):
+    - Adjust/Core (= 4.35.2)
+  - Adjust/Core (4.35.2)
   - boost (1.76.0)
   - CocoaAsyncSocket (7.6.5)
   - DoubleConversion (1.1.6)
@@ -287,10 +287,10 @@ PODS:
   - React-jsinspector (0.69.4)
   - React-logger (0.69.4):
     - glog
-  - react-native-adjust (4.35.0):
-    - Adjust (= 4.35.1)
+  - react-native-adjust (4.35.1):
+    - Adjust (= 4.35.2)
     - React-Core
-  - react-native-adjust-test (4.35.0):
+  - react-native-adjust-test (4.35.1):
     - React
   - React-perflogger (0.69.4)
   - React-RCTActionSheet (0.69.4):
@@ -513,7 +513,7 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  Adjust: 63c56c81b420738f927fbc19e5cf4f34fd39d572
+  Adjust: cac836ba910f868b38d0350045aaf498f794719a
   boost: a7c83b31436843459a1961bfd74b96033dc77234
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
@@ -546,8 +546,8 @@ SPEC CHECKSUMS:
   React-jsiexecutor: a27badbbdbc0ff781813370736a2d1c7261181d4
   React-jsinspector: 8a3d3f5dcd23a91e8c80b1bf0e96902cd1dca999
   React-logger: 1088859f145b8f6dd0d3ed051a647ef0e3e80fad
-  react-native-adjust: 9812c952950dd8dc8eff4f5b42fe1a7d659683c9
-  react-native-adjust-test: 1a06f4606ae0851b3c4447f9f70852439bbd9b4f
+  react-native-adjust: 4bbce119ab6613cfa7b95af94e5802ab492dcf07
+  react-native-adjust-test: 8f3246c8cd11c1d95fdd07c7b6a940f32b0f4aef
   React-perflogger: cb386fd44c97ec7f8199c04c12b22066b0f2e1e0
   React-RCTActionSheet: f803a85e46cf5b4066c2ac5e122447f918e9c6e5
   React-RCTAnimation: 19c80fa950ccce7f4db76a2a7f2cf79baae07fc7