Merge pull request #123 from wravery/dev

fix: #122

Author: wravery

Cargo.toml

@@ -4,7 +4,7 @@ resolver = "2"
 members = ["download-cef", "update-bindings", "export-cef-dir", "sys", "cef"]
 
 [workspace.package]
-version = "137.0.0+137.0.8"
+version = "137.0.1+137.0.8"
 edition = "2021"
 license = "Apache-2.0 OR MIT"
 authors = [
@@ -15,8 +15,8 @@ authors = [
 repository = "https://github.com/tauri-apps/cef-rs"
 
 [workspace.dependencies]
-cef-dll-sys = { version = "137.0.0", path = "sys" }
-download-cef = { version = "1.4", path = "download-cef" }
+cef-dll-sys = { version = "137.0.1", path = "sys" }
+download-cef = { version = "1.4.1", path = "download-cef" }
 
 anyhow = "1"
 bindgen = "0.72"

download-cef/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "download-cef"
 description = "Download and extract pre-built CEF (Chromium Embedded Framework) archives."
-version = "1.4.0"
+version = "1.4.1"
 
 edition.workspace = true
 license.workspace = true

download-cef/src/lib.rs

@@ -58,25 +58,20 @@ pub const WINDOWS_TARGETS: &[&str] = &[
     "i686-pc-windows-msvc",
 ];
 
-pub fn default_version(version: &'static str) -> String {
-    static VERSIONS: Mutex<Option<HashMap<&'static str, String>>> = Mutex::new(None);
+pub fn default_version(version: &str) -> String {
+    static VERSIONS: Mutex<Option<HashMap<String, String>>> = Mutex::new(None);
     let mut versions = VERSIONS.lock().expect("Lock error");
     if versions.is_none() {
         *versions = Some(HashMap::new());
     };
     let versions = versions.as_mut().unwrap();
     versions
-        .entry(version)
+        .entry(version.to_string())
         .or_insert_with(|| {
             Version::parse(version)
-                .map(|version| {
-                    if version.build.is_empty() {
-                        version.to_string()
-                    } else {
-                        version.build.to_string()
-                    }
-                })
-                .unwrap_or_else(|_| version.to_string())
+                .ok()
+                .and_then(|version| (!version.build.is_empty()).then(|| version.build.to_string()))
+                .unwrap_or_else(|| version.to_string())
         })
         .clone()
 }

sys/build.rs

@@ -31,7 +31,7 @@ fn main() -> anyhow::Result<()> {
             let cef_dir = out_dir.join(&cef_dir);
 
             if !fs::exists(&cef_dir)? {
-                let cef_version = env::var("CARGO_PKG_VERSION")?;
+                let cef_version = download_cef::default_version(&env::var("CARGO_PKG_VERSION")?);
                 let index = CefIndex::download()?;
                 let platform = index.platform(&target)?;
                 let version = platform.version(&cef_version)?;