Skip to content

Commit 46ed3bd

Browse files
1abhishekpandey1abhishekpandey
authored
Merge branch 'master' into dependabot/github_actions/slackapi/slack-github-action-1.24.0
2 parents eb80c3e + c8f371b commit 46ed3bd

12 files changed

Lines changed: 122 additions & 72 deletions

File tree

‎.github/workflows/draft-new-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,4 @@ jobs:
8686
github_token: ${{ secrets.PAT }}
8787
pr_title: "chore(release): pulling ${{ steps.create-release.outputs.branch_name }} into master"
8888
pr_body: ":crown: *An automated PR*\n\n${{ steps.finish-release.outputs.commit_summary }}"
89-
pr_reviewer: 'pallabmaiti'
89+
pr_reviewer: '@rudderlabs/sdk-ios'

‎.github/workflows/manage-github-issue-for-outdated-pods.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
outdated-pod-names: "FBSDKCoreKit"
2020
directory: "Example"
2121
title: "fix: update Facebook SDK to the latest version"
22-
assignee: "desusai7"
22+
assignee: "@rudderlabs/sdk-ios"
2323
labels: "outdatedPod"
2424
color: "FBCA04"
2525
env:

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## 2.2.0 (2024-06-25)
6+
7+
8+
### Features
9+
10+
* update Facebook sdk to latest v17.0.0 ([#33](https://github.com/rudderlabs/rudder-integration-facebook-ios/issues/33)) ([02e2efc](https://github.com/rudderlabs/rudder-integration-facebook-ios/commit/02e2efccf95c885281f827b5bc6cb8e6e715c7ae))
11+
512
## [2.1.0](https://github.com/rudderlabs/rudder-integration-facebook-ios/compare/v2.0.0...v2.1.0) (2023-05-10)
613

714

‎CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @pallabmaiti @itsdebs
1+
* @rudderlabs/sdk-ios

‎Example/Podfile.lock‎

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
11
PODS:
2-
- FBAEMKit (16.0.1):
3-
- FBSDKCoreKit_Basics (= 16.0.1)
4-
- FBSDKCoreKit (16.0.1):
5-
- FBAEMKit (= 16.0.1)
6-
- FBSDKCoreKit_Basics (= 16.0.1)
7-
- FBSDKCoreKit_Basics (16.0.1)
2+
- FBAEMKit (17.0.2):
3+
- FBSDKCoreKit_Basics (= 17.0.2)
4+
- FBSDKCoreKit (17.0.2):
5+
- FBAEMKit (= 17.0.2)
6+
- FBSDKCoreKit_Basics (= 17.0.2)
7+
- FBSDKCoreKit_Basics (17.0.2)
88
- FBSnapshotTestCase (2.1.4):
99
- FBSnapshotTestCase/SwiftSupport (= 2.1.4)
1010
- FBSnapshotTestCase/Core (2.1.4)
1111
- FBSnapshotTestCase/SwiftSupport (2.1.4):
1212
- FBSnapshotTestCase/Core
13-
- Rudder (1.14.0)
13+
- MetricsReporter (1.2.1):
14+
- RSCrashReporter (= 1.0.1)
15+
- RudderKit (= 1.4.0)
16+
- RSCrashReporter (1.0.1)
17+
- Rudder (1.27.0):
18+
- MetricsReporter (= 1.2.1)
1419
- Rudder-Facebook (2.1.0):
15-
- FBSDKCoreKit (~> 16.0.1)
20+
- FBSDKCoreKit (~> 17.0.2)
1621
- Rudder (~> 1.12)
22+
- RudderKit (1.4.0)
1723

1824
DEPENDENCIES:
1925
- FBSnapshotTestCase
@@ -25,20 +31,26 @@ SPEC REPOS:
2531
- FBSDKCoreKit
2632
- FBSDKCoreKit_Basics
2733
- FBSnapshotTestCase
34+
- MetricsReporter
35+
- RSCrashReporter
2836
- Rudder
37+
- RudderKit
2938

3039
EXTERNAL SOURCES:
3140
Rudder-Facebook:
3241
:path: "../"
3342

3443
SPEC CHECKSUMS:
35-
FBAEMKit: daac7466b918752f020345be5c7d9787f98cfc07
36-
FBSDKCoreKit: 2cb033464b2134af0138f87d20b859eb3f9be359
37-
FBSDKCoreKit_Basics: d37280da2e65872f0e931d15f45d97ea324fec37
44+
FBAEMKit: 619f96ea65427e8afca240d5b0f4703738dfdf5c
45+
FBSDKCoreKit: a5f384db2e9ee84e98494fed8f983d2bd79accff
46+
FBSDKCoreKit_Basics: d35c775aaf243a2d731dfae7be3a74b1987285ab
3847
FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
39-
Rudder: 41523d90e7f8040605ca6a803f662a538144c90f
40-
Rudder-Facebook: 0f1d705d7d35a2ea9fe50a279972c2c41bb9bd52
48+
MetricsReporter: 99596ee5003c69949ed2f50acc34aee83c42f843
49+
RSCrashReporter: 6b8376ac729b0289ebe0908553e5f56d8171f313
50+
Rudder: 3cfcd9e6c5359cd6d49f411101ed9b894e3b64bd
51+
Rudder-Facebook: a16ee7b2052a92a19865a31698ab77a6a1706c04
52+
RudderKit: f272f9872183946452ac94cd7bb2244a71e6ca8f
4153

4254
PODFILE CHECKSUM: 7bc5675f1c4b3d6df991eedd0fb3fdaaac414a26
4355

44-
COCOAPODS: 1.12.0
56+
COCOAPODS: 1.15.2

‎Example/Rudder-Facebook.xcodeproj/project.pbxproj‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@
273273
ORGANIZATIONNAME = arnab;
274274
TargetAttributes = {
275275
6003F589195388D20070C39A = {
276-
DevelopmentTeam = GTGKNDBD23;
276+
DevelopmentTeam = UCL2K3J73M;
277277
LastSwiftMigration = 1430;
278278
};
279279
6003F5AD195388D20070C39A = {
@@ -354,16 +354,22 @@
354354
);
355355
inputPaths = (
356356
"${PODS_ROOT}/Target Support Files/Pods-Rudder-Facebook_Example/Pods-Rudder-Facebook_Example-frameworks.sh",
357+
"${BUILT_PRODUCTS_DIR}/MetricsReporter/MetricsReporter.framework",
358+
"${BUILT_PRODUCTS_DIR}/RSCrashReporter/RSCrashReporter.framework",
357359
"${BUILT_PRODUCTS_DIR}/Rudder/Rudder.framework",
358360
"${BUILT_PRODUCTS_DIR}/Rudder-Facebook/Rudder_Facebook.framework",
361+
"${BUILT_PRODUCTS_DIR}/RudderKit/RudderKit.framework",
359362
"${PODS_XCFRAMEWORKS_BUILD_DIR}/FBAEMKit/FBAEMKit.framework/FBAEMKit",
360363
"${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKCoreKit/FBSDKCoreKit.framework/FBSDKCoreKit",
361364
"${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKCoreKit_Basics/FBSDKCoreKit_Basics.framework/FBSDKCoreKit_Basics",
362365
);
363366
name = "[CP] Embed Pods Frameworks";
364367
outputPaths = (
368+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MetricsReporter.framework",
369+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RSCrashReporter.framework",
365370
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Rudder.framework",
366371
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Rudder_Facebook.framework",
372+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RudderKit.framework",
367373
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBAEMKit.framework",
368374
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKCoreKit.framework",
369375
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKCoreKit_Basics.framework",
@@ -506,7 +512,7 @@
506512
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
507513
GCC_WARN_UNUSED_FUNCTION = YES;
508514
GCC_WARN_UNUSED_VARIABLE = YES;
509-
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
515+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
510516
ONLY_ACTIVE_ARCH = YES;
511517
SDKROOT = iphoneos;
512518
TARGETED_DEVICE_FAMILY = "1,2";
@@ -539,7 +545,7 @@
539545
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
540546
GCC_WARN_UNUSED_FUNCTION = YES;
541547
GCC_WARN_UNUSED_VARIABLE = YES;
542-
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
548+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
543549
SDKROOT = iphoneos;
544550
TARGETED_DEVICE_FAMILY = "1,2";
545551
VALIDATE_PRODUCT = YES;
@@ -552,12 +558,12 @@
552558
buildSettings = {
553559
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
554560
CLANG_ENABLE_MODULES = YES;
555-
DEVELOPMENT_TEAM = GTGKNDBD23;
561+
DEVELOPMENT_TEAM = UCL2K3J73M;
556562
GCC_PRECOMPILE_PREFIX_HEADER = YES;
557563
GCC_PREFIX_HEADER = "Rudder-Facebook/Rudder-Facebook-Prefix.pch";
558564
INFOPLIST_FILE = "Rudder-Facebook/Rudder-Facebook-Info.plist";
559565
MODULE_NAME = ExampleApp;
560-
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}";
566+
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.demo.rudderfacebook;
561567
PRODUCT_NAME = "$(TARGET_NAME)";
562568
SWIFT_OBJC_BRIDGING_HEADER = "Rudder-Facebook/Rudder-Facebook_Example-Bridging-Header.h";
563569
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -572,12 +578,12 @@
572578
buildSettings = {
573579
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
574580
CLANG_ENABLE_MODULES = YES;
575-
DEVELOPMENT_TEAM = GTGKNDBD23;
581+
DEVELOPMENT_TEAM = UCL2K3J73M;
576582
GCC_PRECOMPILE_PREFIX_HEADER = YES;
577583
GCC_PREFIX_HEADER = "Rudder-Facebook/Rudder-Facebook-Prefix.pch";
578584
INFOPLIST_FILE = "Rudder-Facebook/Rudder-Facebook-Info.plist";
579585
MODULE_NAME = ExampleApp;
580-
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}";
586+
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.demo.rudderfacebook;
581587
PRODUCT_NAME = "$(TARGET_NAME)";
582588
SWIFT_OBJC_BRIDGING_HEADER = "Rudder-Facebook/Rudder-Facebook_Example-Bridging-Header.h";
583589
SWIFT_VERSION = 4.0;

‎Example/Rudder-Facebook/Rudder-Facebook-Info.plist‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,29 @@
2020
<string>1.0</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
23+
<key>CFBundleURLTypes</key>
24+
<array>
25+
<dict>
26+
<key>CFBundleTypeRole</key>
27+
<string>Editor</string>
28+
<key>CFBundleURLSchemes</key>
29+
<array>
30+
<string>fbAppID</string>
31+
</array>
32+
</dict>
33+
</array>
2334
<key>CFBundleVersion</key>
2435
<string>1.0</string>
36+
<key>FacebookAppID</key>
37+
<string>AppID</string>
38+
<key>FacebookClientToken</key>
39+
<string>Client Token</string>
40+
<key>FacebookDisplayName</key>
41+
<string>Display Name</string>
2542
<key>LSRequiresIPhoneOS</key>
2643
<true/>
44+
<key>NSUserTrackingUsageDescription</key>
45+
<string>Select allow to send event to Facebook App Events</string>
2746
<key>UILaunchStoryboardName</key>
2847
<string>LaunchScreen</string>
2948
<key>UIMainStoryboardFile</key>
@@ -45,22 +64,5 @@
4564
<string>UIInterfaceOrientationLandscapeLeft</string>
4665
<string>UIInterfaceOrientationLandscapeRight</string>
4766
</array>
48-
<key>CFBundleURLTypes</key>
49-
<array>
50-
<dict>
51-
<key>CFBundleURLSchemes</key>
52-
<array>
53-
<string>fbAPPID</string>
54-
</array>
55-
</dict>
56-
</array>
57-
<key>FacebookAppID</key>
58-
<string>APPID</string>
59-
<key>FacebookClientToken</key>
60-
<string>CLIENTOKEN</string>
61-
<key>FacebookDisplayName</key>
62-
<string>DISPLAYNAME</string>
63-
<key>NSUserTrackingUsageDescription</key>
64-
<string>Select allow to send event to Facebook App Events</string>
6567
</dict>
6668
</plist>

‎Example/Rudder-Facebook/SampleRudderConfig.plist‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
<plist version="1.0">
44
<dict>
55
<key>WRITE_KEY</key>
6-
<string>35PI7HEmgbRe1R0lEYqeh3</string>
6+
<string></string>
77
<key>PROD_DATA_PLANE_URL</key>
8-
<string>https://rudderstac.dataplane.rudderstack.com</string>
8+
<string></string>
99
<key>PROD_CONTROL_PLANE_URL</key>
10-
<string>https://api.rudderlabs.com</string>
10+
<string></string>
1111
<key>LOCAL_DATA_PLANE_URL</key>
12-
<string>https://521b-2405-201-8000-614f-54d9-9a90-4bbb-8143.in.ngrok.io</string>
12+
<string></string>
1313
<key>LOCAL_CONTROL_PLANE_URL</key>
14-
<string>https://c7a9-2405-201-8000-614f-54d9-9a90-4bbb-8143.in.ngrok.io</string>
14+
<string></string>
1515
<key>DEV_DATA_PLANE_URL</key>
16-
<string>https://bec3-2405-201-8000-614f-54d9-9a90-4bbb-8143.in.ngrok.io</string>
16+
<string></string>
1717
<key>DEV_CONTROL_PLANE_URL</key>
18-
<string>https://9a50-2405-201-8000-614f-54d9-9a90-4bbb-8143.in.ngrok.io</string>
18+
<string></string>
1919
</dict>
2020
</plist>

‎LICENSE‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎LICENSE.md‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
### Elastic License 2.0 (ELv2) ###
2+
3+
## Acceptance ##
4+
By using the software, you agree to all of the terms and conditions below.
5+
6+
## Copyright License ##
7+
The licensor grants you a non-exclusive, royalty-free, worldwide, non-sublicensable, non-transferable license to use, copy, distribute, make available, and prepare derivative works of the software, in each case subject to the limitations and conditions below
8+
9+
## Limitations ##
10+
You may not provide the software to third parties as a hosted or managed service, where the service provides users with access to any substantial set of the features or functionality of the software.
11+
12+
You may not move, change, disable, or circumvent the license key functionality in the software, and you may not remove or obscure any functionality in the software that is protected by the license key.
13+
14+
You may not alter, remove, or obscure any licensing, copyright, or other notices of the licensor in the software. Any use of the licensor’s trademarks is subject to applicable law.
15+
16+
## Patents ##
17+
The licensor grants you a license, under any patent claims the licensor can license, or becomes able to license, to make, have made, use, sell, offer for sale, import and have imported the software, in each case subject to the limitations and conditions in this license. This license does not cover any patent claims that you cause to be infringed by modifications or additions to the software. If you or your company make any written claim that the software infringes or contributes to infringement of any patent, your patent license for the software granted under these terms ends immediately. If your company makes such a claim, your patent license ends immediately for work on behalf of your company.
18+
19+
## Notices ##
20+
You must ensure that anyone who gets a copy of any part of the software from you also gets a copy of these terms.
21+
22+
If you modify the software, you must include in any modified copies of the software prominent notices stating that you have modified the software.
23+
24+
## No Other Rights ##
25+
These terms do not imply any licenses other than those expressly granted in these terms.
26+
27+
## Termination ##
28+
If you use the software in violation of these terms, such use is not licensed, and your licenses will automatically terminate. If the licensor provides you with a notice of your violation, and you cease all violation of this license no later than 30 days after you receive that notice, your licenses will be reinstated retroactively. However, if you violate these terms after such reinstatement, any additional violation of these terms will cause your licenses to terminate automatically and permanently.
29+
30+
## No Liability ##
31+
As far as the law allows, the software comes as is, without any warranty or condition, and the licensor will not be liable to you for any damages arising out of these terms or the use or nature of the software, under any kind of legal claim.
32+
33+
## Definitions ##
34+
The *licensor* is the entity offering these terms, and the *software* is the software the licensor makes available under these terms, including any portion of it.
35+
36+
*you* refers to the individual or entity agreeing to these terms.
37+
38+
*your company* is any legal entity, sole proprietorship, or other kind of organization that you work for, plus all organizations that have control over, are under the control of, or are under common control with that organization. *control* means ownership of substantially all the assets of an entity, or the power to direct its management and policies by vote, contract, or otherwise. Control can be direct or indirect.
39+
40+
*your licenses* are all the licenses granted to you for the software under these terms.
41+
42+
*use* means anything you do with the software requiring one of your licenses.
43+
44+
*trademark* means trademarks, service marks, and similar rights.

0 commit comments

Comments
 (0)