diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..41670c36 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "iced"] + path = iced + url = https://github.com/pop-os/iced.git + branch = sctk-cosmic diff --git a/Cargo.toml b/Cargo.toml index ad49852e..368fe3de 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,44 +27,33 @@ sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/c git = "https://github.com/pop-os/cosmic-theme.git" [dependencies.iced] -git = "https://github.com/pop-os/iced.git" -branch = "sctk-cosmic" -# path = "../iced" +path = "iced" default-features = false features = ["image", "svg"] [dependencies.iced_core] -git = "https://github.com/pop-os/iced.git" -branch = "sctk-cosmic" -# path = "../iced/core" +path = "iced/core" [dependencies.iced_lazy] -git = "https://github.com/pop-os/iced.git" -branch = "sctk-cosmic" -# path = "../iced/lazy" +path = "iced/lazy" [dependencies.iced_native] -git = "https://github.com/pop-os/iced.git" -branch = "sctk-cosmic" -# path = "../iced/native" +path = "iced/native" [dependencies.iced_style] -git = "https://github.com/pop-os/iced.git" -branch = "sctk-cosmic" -# path = "../iced/style" +path = "iced/style" [dependencies.iced_winit] -git = "https://github.com/pop-os/iced.git" -branch = "sctk-cosmic" +path = "iced/winit" optional = true -# path = "../iced/winit" [dependencies.iced_wgpu] -git = "https://github.com/pop-os/iced.git" -branch = "sctk-cosmic" -# path = "../iced/wgpu" +path = "iced/wgpu" [workspace] members = [ "examples/*", ] +exclude = [ + "iced", +] diff --git a/examples/cosmic-sctk/Cargo.toml b/examples/cosmic-sctk/Cargo.toml index cc6b607b..a599be57 100644 --- a/examples/cosmic-sctk/Cargo.toml +++ b/examples/cosmic-sctk/Cargo.toml @@ -7,4 +7,3 @@ publish = false [dependencies] libcosmic = { path = "../..", default-features = false, features = ["debug", "wayland"] } -# iced_sctk = { git = "https://github.com/pop-os/iced-sctk" } diff --git a/iced b/iced new file mode 160000 index 00000000..68d929f0 --- /dev/null +++ b/iced @@ -0,0 +1 @@ +Subproject commit 68d929f0e8b5e53d970c6dce39c9bd9e8433a534