Upstream Pull

.commitlintrc.yml

@@ -0,0 +1,2 @@
+extends:
+  - '@commitlint/config-conventional'

.github/dependabot.yml

@@ -0,0 +1,28 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    groups:
+      all:
+        patterns:
+          - "*"
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: "gradle"
+    directory: "/"
+    groups:
+      all:
+        patterns:
+          - "*"
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: "npm"
+    directory: "/"
+    groups:
+      all:
+        patterns:
+          - "*"
+    schedule:
+      interval: "daily"

.github/workflows/android.yml

@@ -2,30 +2,36 @@ name: Android CI
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
     paths-ignore:
-    - '**.md'
-    - 'LICENSE'
-    - 'NOTICE'
+      - "**.md"
+      - "LICENSE"
+      - "NOTICE"
   pull_request:
-    branches: [ main ]
+    branches: [main]
+    paths-ignore:
+      - "**.md"
+      - "LICENSE"
+      - "NOTICE"
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: set up JDK 11
-      uses: actions/setup-java@v3
-      with:
-        java-version: '11'
-        distribution: 'adopt'
-        cache: 'gradle'
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    - name: download dependencies
-      run: ./core/scripts/get-deps.sh
-    - name: Build with Gradle
-      run: ./gradlew build --no-daemon
+      - uses: actions/checkout@v4
+      - name: set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 17
+      - name: Validate Gradle wrapper
+        uses: gradle/actions/wrapper-validation@v4
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: download dependencies
+        run: ./core/scripts/get-deps.sh
+      - name: Build with Gradle
+        run: ./gradlew build

.github/workflows/close_inactive_issues.yml

@@ -7,13 +7,11 @@ jobs:
   close-issues:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v3
+      - uses: actions/stale@v9
         with:
           days-before-issue-stale: 30
           days-before-issue-close: 14
-          stale-issue-label: "stale"
           stale-issue-message: "This issue is stale because it has been open for 30 days with no activity."
           close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale."
           days-before-pr-stale: -1
           days-before-pr-close: -1
-          repo-token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -46,6 +46,9 @@ google-services.json
 # macOS
 .DS_Store
 
+# Node.js
+node_modules/
+
 # not ignore
 !.idea/codeStyleSettings.xml
 !.idea/findbugs-idea.xml

.husky/commit-msg

@@ -0,0 +1,2 @@
+pnpm exec commitlint --edit "$1"
+

VERSIONS

@@ -1,3 +1,2 @@
-WEBRTC_VERSION=102.5005.10.2
-LIBMEDIASOUPCLIENT_VERSION=55d724ff8b036991b0f0688adb334df976e458fe
-JSON_FOR_MODERN_CPP_VERSION=3.11.2
+WEBRTC_VERSION=123.6312.0.0
+LIBMEDIASOUPCLIENT_VERSION=63c8b177798dc3c6312586278e69391f91718ecf

build.gradle.kts

@@ -1,27 +1,6 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    kotlin("android") apply false
-}
-
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath(Android.tools.build.gradlePlugin)
-        classpath(libs.dokka.gradle.plugin)
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
-val clean by tasks.creating(Delete::class) {
-    group = "build"
-    delete(rootProject.buildDir)
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.detekt) apply false
+    alias(libs.plugins.dokka) apply false
 }

config/detekt.yml

@@ -0,0 +1,14 @@
+build:
+  maxIssues: 0
+
+complexity:
+  TooManyFunctions:
+    active: false
+
+style:
+  WildcardImport:
+    active: false
+
+naming:
+  PackageNaming:
+    active: false

core/CMakeLists.txt

@@ -62,7 +62,6 @@ target_include_directories(${PROJECT_NAME} PUBLIC
 	"${SOURCE_DIR}/include"
 	"${LIBMEDIASOUPCLIENT_ROOT_PATH}/include"
 	"${LIBMEDIASOUPCLIENT_ROOT_PATH}/test/include"
-	"${LIBMEDIASOUPCLIENT_ROOT_PATH}/deps/libsdptransform/include"
 	"${LIBWEBRTC_INCLUDE_PATH}"
 	"${LIBWEBRTC_INCLUDE_PATH}/third_party/abseil-cpp"
 )