From 91d7c320857cc21b488f5a24277c68b8877c4187 Mon Sep 17 00:00:00 2001
From: Antonius Naumann <git@antonius.dev>
Date: Sat, 7 Oct 2023 14:11:01 +0200
Subject: [PATCH] Move console UI related modules to console parent module

---
 src/commands/init.rs          |  4 +---
 src/commands/package.rs       | 11 ++++-------
 src/{ => console}/command.rs  |  0
 src/{ => console}/config.rs   |  0
 src/{ => console}/error.rs    |  0
 src/console/messages.rs       |  0
 src/{ => console}/spinners.rs |  2 +-
 src/{ => console}/step.rs     |  5 +++--
 src/lib.rs                    | 25 +++++++++++++++++--------
 9 files changed, 26 insertions(+), 21 deletions(-)
 rename src/{ => console}/command.rs (100%)
 rename src/{ => console}/config.rs (100%)
 rename src/{ => console}/error.rs (100%)
 create mode 100644 src/console/messages.rs
 rename src/{ => console}/spinners.rs (99%)
 rename src/{ => console}/step.rs (92%)

diff --git a/src/commands/init.rs b/src/commands/init.rs
index a927610..64c401e 100644
--- a/src/commands/init.rs
+++ b/src/commands/init.rs
@@ -5,10 +5,8 @@ use std::process::Stdio;
 use clap::ValueEnum;
 use execute::{command, Execute};
 
-use crate::config::Config;
-use crate::error::Result;
+use crate::console::{run_step, Config, Result};
 use crate::lib_type::LibType;
-use crate::step::run_step;
 
 #[derive(ValueEnum, Debug, Clone)]
 #[value()]
diff --git a/src/commands/package.rs b/src/commands/package.rs
index 5ef0eba..400740b 100644
--- a/src/commands/package.rs
+++ b/src/commands/package.rs
@@ -14,14 +14,12 @@ use execute::{command, Execute};
 use indicatif::MultiProgress;
 
 use crate::bindings::generate_bindings;
-use crate::error::*;
+use crate::console::*;
+use crate::console::{run_step, run_step_with_commands};
 use crate::lib_type::LibType;
-use crate::spinners::*;
-use crate::step::{run_step, run_step_with_commands};
 use crate::swiftpackage::{create_swiftpackage, recreate_output_dir};
 use crate::targets::*;
 use crate::xcframework::create_xcframework;
-use crate::*;
 
 #[derive(ValueEnum, Debug, Clone)]
 #[value()]
@@ -262,9 +260,8 @@ fn pick_lib_type(options: &[LibType], suggested: Option<LibType>) -> Result<LibT
         return Ok(*result);
     }
 
-    // TODO: Remove on next breaking version bump, this is only here to not induce a breaking change in the tools behavior
-    if options.iter().any(|i| matches!(&i, LibType::Dynamic)) {
-        return Ok(LibType::Dynamic);
+    if options.iter().any(|i| matches!(&i, LibType::Static)) {
+        return Ok(LibType::Static);
     }
 
     // TODO: Prompt user if multiple library types are present
diff --git a/src/command.rs b/src/console/command.rs
similarity index 100%
rename from src/command.rs
rename to src/console/command.rs
diff --git a/src/config.rs b/src/console/config.rs
similarity index 100%
rename from src/config.rs
rename to src/console/config.rs
diff --git a/src/error.rs b/src/console/error.rs
similarity index 100%
rename from src/error.rs
rename to src/console/error.rs
diff --git a/src/console/messages.rs b/src/console/messages.rs
new file mode 100644
index 0000000..e69de29
diff --git a/src/spinners.rs b/src/console/spinners.rs
similarity index 99%
rename from src/spinners.rs
rename to src/console/spinners.rs
index a6eb3f1..bf09f82 100644
--- a/src/spinners.rs
+++ b/src/console/spinners.rs
@@ -2,7 +2,7 @@ use std::{process::Command, time::Duration};
 
 use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
 
-use crate::CommandInfo;
+use super::CommandInfo;
 
 const TICK_RATE: Duration = Duration::from_millis(30);
 
diff --git a/src/step.rs b/src/console/step.rs
similarity index 92%
rename from src/step.rs
rename to src/console/step.rs
index 8439397..50a6161 100644
--- a/src/step.rs
+++ b/src/console/step.rs
@@ -3,8 +3,9 @@ use std::process::{Command, Stdio};
 
 use indicatif::MultiProgress;
 
-use crate::spinners::{CommandSpinner, MainSpinner, OptionalMultiProgress, Ticking};
-use crate::{CommandInfo, Config, Result};
+use super::{
+    CommandInfo, CommandSpinner, Config, MainSpinner, OptionalMultiProgress, Result, Ticking,
+};
 
 pub fn run_step<T, E, S>(config: &Config, title: S, execute: E) -> Result<T>
 where
diff --git a/src/lib.rs b/src/lib.rs
index 9eb0d92..24aaf21 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,25 +1,34 @@
 #![allow(clippy::useless_format)]
 
-mod command;
 mod commands {
     pub mod init;
     pub mod package;
 }
+pub(crate) mod console {
+    mod command;
+    pub mod config;
+    pub mod error;
+    pub mod messages;
+    pub mod spinners;
+    pub mod step;
+
+    pub use command::*;
+    pub use config::*;
+    pub use error::*;
+    pub use messages::*;
+    pub use spinners::*;
+    pub use step::*;
+}
 
 mod bindings;
-mod config;
-mod error;
 mod lib_type;
-mod spinners;
-mod step;
 mod swiftpackage;
 mod targets;
 mod xcframework;
 
-pub use command::*;
 pub use commands::*;
-pub use config::*;
-pub use error::*;
+pub use console::error::Result;
+pub use console::Config;
 pub use lib_type::LibType;
 pub use targets::*;