From e947c7ee8b3e0c3595c96a323380ce89d3c56f63 Mon Sep 17 00:00:00 2001 From: CaioMelo8 Date: Fri, 6 Oct 2023 17:55:07 -0300 Subject: [PATCH] Fix #181: Update @Opentok/client to 2.19.2 and Opentok Android/iOS SDK to 2.19.0. --- build-extras.gradle | 2 +- package-lock.json | 6 +++--- package.json | 2 +- scripts/downloadiOSSDK.js | 15 ++++++++------- src/android/OpenTokAndroidPlugin.java | 2 +- src/ios/OpenTokPlugin.m | 2 +- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/build-extras.gradle b/build-extras.gradle index a11ad65e..f7b7c786 100644 --- a/build-extras.gradle +++ b/build-extras.gradle @@ -18,5 +18,5 @@ allprojects { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.opentok.android:opentok-android-sdk:2.15.3' + implementation 'com.opentok.android:opentok-android-sdk:2.19.0' } diff --git a/package-lock.json b/package-lock.json index 6233da7b..31f555b0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@opentok/client": { - "version": "2.15.5", - "resolved": "https://registry.npmjs.org/@opentok/client/-/client-2.15.5.tgz", - "integrity": "sha512-8OtFHQxvgF6rr+XxQ187M3rpKLFW7rJASVQzvtTOB8Uv9keh01ZLWO5q9wDO6yiBhOoCuHWlhwvuRF6/B/PWUQ==" + "version": "2.19.2", + "resolved": "https://registry.npmjs.org/@opentok/client/-/client-2.19.2.tgz", + "integrity": "sha512-/U3pzzpVMRWxzFS1+2q9oBCvhM33CZTleUu1AEA+ldui/kJBdmTM3f+i6UQqIjZAe3/cMwQX7mST0BJsMdAXVg==" }, "abbrev": { "version": "1.1.1", diff --git a/package.json b/package.json index 5e9c3cbe..2bff421b 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ ] }, "dependencies": { - "@opentok/client": "2.15.5", + "@opentok/client": "2.19.2", "exec": "^0.2.0", "tar": "^2.0.0" }, diff --git a/scripts/downloadiOSSDK.js b/scripts/downloadiOSSDK.js index a8aae626..f1c86911 100755 --- a/scripts/downloadiOSSDK.js +++ b/scripts/downloadiOSSDK.js @@ -1,24 +1,25 @@ #!/usr/bin/env node module.exports = function (context) { - var IosSDKVersion = "OpenTok-iOS-2.15.3"; + var IosSDKDir = "OpenTok-iOS"; + var IosSDKVersion = "2.19.0"; var downloadFile = require('./downloadFile.js'), exec = require('./exec/exec.js'), Q = require('q'), deferral = new Q.defer(); console.log('Downloading OpenTok iOS SDK'); - downloadFile('https://s3.amazonaws.com/artifact.tokbox.com/rel/ios-sdk/' + IosSDKVersion + '.tar.bz2', - './' + IosSDKVersion + '.tar.bz2', function (err) { + downloadFile('https://s3.amazonaws.com/artifact.tokbox.com/rel/ios-sdk/' + `${IosSDKDir}-${IosSDKVersion}` + '.tar.bz2', + './' + `${IosSDKDir}-${IosSDKVersion}` + '.tar.bz2', function (err) { if (!err) { console.log('downloaded'); - exec('tar -zxvf ./' + IosSDKVersion + '.tar.bz2', function (err, out, code) { + exec('tar -zxvf ./' + `${IosSDKDir}-${IosSDKVersion}` + '.tar.bz2', function (err, out, code) { console.log('expanded'); var frameworkDir = context.opts.plugin.dir + '/src/ios/'; - exec('mv ./' + IosSDKVersion + '/OpenTok.framework ' + frameworkDir, function (err, out, code) { + exec('mv ./' + IosSDKDir + '/OpenTok.framework ' + frameworkDir, function (err, out, code) { console.log('moved OpenTok.framework into ' + frameworkDir); - exec('rm -r ./' + IosSDKVersion, function (err, out, code) { + exec('rm -r ./' + IosSDKDir, function (err, out, code) { console.log('Removed extracted dir'); - exec('rm ./' + IosSDKVersion + '.tar.bz2', function (err, out, code) { + exec('rm ./' + `${IosSDKDir}-${IosSDKVersion}` + '.tar.bz2', function (err, out, code) { console.log('Removed downloaded SDK'); deferral.resolve(); }); diff --git a/src/android/OpenTokAndroidPlugin.java b/src/android/OpenTokAndroidPlugin.java index c5be5bad..3e41a3cb 100644 --- a/src/android/OpenTokAndroidPlugin.java +++ b/src/android/OpenTokAndroidPlugin.java @@ -989,7 +989,7 @@ protected Map getParams() params.put("partner_id", apiKey); params.put("payload", payload.toString()); params.put("source", "https://github.com/opentok/cordova-plugin-opentok"); - params.put("build", "2.15.3"); + params.put("build", "2.19.0"); params.put("session_id", sessionId); if (connectionId != null) { params.put("action", "cp_on_connect"); diff --git a/src/ios/OpenTokPlugin.m b/src/ios/OpenTokPlugin.m index 579ac102..d988d908 100644 --- a/src/ios/OpenTokPlugin.m +++ b/src/ios/OpenTokPlugin.m @@ -57,7 +57,7 @@ -(void)logOT:(NSString*)connectionId{ [payload setObject:@"3.4.3" forKey:@"cp_version"]; NSMutableDictionary *logData = [[NSMutableDictionary alloc]init]; [logData setObject:apiKey forKey:@"partner_id"]; - [logData setObject:@"2.15.3" forKey:@"build"]; + [logData setObject:@"2.19.0" forKey:@"build"]; [logData setObject:@"https://github.com/opentok/cordova-plugin-opentok" forKey:@"source"]; [logData setObject:@"info" forKey:@"payload_type"]; [logData setObject:payload forKey:@"payload"];