diff --git a/Cargo.lock b/Cargo.lock index 00e0bc82..d29b8c91 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6901,9 +6901,9 @@ dependencies = [ [[package]] name = "tauri-plugin" -version = "2.4.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9946a3cede302eac0c6eb6c6070ac47b1768e326092d32efbb91f21ed58d978f" +checksum = "076c78a474a7247c90cad0b6e87e593c4c620ed4efdb79cbe0214f0021f6c39d" dependencies = [ "anyhow", "glob", @@ -6937,6 +6937,7 @@ dependencies = [ "serde", "serde_json", "tauri", + "tauri-build", "tauri-plugin", "thiserror 2.0.16", ] diff --git a/app/allelo/src-tauri/src/lib.rs b/app/allelo/src-tauri/src/lib.rs index a28276ba..13da28f1 100644 --- a/app/allelo/src-tauri/src/lib.rs +++ b/app/allelo/src-tauri/src/lib.rs @@ -1009,13 +1009,13 @@ impl AppBuilder { // .add_plugins(["window", "event"]), // ); // } - if cfg!(debug_assertions) { - app.handle().plugin( - tauri_plugin_log::Builder::default() - .level(log::LevelFilter::Info) - .build(), - )?; - } + // if cfg!(debug_assertions) { + // app.handle().plugin( + // tauri_plugin_log::Builder::default() + // .level(log::LevelFilter::Info) + // .build(), + // )?; + // } Ok(()) }); builder = builder.plugin(tauri_plugin_opener::init()); diff --git a/app/nextgraph/README.md b/app/nextgraph/README.md index 93faf7cd..8e9c86c9 100644 --- a/app/nextgraph/README.md +++ b/app/nextgraph/README.md @@ -63,12 +63,8 @@ export RANLIB="$NDK_HOME/toolchains/llvm/prebuilt/$(ls -1 $NDK_HOME/toolchains/l to run the dev env : ``` -## on macos -cargo tauri dev --no-watch --target x86_64-apple-darwin -## on linux -cargo tauri dev --no-watch --target x86_64-unknown-linux-gnu -## on win -cargo tauri dev --no-watch --target x86_64-pc-windows-msvc +## on macos or linux or win +cargo tauri dev --no-watch ``` to build the production app installer : diff --git a/app/tauri-plugin-contacts-importer/Cargo.toml b/app/tauri-plugin-contacts-importer/Cargo.toml index de109e8b..9588e285 100644 --- a/app/tauri-plugin-contacts-importer/Cargo.toml +++ b/app/tauri-plugin-contacts-importer/Cargo.toml @@ -15,4 +15,5 @@ serde_json = "1" thiserror = "2" [build-dependencies] -tauri-plugin = { version = "2.4.0", features = ["build"] } +tauri-plugin = { version = "2.5.1", features = ["build"] } +tauri-build = "2.5.1" diff --git a/app/tauri-plugin-contacts-importer/build.rs b/app/tauri-plugin-contacts-importer/build.rs index 5f707df1..f7d5550a 100644 --- a/app/tauri-plugin-contacts-importer/build.rs +++ b/app/tauri-plugin-contacts-importer/build.rs @@ -5,4 +5,4 @@ fn main() { .android_path("android") .ios_path("ios") .build(); -} +} \ No newline at end of file diff --git a/app/tauri-plugin-contacts-importer/ios/.gitignore b/app/tauri-plugin-contacts-importer/ios/.gitignore new file mode 100644 index 00000000..5922fdaa --- /dev/null +++ b/app/tauri-plugin-contacts-importer/ios/.gitignore @@ -0,0 +1,10 @@ +.DS_Store +/.build +/Packages +/*.xcodeproj +xcuserdata/ +DerivedData/ +.swiftpm/config/registries.json +.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata +.netrc +Package.resolved diff --git a/app/tauri-plugin-contacts-importer/ios/Package.swift b/app/tauri-plugin-contacts-importer/ios/Package.swift new file mode 100644 index 00000000..a537bedc --- /dev/null +++ b/app/tauri-plugin-contacts-importer/ios/Package.swift @@ -0,0 +1,32 @@ +// swift-tools-version:5.3 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "tauri-plugin-contacts-importer", + platforms: [ + .macOS(.v10_13), + .iOS(.v13), + ], + products: [ + // Products define the executables and libraries a package produces, and make them visible to other packages. + .library( + name: "tauri-plugin-contacts-importer", + type: .static, + targets: ["tauri-plugin-contacts-importer"]), + ], + dependencies: [ + .package(name: "Tauri", path: "../.tauri/tauri-api") + ], + targets: [ + // Targets are the basic building blocks of a package. A target can define a module or a test suite. + // Targets can depend on other targets in this package, and on products in packages this package depends on. + .target( + name: "tauri-plugin-contacts-importer", + dependencies: [ + .byName(name: "Tauri") + ], + path: "Sources") + ] +) diff --git a/app/tauri-plugin-contacts-importer/ios/README.md b/app/tauri-plugin-contacts-importer/ios/README.md new file mode 100644 index 00000000..7c43d788 --- /dev/null +++ b/app/tauri-plugin-contacts-importer/ios/README.md @@ -0,0 +1,3 @@ +# Tauri Plugin contacts-importer + +A description of this package. diff --git a/app/tauri-plugin-contacts-importer/ios/Sources/ExamplePlugin.swift b/app/tauri-plugin-contacts-importer/ios/Sources/ExamplePlugin.swift new file mode 100644 index 00000000..cd9bc050 --- /dev/null +++ b/app/tauri-plugin-contacts-importer/ios/Sources/ExamplePlugin.swift @@ -0,0 +1,28 @@ +import SwiftRs +import Tauri +import UIKit +import WebKit + +class PingArgs: Decodable { + let value: String? +} + +class ExamplePlugin: Plugin { + @objc public func import_contacts(_ invoke: Invoke) throws { + //let args = try invoke.parseArgs(PingArgs.self) + //invoke.resolve(["value": ""]) + } + @objc public func check_permissions(_ invoke: Invoke) throws { + //let args = try invoke.parseArgs(PingArgs.self) + //invoke.resolve(["value": ""]) + } + @objc public func request_permissions(_ invoke: Invoke) throws { + //let args = try invoke.parseArgs(PingArgs.self) + //invoke.resolve(["value": ""]) + } +} + +@_cdecl("init_plugin_contacts_importer") +func initPlugin() -> Plugin { + return ExamplePlugin() +} diff --git a/app/tauri-plugin-contacts-importer/ios/Tests/PluginTests/PluginTests.swift b/app/tauri-plugin-contacts-importer/ios/Tests/PluginTests/PluginTests.swift new file mode 100644 index 00000000..4f8e9ace --- /dev/null +++ b/app/tauri-plugin-contacts-importer/ios/Tests/PluginTests/PluginTests.swift @@ -0,0 +1,8 @@ +import XCTest +@testable import ExamplePlugin + +final class ExamplePluginTests: XCTestCase { + func testExample() throws { + let plugin = ExamplePlugin() + } +} diff --git a/app/tauri-plugin-contacts-importer/src/lib.rs b/app/tauri-plugin-contacts-importer/src/lib.rs index c392fe80..388d4e18 100644 --- a/app/tauri-plugin-contacts-importer/src/lib.rs +++ b/app/tauri-plugin-contacts-importer/src/lib.rs @@ -45,4 +45,4 @@ pub fn init() -> TauriPlugin { Ok(()) }) .build() -} +} \ No newline at end of file