From d1bc982a3722ba19f436edce7f8500ca55057aa8 Mon Sep 17 00:00:00 2001
From: David Knaack <davidkna@users.noreply.github.com>
Date: Sun, 30 Oct 2022 11:17:54 +0100
Subject: [PATCH 1/2] chore: bump msrv to 1.64 (#4542)

* chore: bump msrv to 1.64

* clippy fix
---
 Cargo.toml         | 2 +-
 src/serde_utils.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index df94b163e..654be15d4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,7 @@ license = "ISC"
 readme = "README.md"
 repository = "https://github.com/starship/starship"
 # Note: MSRV is only intended as a hint, and only the latest version is officially supported in starship.
-rust-version = "1.60"
+rust-version = "1.64"
 description = """
 The minimal, blazing-fast, and infinitely customizable prompt for any shell! ☄🌌️
 """
diff --git a/src/serde_utils.rs b/src/serde_utils.rs
index 05e00cd5c..0a904ef49 100644
--- a/src/serde_utils.rs
+++ b/src/serde_utils.rs
@@ -136,7 +136,7 @@ impl<'de> Deserializer<'de> for ValueDeserializer<'de> {
                 .iter()
                 .filter_map(|field| {
                     let score = strsim::jaro_winkler(key, field);
-                    (score > 0.8).then(|| (score, field))
+                    (score > 0.8).then_some((score, field))
                 })
                 .max_by(|(score_a, _field_a), (score_b, _field_b)| {
                     score_a.partial_cmp(score_b).unwrap_or(Ordering::Equal)

From 14ee81b9c31047993217f060b57fb327a58c0d38 Mon Sep 17 00:00:00 2001
From: Felix H <75806385+BattleCh1cken@users.noreply.github.com>
Date: Sun, 30 Oct 2022 11:43:32 -0400
Subject: [PATCH 2/2] feat(package): added showing gradle version based on the
 gradle.properties file (#4432)

* feat: added showing gradle version based on the gradle.properties file

* fix: wouldn't return version

* fix: forgot to remove "version=" from returned version"

* fix: ran rustfmt

* fix: test now actually tests for something

Co-authored-by: David Knaack <davidkna@users.noreply.github.com>

* fix: the regex actually makes sense now

* fix: complete refactor of control flow

* Delete flake.nix

* changed order in which files are processed

Co-authored-by: BattleCh1cken <BattleCh1cken@Larkov.de>
Co-authored-by: David Knaack <davidkna@users.noreply.github.com>
---
 src/modules/package.rs | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/modules/package.rs b/src/modules/package.rs
index f278b64b4..03e787bf1 100644
--- a/src/modules/package.rs
+++ b/src/modules/package.rs
@@ -102,11 +102,19 @@ fn get_setup_cfg_version(context: &Context, config: &PackageConfig) -> Option<St
 }
 
 fn get_gradle_version(context: &Context, config: &PackageConfig) -> Option<String> {
-    let file_contents = context.read_file_from_pwd("build.gradle")?;
-    let re = Regex::new(r#"(?m)^version ['"](?P<version>[^'"]+)['"]$"#).unwrap();
-    let caps = re.captures(&file_contents)?;
+    context
+        .read_file_from_pwd("gradle.properties")
+        .and_then(|contents| {
+            let re = Regex::new(r"version=(?P<version>.*)").unwrap();
+            let caps = re.captures(&contents)?;
+            format_version(&caps["version"], config.version_format)
+        }).or_else(|| {
+            let build_file_contents = context.read_file_from_pwd("build.gradle")?;
+            let re = Regex::new(r#"(?m)^version ['"](?P<version>[^'"]+)['"]$"#).unwrap(); /*dark magic*/
+            let caps = re.captures(&build_file_contents)?;
+            format_version(&caps["version"], config.version_format)
 
-    format_version(&caps["version"], config.version_format)
+        })
 }
 
 fn get_composer_version(context: &Context, config: &PackageConfig) -> Option<String> {
@@ -960,6 +968,17 @@ java {
         expect_output(&project_dir, None, None);
         project_dir.close()
     }
+    #[test]
+    fn test_extract_grade_version_from_properties() -> io::Result<()> {
+        let config_name = "gradle.properties";
+        let config_content = "
+            version=1.2.3
+            ";
+        let project_dir = create_project_dir()?;
+        fill_config(&project_dir, config_name, Some(config_content))?;
+        expect_output(&project_dir, Some("v1.2.3"), None);
+        project_dir.close()
+    }
 
     #[test]
     fn test_extract_mix_version() -> io::Result<()> {