Skip to content

Commit cc3921e

Browse files
committed
Merge branch 'master' into SDK-1831-update-branch.json-support
2 parents d5b3191 + a229896 commit cc3921e

File tree

5 files changed

+877
-848
lines changed

5 files changed

+877
-848
lines changed

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ jobs:
151151
echo "Current version is $(cat fastlane/.version)."
152152
echo "version=$(cat fastlane/.version)" >> $GITHUB_OUTPUT
153153
- name: Create GitHub Release
154-
uses: actions/github-script@v4
154+
uses: actions/github-script@v6
155155
with:
156156
script: |
157157
const createRelease = require('./.github/custom-scripts/create-release');
@@ -165,7 +165,7 @@ jobs:
165165
version: tagName,
166166
});
167167
- name: Upload Release Assets
168-
uses: actions/github-script@v4
168+
uses: actions/github-script@v6
169169
with:
170170
script: |
171171
const uploadAsset = require('./.github/custom-scripts/upload-asset');
@@ -236,14 +236,14 @@ jobs:
236236
path: 'static-framework-noidfa/checksum_static_noidfa',
237237
});
238238
- name: Report Release
239-
uses: actions/github-script@v4
239+
uses: actions/github-script@v6
240240
with:
241241
script: |
242242
console.log('Created release ${{ steps.get-version.outputs.version }}:');
243243
console.log(` https://github.com/${context.repo.owner}/${context.repo.repo}/releases/${{ steps.get-version.outputs.version }}`);
244244
# 4. Trigger import workflow in ios-spm repo.
245245
- name: Export to ios-spm repository
246-
uses: actions/github-script@v4
246+
uses: actions/github-script@v6
247247
with:
248248
script: |
249249
console.log('TODO: This 👆');

Branch-TestBed/Branch-TestBed/AppDelegate.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ - (BOOL)application:(UIApplication *)application
6060

6161
[self setLogFile:@"OpenNInstall"];
6262
// [branch setIdentity:@"Bobby Branch"];
63+
6364
[branch initSessionWithLaunchOptions:launchOptions
6465
andRegisterDeepLinkHandlerUsingBranchUniversalObject:
6566
^ (BranchUniversalObject * _Nullable universalObject, BranchLinkProperties * _Nullable linkProperties, NSError * _Nullable error) {

Branch-TestBed/Branch-TestBed/LogOutputViewController.m

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,4 @@ - (void)didReceiveMemoryWarning {
2424
// Dispose of any resources that can be recreated.
2525
}
2626

27-
/*
28-
@synthesize deepLinkingCompletionDelegate;
29-
- (void)configureControlWithData:(NSDictionary *)data {
30-
NSString *message = data[@"deeplink_text"];
31-
dispatch_async(dispatch_get_main_queue(), ^{
32-
_logOutputTextView.text = message;
33-
});
34-
}*/
35-
36-
3727
@end

0 commit comments

Comments
 (0)