feat: support native 4.2.2.142 (#1178)

* chore: config terra 4.2.2.142 * chore: cherry pick terra config * chore: bump NativeSDK to 4.2.2.142 * chore: release 4.2.2-build.142-rc.1 * chore(example): update example to install agora-electron-sdk@4.2.2-build.142-rc.1 --------- Co-authored-by: sda_rob <sda_rob@agora.io>
AgoraIO-Extensions · Apr 1, 2024 · 473815e · 473815e
1 parent 4835a8c
commit 473815e
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 3,809 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 
 
+## [4.2.2-build.142-rc.1](https://github.com/AgoraIO-Extensions/Electron-SDK/compare/v4.2.2-build.141-rc.2...v4.2.2-build.142-rc.1) (2024-03-29)
+
 ## [4.2.2-build.141-rc.2](https://github.com/AgoraIO-Extensions/Electron-SDK/compare/v4.2.2-build.141-rc.1...v4.2.2-build.141-rc.2) (2023-12-15)
 
 

diff --git a/example/package.json b/example/package.json
@@ -70,7 +70,7 @@
     ]
   },
   "dependencies": {
-    "agora-electron-sdk": "4.2.2-build.141-rc.2",
+    "agora-electron-sdk": "4.2.2-build.142-rc.1",
     "antd": "^4.20.3",
     "download": "^8.0.0",
     "ffi-napi": "^4.0.3",

diff --git a/example/yarn.lock b/example/yarn.lock
@@ -1783,10 +1783,10 @@ aggregate-error@^3.0.0:
     clean-stack "^2.0.0"
     indent-string "^4.0.0"
 
-agora-electron-sdk@4.2.2-build.141-rc.2:
-  version "4.2.2-build.141-rc.2"
-  resolved "https://registry.npmjs.org/agora-electron-sdk/-/agora-electron-sdk-4.2.2-build.141-rc.2.tgz#fb094ac81fe5a7df239f50ef3ba22f12a473d264"
-  integrity sha512-0qNP8mGxcxlA19inixzkv8iqpdzB03TMMNiIrhycQtLGDxBvuhGhazvwNZiKS2O3h8XdyBZoAD2BIiE9YNk83Q==
+agora-electron-sdk@4.2.2-build.142-rc.1:
+  version "4.2.2-build.142-rc.1"
+  resolved "https://registry.npmjs.org/agora-electron-sdk/-/agora-electron-sdk-4.2.2-build.142-rc.1.tgz#f8087c597a9e139f90b8f2dc80386f2037725b8b"
+  integrity sha512-CD+973GkThf+KhSwnzidh0J/3ssbmlOuA+C6HkoVHZSQLG+188T/gEwpcDoBAJndEUfBMILbcuksvkPnM7KIfA==
   dependencies:
     buffer "^6.0.3"
     cross-env "^7.0.3"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "agora-electron-sdk",
-  "version": "4.2.2-build.141-rc.2",
+  "version": "4.2.2-build.142-rc.1",
   "description": "agora-electron-sdk",
   "main": "js/AgoraSdk",
   "types": "types/AgoraSdk.d.ts",
@@ -136,7 +136,7 @@
     "yuv-canvas": "1.2.6"
   },
   "agora_electron": {
-    "iris_sdk_win": "https://download.agora.io/sdk/release/iris_4.2.2.141-build.2_DCG_Windows_Video_20231214_0900.zip",
+    "iris_sdk_win": "https://download.agora.io/sdk/release/iris_4.2.2.142-build.1_DCG_Windows_Video_20240329_1152.zip",
     "iris_sdk_mac": "https://download.agora.io/sdk/release/iris_4.2.2.136-build.1_DCG_Mac_Video_20230922_0351.zip"
   }
 }
diff --git a/scripts/terra/.gitignore b/scripts/terra/.gitignore
@@ -8,3 +8,4 @@ node_modules
 !.yarn/releases
 !.yarn/sdks
 !.yarn/versions
+yarn.lock
diff --git a/scripts/terra/code_config.yaml b/scripts/terra/code_config.yaml
@@ -3,20 +3,20 @@ parsers:
     package: '@agoraio-extensions/terra-legacy-cxx-parser'
     args:
       includeHeaderDirs:
-        - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.2.138/include'
+        - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.2.142/include'
       parseFiles:
         include:
-          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.2.138/include/*.h'
+          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.2.142/include/*.h'
         exclude:
-          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.2.138/include/AgoraRefPtr.h'
-          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.2.138/include/time_utils.h'
-          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.2.138/include/AgoraOptional.h'
-          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.2.138/include/AgoraRefPtr.h'
-          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.2.138/include/IAgoraH265Transcoder.h'
-          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.2.138/include/IAgoraMediaComponentFactory.h'
-          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.2.138/include/IAgoraParameter.h'
+          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.2.142/include/AgoraRefPtr.h'
+          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.2.142/include/time_utils.h'
+          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.2.142/include/AgoraOptional.h'
+          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.2.142/include/AgoraRefPtr.h'
+          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.2.142/include/IAgoraH265Transcoder.h'
+          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.2.142/include/IAgoraMediaComponentFactory.h'
+          - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.2.142/include/IAgoraParameter.h'
       customHeaders:
-        - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.2.138/custom_headers/*.h'
+        - '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.2.142/custom_headers/*.h'
       language: ts
       definesMacros:
         - __ELECTRON__

diff --git a/scripts/terra/generate-prepare.sh b/scripts/terra/generate-prepare.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -e
+set -x
+
+# treated as a completely separate project (not even a workspace), create an empty yarn.lock file in it.
+touch yarn.lock
+rm -rf node_modules
+rm -rf .terra
+yarn install
+rm yarn.lock
diff --git a/scripts/terra/package.json b/scripts/terra/package.json
@@ -12,10 +12,10 @@
     "@types/node": "^20.6.0"
   },
   "dependencies": {
-    "@agoraio-extensions/terra": "git@github.com:AgoraIO-Extensions/terra.git#commit=5dd8149d5ab9f3b472b7715916b6217f9745f066&workspace=terra",
-    "@agoraio-extensions/terra-core": "git@github.com:AgoraIO-Extensions/terra.git#commit=5dd8149d5ab9f3b472b7715916b6217f9745f066&workspace=terra-core",
-    "@agoraio-extensions/terra-legacy-cxx-parser": "git@github.com:AgoraIO-Extensions/terra-legacy-cxx-parser.git#commit=5455afd2c5e29013d9a3cb8d06150c162450a5ed",
-    "@agoraio-extensions/terra_shared_configs": "git@github.com:AgoraIO-Extensions/terra_shared_configs.git#commit=ea5b0574dace3a434ad87dbeac2d43a5b62ef636",
+    "@agoraio-extensions/terra": "git@github.com:AgoraIO-Extensions/terra.git#workspace=terra",
+    "@agoraio-extensions/terra-core": "git@github.com:AgoraIO-Extensions/terra.git#workspace=terra-core",
+    "@agoraio-extensions/terra-legacy-cxx-parser": "git@github.com:AgoraIO-Extensions/terra-legacy-cxx-parser.git",
+    "@agoraio-extensions/terra_shared_configs": "git@github.com:AgoraIO-Extensions/terra_shared_configs.git",
     "ts-node": "^10.9.1",
     "typescript": "^5.1.6"
   },