From 52a8ad7ae9264e92138868747605a3ae3258f7fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Mar 2023 09:19:58 +0000 Subject: [PATCH 1/2] build(deps): bump android_logger from 0.11.3 to 0.13.1 Bumps [android_logger](https://github.com/Nercury/android_logger-rs) from 0.11.3 to 0.13.1. - [Release notes](https://github.com/Nercury/android_logger-rs/releases) - [Changelog](https://github.com/Nercury/android_logger-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/Nercury/android_logger-rs/compare/v0.11.3...v0.13.1) --- updated-dependencies: - dependency-name: android_logger dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- aw-server/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b1d00963..76acaeb2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -59,15 +59,15 @@ dependencies = [ [[package]] name = "android_log-sys" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e" +checksum = "27f0fc03f560e1aebde41c2398b691cb98b5ea5996a6184a7a67bbbb77448969" [[package]] name = "android_logger" -version = "0.11.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8619b80c242aa7bd638b5c7ddd952addeecb71f69c75e33f1d47b2804f8f883a" +checksum = "3fa490e751f3878eb9accb9f18988eca52c2337ce000a8bf31ef50d4c723ca9e" dependencies = [ "android_log-sys", "env_logger", diff --git a/aw-server/Cargo.toml b/aw-server/Cargo.toml index 40f556e7..74358329 100644 --- a/aw-server/Cargo.toml +++ b/aw-server/Cargo.toml @@ -44,5 +44,5 @@ jemallocator = "0.5.0" [target.'cfg(target_os="android")'.dependencies] jni = { version = "0.20", default-features = false } libc = "0.2" -android_logger = "0.11" +android_logger = "0.13" openssl-sys = { version = "0.9.82", features = ["vendored"]} From c2ab74a83069d4ef2436be4fbcf4632b4050807f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= Date: Thu, 23 Mar 2023 10:33:45 +0100 Subject: [PATCH 2/2] fix: fixed renamed method in updated android_logger --- aw-server/src/android/mod.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/aw-server/src/android/mod.rs b/aw-server/src/android/mod.rs index b86c07bf..36d88dd5 100644 --- a/aw-server/src/android/mod.rs +++ b/aw-server/src/android/mod.rs @@ -5,13 +5,11 @@ extern crate android_logger; use std::ffi::{CStr, CString}; use std::os::raw::c_char; -use std::sync::Mutex; use crate::device_id; use crate::dirs; use android_logger::Config; -use log::Level; use rocket::serde::json::json; #[no_mangle] @@ -96,7 +94,7 @@ pub mod android { } unsafe fn create_error_object(env: &JNIEnv, msg: String) -> jstring { - let mut obj = json!({ "error": &msg }); + let obj = json!({ "error": &msg }); string_to_jstring(&env, obj.to_string()) } @@ -155,7 +153,7 @@ pub mod android { if !INITIALIZED { android_logger::init_once( Config::default() - .with_min_level(Level::Info) // limit log level + .with_max_level(log::LevelFilter::Info) // limit log level .with_tag("aw-server-rust"), // logs will show under mytag tag //.with_filter( // configure messages for specific crate // FilterBuilder::new()