Skip to content

Commit 2bfc042

Browse files
al-afal-af
authored
Merge pull request #546 from AppsFlyerSDK/releases/6.x.x/6.14.x/6.14.3-rc2
Releases/6.x.x/6.14.x/6.14.3 rc2
2 parents 575ed93 + f7a6026 commit 2bfc042

File tree

14 files changed

+53
-68
lines changed

14 files changed

+53
-68
lines changed

‎.github/workflows/pre-release-workflow.yml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,9 @@ jobs:
5050
git push origin HEAD:${{ env.GIT_BRANCH_RELEASE }} --force
5151
5252
- name: Update README.md
53-
env:
54-
JIRA_TOKEN: ${{ secrets.CI_JIRA_TOKEN }}
55-
JIRA_FIXED_VERSION: "React Native SDK v${{env.PLUGIN_VERSION}}"
5653
run: |
57-
ios_sdk_version=$(cat react-native-appsflyer.podspec | grep '\'AppsFlyerFramework\' | grep -Eo '[0-9].[0-9]+.[0-9]+')
58-
android_sdk_version=$(cat android/build.gradle | grep 'com.appsflyer:af-android-sdk' | grep -Eo '[0-9].[0-9]+.[0-9]+')
59-
sed -i -e -r "s/Android AppsFlyer SDK \*\*v[0-9].[0-9]+.[0-9]+\*\*/Android AppsFlyer SDK \*\*v$android_sdk_version\*\*/g" README.md
60-
sed -i -e -r "s/iOS AppsFlyer SDK \*\*v[0-9].[0-9]+.[0-9]+\*\*/iOS AppsFlyer SDK \*\*v$ios_sdk_version\*\*/g" README.md
54+
chmod +x .github/workflows/scripts/updateReadme.sh
55+
.github/workflows/scripts/updateReadme.sh
6156
git add README.md
6257
git commit -m "Update README.md"
6358
git push origin HEAD:${{ env.GIT_BRANCH_RELEASE }} --force

‎.github/workflows/scripts/updateReadme.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
3+
ios_sdk_version=$(cat react-native-appsflyer.podspec | grep '\'AppsFlyerFramework\' | grep -Eo '[0-9].[0-9]+.[0-9]+')
4+
android_sdk_version=$(cat android/build.gradle | grep 'com.appsflyer:af-android-sdk' | grep -Eo '[0-9].[0-9]+.[0-9]+')
5+
sed -i -e -r "s/Android AppsFlyer SDK \*\*v[0-9].[0-9]+.[0-9]+\*\*/Android AppsFlyer SDK \*\*v$android_sdk_version\*\*/g" README.md
6+
sed -i -e -r "s/iOS AppsFlyer SDK \*\*v[0-9].[0-9]+.[0-9]+\*\*/iOS AppsFlyer SDK \*\*v$ios_sdk_version\*\*/g" README.md

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## 6.14.3
2+
Release date: *2024-04-28*
3+
4+
- Add privacy manifest
5+
- Update Android to 6.14.0
6+
- Update iOS to 6.14.3
7+
18
## 6.13.1
29
Release date: *2024-03-07*
310

‎android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,5 @@ repositories {
5454
dependencies {
5555
implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
5656
implementation "com.android.installreferrer:installreferrer:${safeExtGet('installReferrerVersion', '2.1')}"
57-
api "com.appsflyer:af-android-sdk:${safeExtGet('appsflyerVersion', '6.13.0')}"
57+
api "com.appsflyer:af-android-sdk:${safeExtGet('appsflyerVersion', '6.14.0')}"
5858
}

‎android/src/main/java/com/appsflyer/reactnative/RNAppsFlyerConstants.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
public class RNAppsFlyerConstants {
88

9-
final static String PLUGIN_VERSION = "6.13.1";
9+
final static String PLUGIN_VERSION = "6.14.3";
1010
final static String NO_DEVKEY_FOUND = "No 'devKey' found or its empty";
1111
final static String UNKNOWN_ERROR = "AF Unknown Error";
1212
final static String SUCCESS = "Success";

‎demos/appsflyer-react-native-app/android/app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:tools="http://schemas.android.com/tools"
23
package="com.appsflyerexample">
34

45
<uses-permission android:name="android.permission.INTERNET" />
56

67
<application
8+
tools:replace="android:allowBackup"
79
android:name=".MainApplication"
810
android:label="@string/app_name"
911
android:icon="@mipmap/ic_launcher"

‎demos/appsflyer-react-native-app/ios/AppsFlyerExample.xcodeproj/project.pbxproj‎

Lines changed: 25 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@
161161
00E356EA1AD99517003FC87E /* Sources */,
162162
00E356EB1AD99517003FC87E /* Frameworks */,
163163
00E356EC1AD99517003FC87E /* Resources */,
164-
DD92D4E1DC11D43282C4BA39 /* [CP] Embed Pods Frameworks */,
165164
886093803E0B787FACAB784A /* [CP] Copy Pods Resources */,
166165
);
167166
buildRules = (
@@ -184,7 +183,6 @@
184183
13B07F8C1A680F5B00A75B9A /* Frameworks */,
185184
13B07F8E1A680F5B00A75B9A /* Resources */,
186185
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
187-
0FAC7F8580BA729A79BD766B /* [CP] Embed Pods Frameworks */,
188186
4721923C614EE6D1A58C11F1 /* [CP] Copy Pods Resources */,
189187
);
190188
buildRules = (
@@ -202,7 +200,8 @@
202200
83CBB9F71A601CBA00E9B192 /* Project object */ = {
203201
isa = PBXProject;
204202
attributes = {
205-
LastUpgradeCheck = 1210;
203+
BuildIndependentTargetsInParallel = YES;
204+
LastUpgradeCheck = 1530;
206205
TargetAttributes = {
207206
00E356ED1AD99517003FC87E = {
208207
CreatedOnToolsVersion = 6.2;
@@ -254,34 +253,17 @@
254253
/* Begin PBXShellScriptBuildPhase section */
255254
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */ = {
256255
isa = PBXShellScriptBuildPhase;
257-
buildActionMask = 2147483647;
256+
buildActionMask = 8;
258257
files = (
259258
);
260259
inputPaths = (
261260
);
262261
name = "Bundle React Native code and images";
263262
outputPaths = (
264263
);
265-
runOnlyForDeploymentPostprocessing = 0;
266-
shellPath = /bin/sh;
267-
shellScript = "set -e\n\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
268-
};
269-
0FAC7F8580BA729A79BD766B /* [CP] Embed Pods Frameworks */ = {
270-
isa = PBXShellScriptBuildPhase;
271-
buildActionMask = 2147483647;
272-
files = (
273-
);
274-
inputFileListPaths = (
275-
"${PODS_ROOT}/Target Support Files/Pods-AppsFlyerExample/Pods-AppsFlyerExample-frameworks-${CONFIGURATION}-input-files.xcfilelist",
276-
);
277-
name = "[CP] Embed Pods Frameworks";
278-
outputFileListPaths = (
279-
"${PODS_ROOT}/Target Support Files/Pods-AppsFlyerExample/Pods-AppsFlyerExample-frameworks-${CONFIGURATION}-output-files.xcfilelist",
280-
);
281-
runOnlyForDeploymentPostprocessing = 0;
264+
runOnlyForDeploymentPostprocessing = 1;
282265
shellPath = /bin/sh;
283-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-AppsFlyerExample/Pods-AppsFlyerExample-frameworks.sh\"\n";
284-
showEnvVarsInLog = 0;
266+
shellScript = "set -e\n\nexport NODE_BINARY=/Users/amit.levy/.nvm/versions/node/v21.7.3/bin/node\n";
285267
};
286268
4721923C614EE6D1A58C11F1 /* [CP] Copy Pods Resources */ = {
287269
isa = PBXShellScriptBuildPhase;
@@ -361,23 +343,6 @@
361343
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
362344
showEnvVarsInLog = 0;
363345
};
364-
DD92D4E1DC11D43282C4BA39 /* [CP] Embed Pods Frameworks */ = {
365-
isa = PBXShellScriptBuildPhase;
366-
buildActionMask = 2147483647;
367-
files = (
368-
);
369-
inputFileListPaths = (
370-
"${PODS_ROOT}/Target Support Files/Pods-AppsFlyerExample-AppsFlyerExampleTests/Pods-AppsFlyerExample-AppsFlyerExampleTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
371-
);
372-
name = "[CP] Embed Pods Frameworks";
373-
outputFileListPaths = (
374-
"${PODS_ROOT}/Target Support Files/Pods-AppsFlyerExample-AppsFlyerExampleTests/Pods-AppsFlyerExample-AppsFlyerExampleTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
375-
);
376-
runOnlyForDeploymentPostprocessing = 0;
377-
shellPath = /bin/sh;
378-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-AppsFlyerExample-AppsFlyerExampleTests/Pods-AppsFlyerExample-AppsFlyerExampleTests-frameworks.sh\"\n";
379-
showEnvVarsInLog = 0;
380-
};
381346
FD10A7F022414F080027D42C /* Start Packager */ = {
382347
isa = PBXShellScriptBuildPhase;
383348
buildActionMask = 2147483647;
@@ -433,12 +398,13 @@
433398
baseConfigurationReference = C6E030350442BE719CA4C6F7 /* Pods-AppsFlyerExample-AppsFlyerExampleTests.debug.xcconfig */;
434399
buildSettings = {
435400
BUNDLE_LOADER = "$(TEST_HOST)";
401+
ENABLE_USER_SCRIPT_SANDBOXING = NO;
436402
GCC_PREPROCESSOR_DEFINITIONS = (
437403
"DEBUG=1",
438404
"$(inherited)",
439405
);
440406
INFOPLIST_FILE = AppsFlyerExampleTests/Info.plist;
441-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
407+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
442408
LD_RUNPATH_SEARCH_PATHS = (
443409
"$(inherited)",
444410
"@executable_path/Frameworks",
@@ -461,8 +427,9 @@
461427
buildSettings = {
462428
BUNDLE_LOADER = "$(TEST_HOST)";
463429
COPY_PHASE_STRIP = NO;
430+
ENABLE_USER_SCRIPT_SANDBOXING = NO;
464431
INFOPLIST_FILE = AppsFlyerExampleTests/Info.plist;
465-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
432+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
466433
LD_RUNPATH_SEARCH_PATHS = (
467434
"$(inherited)",
468435
"@executable_path/Frameworks",
@@ -489,7 +456,9 @@
489456
CURRENT_PROJECT_VERSION = 1;
490457
DEVELOPMENT_TEAM = 6UQAD4B3U2;
491458
ENABLE_BITCODE = NO;
459+
ENABLE_USER_SCRIPT_SANDBOXING = NO;
492460
INFOPLIST_FILE = AppsFlyerExample/Info.plist;
461+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
493462
LD_RUNPATH_SEARCH_PATHS = (
494463
"$(inherited)",
495464
"@executable_path/Frameworks",
@@ -516,7 +485,9 @@
516485
CODE_SIGN_ENTITLEMENTS = AppsFlyerExample/AppsFlyerExample.entitlements;
517486
CURRENT_PROJECT_VERSION = 1;
518487
DEVELOPMENT_TEAM = 6UQAD4B3U2;
488+
ENABLE_USER_SCRIPT_SANDBOXING = NO;
519489
INFOPLIST_FILE = AppsFlyerExample/Info.plist;
490+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
520491
LD_RUNPATH_SEARCH_PATHS = (
521492
"$(inherited)",
522493
"@executable_path/Frameworks",
@@ -538,7 +509,7 @@
538509
buildSettings = {
539510
ALWAYS_SEARCH_USER_PATHS = NO;
540511
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
541-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
512+
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
542513
CLANG_CXX_LIBRARY = "libc++";
543514
CLANG_ENABLE_MODULES = YES;
544515
CLANG_ENABLE_OBJC_ARC = YES;
@@ -566,7 +537,8 @@
566537
COPY_PHASE_STRIP = NO;
567538
ENABLE_STRICT_OBJC_MSGSEND = YES;
568539
ENABLE_TESTABILITY = YES;
569-
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
540+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
541+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
570542
GCC_C_LANGUAGE_STANDARD = gnu99;
571543
GCC_DYNAMIC_NO_PIC = NO;
572544
GCC_NO_COMMON_BLOCKS = YES;
@@ -582,18 +554,19 @@
582554
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
583555
GCC_WARN_UNUSED_FUNCTION = YES;
584556
GCC_WARN_UNUSED_VARIABLE = YES;
585-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
557+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
586558
LD_RUNPATH_SEARCH_PATHS = (
587559
/usr/lib/swift,
588560
"$(inherited)",
589561
);
590562
LIBRARY_SEARCH_PATHS = (
563+
"$(SDKROOT)/usr/lib/swift",
591564
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
592-
"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
593565
"\"$(inherited)\"",
594566
);
595567
MTL_ENABLE_DEBUG_INFO = YES;
596568
ONLY_ACTIVE_ARCH = YES;
569+
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
597570
SDKROOT = iphoneos;
598571
};
599572
name = Debug;
@@ -603,7 +576,7 @@
603576
buildSettings = {
604577
ALWAYS_SEARCH_USER_PATHS = NO;
605578
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
606-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
579+
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
607580
CLANG_CXX_LIBRARY = "libc++";
608581
CLANG_ENABLE_MODULES = YES;
609582
CLANG_ENABLE_OBJC_ARC = YES;
@@ -631,7 +604,8 @@
631604
COPY_PHASE_STRIP = YES;
632605
ENABLE_NS_ASSERTIONS = NO;
633606
ENABLE_STRICT_OBJC_MSGSEND = YES;
634-
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
607+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
608+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
635609
GCC_C_LANGUAGE_STANDARD = gnu99;
636610
GCC_NO_COMMON_BLOCKS = YES;
637611
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -640,17 +614,18 @@
640614
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
641615
GCC_WARN_UNUSED_FUNCTION = YES;
642616
GCC_WARN_UNUSED_VARIABLE = YES;
643-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
617+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
644618
LD_RUNPATH_SEARCH_PATHS = (
645619
/usr/lib/swift,
646620
"$(inherited)",
647621
);
648622
LIBRARY_SEARCH_PATHS = (
623+
"$(SDKROOT)/usr/lib/swift",
649624
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
650-
"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
651625
"\"$(inherited)\"",
652626
);
653627
MTL_ENABLE_DEBUG_INFO = NO;
628+
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
654629
SDKROOT = iphoneos;
655630
VALIDATE_PRODUCT = YES;
656631
};

‎demos/appsflyer-react-native-app/ios/AppsFlyerExample.xcodeproj/xcshareddata/xcschemes/AppsFlyerExample.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1210"
3+
LastUpgradeVersion = "1530"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎demos/appsflyer-react-native-app/ios/AppsFlyerExample/AppDelegate.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ - (void)applicationDidBecomeActive:(UIApplication *)application {
6262
- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
6363
{
6464
#if DEBUG
65-
return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
65+
return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
6666
#else
6767
return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
6868
#endif

‎demos/appsflyer-react-native-app/ios/Podfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require_relative '../node_modules/react-native/scripts/react_native_pods'
22
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
33

4-
platform :ios, '11.0'
4+
platform :ios, '13.0'
55

66
target 'AppsFlyerExample' do
77
config = use_native_modules!
@@ -21,7 +21,7 @@ target 'AppsFlyerExample' do
2121
#
2222
# Note that if you have use_frameworks! enabled, Flipper will not work and
2323
# you should disable the next line.
24-
use_flipper!()
24+
# use_flipper!()
2525

2626
post_install do |installer|
2727
react_native_post_install(installer)

0 commit comments

Comments
 (0)