Upgrade Flutter to 3.24 version (#168)

- upgrade Dart dependencies
- upgrade Rust dependencies

Co-authored-by: Kai Ren <[email protected]>

Author: alexlapa

Cargo.lock

@@ -2,14 +2,14 @@ group 'com.instrumentisto.medea_flutter_webrtc'
 version '0.10.0'
 
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -26,7 +26,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 31
+    compileSdk = 34
 
     defaultConfig {
         minSdkVersion 24

android/build.gradle

@@ -2,7 +2,7 @@
 name = "libwebrtc-sys"
 version = "0.0.0+127.0.6533.72"
 edition = "2021"
-rust-version = "1.62"
+rust-version = "1.75"
 publish = false
 links = "webrtc"
 
@@ -12,16 +12,16 @@ fake-media = []
 [dependencies]
 anyhow = "1.0"
 cxx = "1.0"
-derive_more = { version = "0.99", features = ["deref", "deref_mut", "from"], default-features = false }
+derive_more = { version = "1.0", features = ["deref", "deref_mut", "from"] }
 
 [build-dependencies]
 anyhow = "1.0"
 cxx-build = "1.0"
 flate2 = "1.0"
-reqwest = { version = "0.11", features = ["blocking"] }
+reqwest = { version = "0.12", features = ["blocking"] }
 sha2 = "0.10"
 tar = "0.4"
-walkdir = "2.3"
+walkdir = "2.5"
 
 [target.'cfg(target_os = "linux")'.build-dependencies]
 pkg-config = "0.3"

crates/libwebrtc-sys/Cargo.toml

@@ -347,9 +347,7 @@ fn download_libwebrtc() -> anyhow::Result<()> {
     // Force download if `INSTALL_WEBRTC=1`.
     if env::var("INSTALL_WEBRTC").as_deref().unwrap_or("0") == "0" {
         // Skip download if already downloaded and checksum matches.
-        if fs::metadata(&lib_dir)
-            .map(|m| m.is_dir())
-            .unwrap_or_default()
+        if fs::metadata(&lib_dir).is_ok_and(|m| m.is_dir())
             && fs::read(&checksum).unwrap_or_default().as_slice()
                 == expected_hash.as_bytes()
         {

crates/libwebrtc-sys/build.rs

@@ -1,7 +1,7 @@
 [package]
 name = "medea-flutter-webrtc-native"
 edition = "2021"
-rust-version = "1.70"
+rust-version = "1.75"
 publish = false
 
 [lib]
@@ -10,24 +10,24 @@ crate-type = ["cdylib"]
 [dependencies]
 anyhow = "1.0"
 cxx = "1.0"
-dashmap = "5.4"
-derive_more = "0.99"
+dashmap = "6.0"
+derive_more = { version = "1.0", features = ["as_ref", "display", "from", "into"] }
 flutter_rust_bridge = { version = "=1.82.4", default-features = false }
 flutter_rust_bridge_macros = { version = "=1.82.4", default-features = false }
-lazy_static = "1.4"
+lazy_static = "1.5"
 libwebrtc-sys = { path = "../libwebrtc-sys" }
 log = "0.4"
-once_cell = "1.17"
+once_cell = "1.19"
 threadpool = "1.8"
 xxhash = { package = "xxhash-rust", version = "0.8", features = ["xxh3"] }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 libudev = "0.3"
-nix = { version = "0.27", features = ["poll", "signal"] }
-pulse = { version = "2.27", package = "libpulse-binding" }
+nix = { version = "0.29", features = ["poll", "signal"] }
+pulse = { version = "2.28", package = "libpulse-binding" }
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows = { version = "0.52", features = ["implement", "Win32_Foundation", "Win32_Graphics_Gdi", "Win32_Media_Audio", "Win32_System_Com", "Win32_UI_Shell_PropertiesSystem", "Win32_UI_WindowsAndMessaging"] }
+windows = { version = "0.58", features = ["implement", "Win32_Foundation", "Win32_Graphics_Gdi", "Win32_Media_Audio", "Win32_System_Com", "Win32_UI_Shell_PropertiesSystem", "Win32_UI_WindowsAndMessaging"] }
 
 [build-dependencies]
 anyhow = "1.0"

crates/native/Cargo.toml

@@ -394,7 +394,7 @@ pub mod linux_device_change {
             //         `socket`.
             let socket_fd =
                 unsafe { BorrowedFd::borrow_raw(socket.as_raw_fd()) };
-            let fds = PollFd::new(&socket_fd, PollFlags::POLLIN);
+            let fds = PollFd::new(socket_fd, PollFlags::POLLIN);
             loop {
                 ppoll(&mut [fds], None, None)?;
 
@@ -570,7 +570,7 @@ mod win_default_device_callback {
         Win32::{
             Media::Audio::{
                 EDataFlow, ERole, IMMDeviceEnumerator, IMMNotificationClient,
-                IMMNotificationClient_Impl, MMDeviceEnumerator,
+                IMMNotificationClient_Impl, MMDeviceEnumerator, DEVICE_STATE,
             },
             System::Com::{CoCreateInstance, CLSCTX_ALL},
             UI::Shell::PropertiesSystem::PROPERTYKEY,
@@ -593,8 +593,12 @@ mod win_default_device_callback {
     struct AudioEndpointCallback;
 
     #[allow(non_snake_case)]
-    impl IMMNotificationClient_Impl for AudioEndpointCallback {
-        fn OnDeviceStateChanged(&self, _: &PCWSTR, _: u32) -> Result<()> {
+    impl IMMNotificationClient_Impl for AudioEndpointCallback_Impl {
+        fn OnDeviceStateChanged(
+            &self,
+            _: &PCWSTR,
+            _: DEVICE_STATE,
+        ) -> Result<()> {
             Ok(())
         }
 
@@ -741,11 +745,19 @@ pub unsafe fn init() {
             0,
             None,
             None,
-            HMODULE(0),
+            HMODULE(ptr::null_mut()),
             None,
         );
 
-        ShowWindow(hwnd, SW_HIDE);
+        let Ok(hwnd) = hwnd else {
+            log::error!(
+                "Failed to create window so on device change listener is \
+                 disabled",
+            );
+            return;
+        };
+
+        _ = ShowWindow(hwnd, SW_HIDE);
 
         let mut msg: MSG = mem::zeroed();
 
@@ -754,7 +766,7 @@ pub unsafe fn init() {
                 break;
             }
 
-            TranslateMessage(&msg);
+            _ = TranslateMessage(&msg);
             DispatchMessageW(&msg);
         }
     });

crates/native/src/devices.rs

@@ -1,13 +1,13 @@
 buildscript {
-    ext.kotlin_version = '1.6.21'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath("com.android.tools.build:gradle:7.4.2")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     }
 }
 

example/android/build.gradle

@@ -7,7 +7,7 @@ import 'package:medea_flutter_webrtc/medea_flutter_webrtc.dart';
 class PeerConnectionSample extends StatefulWidget {
   static String tag = 'peer_connection_sample';
 
-  const PeerConnectionSample({Key? key}) : super(key: key);
+  const PeerConnectionSample({super.key});
 
   @override
   State<PeerConnectionSample> createState() => _PeerConnectionSampleState();

example/lib/src/create_peer_connection.dart

@@ -10,7 +10,7 @@ import 'package:medea_flutter_webrtc/medea_flutter_webrtc.dart';
 class GetDisplayMediaSample extends StatefulWidget {
   static String tag = 'get_display_media_sample';
 
-  const GetDisplayMediaSample({Key? key}) : super(key: key);
+  const GetDisplayMediaSample({super.key});
 
   @override
   State<GetDisplayMediaSample> createState() => _GetDisplayMediaSampleState();

example/lib/src/get_display_media.dart

@@ -6,7 +6,7 @@ import 'package:medea_flutter_webrtc/medea_flutter_webrtc.dart';
 class GetSourcesSample extends StatefulWidget {
   static String tag = 'get_sources_sample';
 
-  const GetSourcesSample({Key? key}) : super(key: key);
+  const GetSourcesSample({super.key});
 
   @override
   State<GetSourcesSample> createState() => _GetSourcesSampleState();