Merge pull request #40 from ChurchTao/feature/macos

macOS替换为objc2

Cargo.toml

@@ -18,7 +18,19 @@ image = "0.25.2"
 clipboard-win = { version = "5.4.0", features = ["monitor"] }
 
 [target.'cfg(target_os = "macos")'.dependencies]
-cocoa = "0.25.0"
+# cocoa = "0.26.0"
+objc2 = { version = "0.5.2" }
+objc2-foundation = { version = "0.2.2", features = [
+    "NSArray",
+    "NSString",
+    "NSEnumerator",
+] }
+objc2-app-kit = { version = "0.2.2", features = [
+    "NSPasteboard",
+    "NSPasteboardItem",
+    "NSImage",
+] }
+
 
 [target.'cfg(all(unix, not(any(target_os="macos", target_os="android", target_os="ios", target_os="emscripten"))))'.dependencies]
 x11rb = { version = "0.13.0", features = ["xfixes"] }

examples/files.rs

@@ -17,6 +17,6 @@ fn main() {
 	let has = ctx.has(ContentFormat::Files);
 	println!("has_files={}", has);
 
-	let files = ctx.get_files().unwrap_or(vec![]);
+	let files = ctx.get_files().unwrap_or_default();
 	println!("{:?}", files);
 }

examples/watch_change.rs

@@ -18,7 +18,7 @@ impl ClipboardHandler for Manager {
 	fn on_clipboard_change(&mut self) {
 		println!(
 			"on_clipboard_change, txt = {}",
-			self.ctx.get_text().unwrap()
+			self.ctx.get_text().unwrap_or("".to_string())
 		);
 	}
 }
@@ -28,7 +28,8 @@ fn main() {
 
 	let mut watcher = ClipboardWatcherContext::new().unwrap();
 
-	let watcher_shutdown = watcher.add_handler(manager).get_shutdown_channel();
+	let watcher_shutdown: clipboard_rs::WatcherShutdown =
+		watcher.add_handler(manager).get_shutdown_channel();
 
 	thread::spawn(move || {
 		thread::sleep(Duration::from_secs(5));