Skip to content

Commit

Permalink
Merge pull request #1 from CaioMelo8/refactor/opentok-sdk-update
Browse files Browse the repository at this point in the history
Fix opentok#181: Update @Opentok/client to 2.19.2 and Opentok Android/iOS SDK to 2.19.0.
  • Loading branch information
CaioMelo8 authored Oct 9, 2023
2 parents 2c3d7f5 + e947c7e commit 2ea8d22
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 14 deletions.
2 changes: 1 addition & 1 deletion build-extras.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
]
},
"dependencies": {
"@opentok/client": "2.15.5",
"@opentok/client": "2.19.2",
"exec": "^0.2.0",
"tar": "^2.0.0"
},
Expand Down
15 changes: 8 additions & 7 deletions scripts/downloadiOSSDK.js
Original file line number Diff line number Diff line change
@@ -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();
});
Expand Down
2 changes: 1 addition & 1 deletion src/android/OpenTokAndroidPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -989,7 +989,7 @@ protected Map<String, String> 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");
Expand Down
2 changes: 1 addition & 1 deletion src/ios/OpenTokPlugin.m
Original file line number Diff line number Diff line change
Expand Up @@ -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"];
Expand Down

0 comments on commit 2ea8d22

Please sign in to comment.