chore: move crates to root

NativeScript · Jun 19, 2024 · d5cd6fc · d5cd6fc
1 parent 89daed2
commit d5cd6fc
Show file tree

Hide file tree

Showing 171 changed files with 54 additions and 12,246 deletions.
diff --git a/...c-native/canvas-native/.cargo/config.toml → .cargo/config.toml b/...c-native/canvas-native/.cargo/config.toml → .cargo/config.toml
@@ -19,7 +19,6 @@ rustflags = [
 rustflags = [
   "-C", "link-arg=-undefined",
   "-C", "link-arg=dynamic_lookup",
-  "-C", "target-cpu=native",
   "-C", "panic=abort"
 ]
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -0,0 +1,24 @@
+[workspace]
+
+resolver = "2"
+
+members = [
+	"crates/gl-bindings",
+	"crates/canvas-core",
+	"crates/canvas-2d",
+	"crates/canvas-webgl",
+	"crates/canvas-android",
+	"crates/canvas-ios",
+	"crates/playground",
+	"crates/canvas-cxx",
+	"crates/canvas-c",
+	"crates/canvas-svg"]
+
+[profile.release]
+panic = "abort"
+codegen-units = 1
+lto = true
+opt-level = 3
+debug = false
+incremental = false
+strip = true
diff --git a/...native/canvas-native/canvas-2d/Cargo.toml → crates/canvas-2d/Cargo.toml b/...native/canvas-native/canvas-2d/Cargo.toml → crates/canvas-2d/Cargo.toml
@@ -19,6 +19,6 @@ csscolorparser = { git = "https://github.com/triniwiz/csscolorparser-rs.git", re
 #rgb = { version = "0.8.37", features = ["argb"] }
 log = "0.4.21"
 once_cell = "1.8.0"
-skia-safe = { version = "0.72.0", features = ["gl", "textlayout"] }
+skia-safe = { version = "0.75.0", features = ["gl", "textlayout"] }
 bytes = "1.5.0"
 env_logger = "0.11.2"
diff --git a/...t/compositing/composite_operation_type.rs → ...t/compositing/composite_operation_type.rs b/...t/compositing/composite_operation_type.rs → ...t/compositing/composite_operation_type.rs
diff --git a/.../canvas-2d/src/context/compositing/mod.rs → .../canvas-2d/src/context/compositing/mod.rs b/.../canvas-2d/src/context/compositing/mod.rs → .../canvas-2d/src/context/compositing/mod.rs
diff --git a/...nvas-2d/src/context/drawing_images/mod.rs → ...nvas-2d/src/context/drawing_images/mod.rs b/...nvas-2d/src/context/drawing_images/mod.rs → ...nvas-2d/src/context/drawing_images/mod.rs
diff --git a/...2d/src/context/drawing_paths/fill_rule.rs → ...2d/src/context/drawing_paths/fill_rule.rs b/...2d/src/context/drawing_paths/fill_rule.rs → ...2d/src/context/drawing_paths/fill_rule.rs
diff --git a/...anvas-2d/src/context/drawing_paths/mod.rs → ...anvas-2d/src/context/drawing_paths/mod.rs b/...anvas-2d/src/context/drawing_paths/mod.rs → ...anvas-2d/src/context/drawing_paths/mod.rs
diff --git a/...nvas-2d/src/context/drawing_rectangles.rs → ...nvas-2d/src/context/drawing_rectangles.rs b/...nvas-2d/src/context/drawing_rectangles.rs → ...nvas-2d/src/context/drawing_rectangles.rs
diff --git a/.../src/context/drawing_text/global_fonts.rs → .../src/context/drawing_text/global_fonts.rs b/.../src/context/drawing_text/global_fonts.rs → .../src/context/drawing_text/global_fonts.rs
diff --git a/...canvas-2d/src/context/drawing_text/mod.rs → ...canvas-2d/src/context/drawing_text/mod.rs b/...canvas-2d/src/context/drawing_text/mod.rs → ...canvas-2d/src/context/drawing_text/mod.rs
diff --git a/.../src/context/drawing_text/text_metrics.rs → .../src/context/drawing_text/text_metrics.rs b/.../src/context/drawing_text/text_metrics.rs → .../src/context/drawing_text/text_metrics.rs
diff --git a/...2d/src/context/drawing_text/typography.rs → ...2d/src/context/drawing_text/typography.rs b/...2d/src/context/drawing_text/typography.rs → ...2d/src/context/drawing_text/typography.rs
diff --git a/...rc/context/drawing_text/typography_old.rs → ...rc/context/drawing_text/typography_old.rs b/...rc/context/drawing_text/typography_old.rs → ...rc/context/drawing_text/typography_old.rs
diff --git a/...ontext/fill_and_stroke_styles/gradient.rs → ...ontext/fill_and_stroke_styles/gradient.rs b/...ontext/fill_and_stroke_styles/gradient.rs → ...ontext/fill_and_stroke_styles/gradient.rs
diff --git a/...src/context/fill_and_stroke_styles/mod.rs → ...src/context/fill_and_stroke_styles/mod.rs b/...src/context/fill_and_stroke_styles/mod.rs → ...src/context/fill_and_stroke_styles/mod.rs
diff --git a/...c/context/fill_and_stroke_styles/paint.rs → ...c/context/fill_and_stroke_styles/paint.rs b/...c/context/fill_and_stroke_styles/paint.rs → ...c/context/fill_and_stroke_styles/paint.rs
diff --git a/...context/fill_and_stroke_styles/pattern.rs → ...context/fill_and_stroke_styles/pattern.rs b/...context/fill_and_stroke_styles/pattern.rs → ...context/fill_and_stroke_styles/pattern.rs
diff --git a/...e/canvas-2d/src/context/filter_quality.rs → ...s/canvas-2d/src/context/filter_quality.rs b/...e/canvas-2d/src/context/filter_quality.rs → ...s/canvas-2d/src/context/filter_quality.rs
diff --git a/...s-native/canvas-2d/src/context/filters.rs → crates/canvas-2d/src/context/filters.rs b/...s-native/canvas-2d/src/context/filters.rs → crates/canvas-2d/src/context/filters.rs
diff --git a/...-2d/src/context/gradients_and_patterns.rs → ...-2d/src/context/gradients_and_patterns.rs b/...-2d/src/context/gradients_and_patterns.rs → ...-2d/src/context/gradients_and_patterns.rs
diff --git a/.../canvas-2d/src/context/image_smoothing.rs → .../canvas-2d/src/context/image_smoothing.rs b/.../canvas-2d/src/context/image_smoothing.rs → .../canvas-2d/src/context/image_smoothing.rs
diff --git a/...as-2d/src/context/line_styles/line_cap.rs → ...as-2d/src/context/line_styles/line_cap.rs b/...as-2d/src/context/line_styles/line_cap.rs → ...as-2d/src/context/line_styles/line_cap.rs
diff --git a/...s-2d/src/context/line_styles/line_join.rs → ...s-2d/src/context/line_styles/line_join.rs b/...s-2d/src/context/line_styles/line_join.rs → ...s-2d/src/context/line_styles/line_join.rs
diff --git a/.../canvas-2d/src/context/line_styles/mod.rs → .../canvas-2d/src/context/line_styles/mod.rs b/.../canvas-2d/src/context/line_styles/mod.rs → .../canvas-2d/src/context/line_styles/mod.rs
diff --git a/...as-native/canvas-2d/src/context/matrix.rs → crates/canvas-2d/src/context/matrix.rs b/...as-native/canvas-2d/src/context/matrix.rs → crates/canvas-2d/src/context/matrix.rs
diff --git a/...anvas-native/canvas-2d/src/context/mod.rs → crates/canvas-2d/src/context/mod.rs b/...anvas-native/canvas-2d/src/context/mod.rs → crates/canvas-2d/src/context/mod.rs
diff --git a/...ive/canvas-2d/src/context/non_standard.rs → crates/canvas-2d/src/context/non_standard.rs b/...ive/canvas-2d/src/context/non_standard.rs → crates/canvas-2d/src/context/non_standard.rs
diff --git a/...native/canvas-2d/src/context/paths/mod.rs → crates/canvas-2d/src/context/paths/mod.rs b/...native/canvas-2d/src/context/paths/mod.rs → crates/canvas-2d/src/context/paths/mod.rs
diff --git a/...ative/canvas-2d/src/context/paths/path.rs → crates/canvas-2d/src/context/paths/path.rs b/...ative/canvas-2d/src/context/paths/path.rs → crates/canvas-2d/src/context/paths/path.rs
diff --git a/.../context/pixel_manipulation/image_data.rs → .../context/pixel_manipulation/image_data.rs b/.../context/pixel_manipulation/image_data.rs → .../context/pixel_manipulation/image_data.rs
diff --git a/...-2d/src/context/pixel_manipulation/mod.rs → ...-2d/src/context/pixel_manipulation/mod.rs b/...-2d/src/context/pixel_manipulation/mod.rs → ...-2d/src/context/pixel_manipulation/mod.rs
diff --git a/...s-native/canvas-2d/src/context/shadows.rs → crates/canvas-2d/src/context/shadows.rs b/...s-native/canvas-2d/src/context/shadows.rs → crates/canvas-2d/src/context/shadows.rs
diff --git a/...vas-native/canvas-2d/src/context/state.rs → crates/canvas-2d/src/context/state.rs b/...vas-native/canvas-2d/src/context/state.rs → crates/canvas-2d/src/context/state.rs
diff --git a/...s-native/canvas-2d/src/context/surface.rs → crates/canvas-2d/src/context/surface.rs b/...s-native/canvas-2d/src/context/surface.rs → crates/canvas-2d/src/context/surface.rs
diff --git a/...ative/canvas-2d/src/context/surface_gl.rs → crates/canvas-2d/src/context/surface_gl.rs b/...ative/canvas-2d/src/context/surface_gl.rs → crates/canvas-2d/src/context/surface_gl.rs
diff --git a/...ive/canvas-2d/src/context/text_decoder.rs → crates/canvas-2d/src/context/text_decoder.rs b/...ive/canvas-2d/src/context/text_decoder.rs → crates/canvas-2d/src/context/text_decoder.rs
diff --git a/...ive/canvas-2d/src/context/text_encoder.rs → crates/canvas-2d/src/context/text_encoder.rs b/...ive/canvas-2d/src/context/text_encoder.rs → crates/canvas-2d/src/context/text_encoder.rs
diff --git a/.../canvas-2d/src/context/text_styles/mod.rs → .../canvas-2d/src/context/text_styles/mod.rs b/.../canvas-2d/src/context/text_styles/mod.rs → .../canvas-2d/src/context/text_styles/mod.rs
diff --git a/...-2d/src/context/text_styles/text_align.rs → ...-2d/src/context/text_styles/text_align.rs b/...-2d/src/context/text_styles/text_align.rs → ...-2d/src/context/text_styles/text_align.rs
diff --git a/.../src/context/text_styles/text_baseline.rs → .../src/context/text_styles/text_baseline.rs b/.../src/context/text_styles/text_baseline.rs → .../src/context/text_styles/text_baseline.rs
diff --git a/...src/context/text_styles/text_direction.rs → ...src/context/text_styles/text_direction.rs b/...src/context/text_styles/text_direction.rs → ...src/context/text_styles/text_direction.rs
diff --git a/.../canvas-2d/src/context/transformations.rs → .../canvas-2d/src/context/transformations.rs b/.../canvas-2d/src/context/transformations.rs → .../canvas-2d/src/context/transformations.rs
diff --git a/...vas-native/canvas-2d/src/ffi/f32_array.rs → crates/canvas-2d/src/ffi/f32_array.rs b/...vas-native/canvas-2d/src/ffi/f32_array.rs → crates/canvas-2d/src/ffi/f32_array.rs
diff --git a/...vas-native/canvas-2d/src/ffi/f64_array.rs → crates/canvas-2d/src/ffi/f64_array.rs b/...vas-native/canvas-2d/src/ffi/f64_array.rs → crates/canvas-2d/src/ffi/f64_array.rs
diff --git a/...vas-native/canvas-2d/src/ffi/i16_array.rs → crates/canvas-2d/src/ffi/i16_array.rs b/...vas-native/canvas-2d/src/ffi/i16_array.rs → crates/canvas-2d/src/ffi/i16_array.rs
diff --git a/...vas-native/canvas-2d/src/ffi/i32_array.rs → crates/canvas-2d/src/ffi/i32_array.rs b/...vas-native/canvas-2d/src/ffi/i32_array.rs → crates/canvas-2d/src/ffi/i32_array.rs
diff --git a/...nvas-native/canvas-2d/src/ffi/i8_array.rs → crates/canvas-2d/src/ffi/i8_array.rs b/...nvas-native/canvas-2d/src/ffi/i8_array.rs → crates/canvas-2d/src/ffi/i8_array.rs
diff --git a/...ve/canvas-native/canvas-2d/src/ffi/mod.rs → crates/canvas-2d/src/ffi/mod.rs b/...ve/canvas-native/canvas-2d/src/ffi/mod.rs → crates/canvas-2d/src/ffi/mod.rs
diff --git a/...ve/canvas-2d/src/ffi/paint_style_value.rs → ...es/canvas-2d/src/ffi/paint_style_value.rs b/...ve/canvas-2d/src/ffi/paint_style_value.rs → ...es/canvas-2d/src/ffi/paint_style_value.rs
diff --git a/...vas-native/canvas-2d/src/ffi/u16_array.rs → crates/canvas-2d/src/ffi/u16_array.rs b/...vas-native/canvas-2d/src/ffi/u16_array.rs → crates/canvas-2d/src/ffi/u16_array.rs
diff --git a/...vas-native/canvas-2d/src/ffi/u32_array.rs → crates/canvas-2d/src/ffi/u32_array.rs b/...vas-native/canvas-2d/src/ffi/u32_array.rs → crates/canvas-2d/src/ffi/u32_array.rs
diff --git a/...nvas-native/canvas-2d/src/ffi/u8_array.rs → crates/canvas-2d/src/ffi/u8_array.rs b/...nvas-native/canvas-2d/src/ffi/u8_array.rs → crates/canvas-2d/src/ffi/u8_array.rs
diff --git a/...nvas-native/canvas-2d/src/image_bitmap.rs → crates/canvas-2d/src/image_bitmap.rs b/...nvas-native/canvas-2d/src/image_bitmap.rs → crates/canvas-2d/src/image_bitmap.rs
diff --git a/...native/canvas-native/canvas-2d/src/ios.rs → crates/canvas-2d/src/ios.rs b/...native/canvas-native/canvas-2d/src/ios.rs → crates/canvas-2d/src/ios.rs
diff --git a/...native/canvas-native/canvas-2d/src/lib.rs → crates/canvas-2d/src/lib.rs b/...native/canvas-native/canvas-2d/src/lib.rs → crates/canvas-2d/src/lib.rs
diff --git a/...ve/canvas-native/canvas-2d/src/prelude.rs → crates/canvas-2d/src/prelude.rs b/...ve/canvas-native/canvas-2d/src/prelude.rs → crates/canvas-2d/src/prelude.rs
diff --git a/...anvas-native/canvas-2d/src/utils/color.rs → crates/canvas-2d/src/utils/color.rs b/...anvas-native/canvas-2d/src/utils/color.rs → crates/canvas-2d/src/utils/color.rs
diff --git a/...nvas-native/canvas-2d/src/utils/device.rs → crates/canvas-2d/src/utils/device.rs b/...nvas-native/canvas-2d/src/utils/device.rs → crates/canvas-2d/src/utils/device.rs
diff --git a/...-native/canvas-2d/src/utils/dimensions.rs → crates/canvas-2d/src/utils/dimensions.rs b/...-native/canvas-2d/src/utils/dimensions.rs → crates/canvas-2d/src/utils/dimensions.rs
diff --git a/...as-native/canvas-2d/src/utils/geometry.rs → crates/canvas-2d/src/utils/geometry.rs b/...as-native/canvas-2d/src/utils/geometry.rs → crates/canvas-2d/src/utils/geometry.rs
diff --git a/...e/canvas-native/canvas-2d/src/utils/gl.rs → crates/canvas-2d/src/utils/gl.rs b/...e/canvas-native/canvas-2d/src/utils/gl.rs → crates/canvas-2d/src/utils/gl.rs
diff --git a/...anvas-native/canvas-2d/src/utils/image.rs → crates/canvas-2d/src/utils/image.rs b/...anvas-native/canvas-2d/src/utils/image.rs → crates/canvas-2d/src/utils/image.rs
diff --git a/.../canvas-native/canvas-2d/src/utils/mod.rs → crates/canvas-2d/src/utils/mod.rs b/.../canvas-native/canvas-2d/src/utils/mod.rs → crates/canvas-2d/src/utils/mod.rs
diff --git a/...e/canvas-native/canvas-android/Cargo.toml → crates/canvas-android/Cargo.toml b/...e/canvas-native/canvas-android/Cargo.toml → crates/canvas-android/Cargo.toml
@@ -21,5 +21,5 @@ ndk = { version = "0.7.0", features = ["bitmap"] }
 libloading = "0.8.3"
 log = "0.4.20"
 android_logger = "0.13.1"
-skia-safe = { version = "0.72.0", features = ["gl", "textlayout"] }
+skia-safe = { version = "0.75.0", features = ["gl", "textlayout"] }
 itertools = "0.12.0"
diff --git a/...ive/canvas-native/canvas-android/build.rs → crates/canvas-android/build.rs b/...ive/canvas-native/canvas-android/build.rs → crates/canvas-android/build.rs
@@ -6,7 +6,7 @@ use std::path::Path;
 //const DEFAULT_CLANG_VERSION: &str = "14.0.7";
 const DEFAULT_CLANG_VERSION: &str = "12.0.9";
 fn main() {
-   // setup_aarch64_android_workaround();
+    setup_aarch64_android_workaround();
     // setup_x86_64_android_workaround();
     println!("cargo:rerun-if-changed=src/lib.rs");
     println!("cargo:rerun-if-changed=src/jni_compat/mod.rs");

diff --git a/...tive/canvas-android/src/jni_compat/mod.rs → crates/canvas-android/src/jni_compat/mod.rs b/...tive/canvas-android/src/jni_compat/mod.rs → crates/canvas-android/src/jni_compat/mod.rs
diff --git a/...mpat/org_nativescript_canvas_NSCCanvas.rs → ...mpat/org_nativescript_canvas_NSCCanvas.rs b/...mpat/org_nativescript_canvas_NSCCanvas.rs → ...mpat/org_nativescript_canvas_NSCCanvas.rs
diff --git a/...ipt_canvas_NSCCanvasRenderingContext2D.rs → ...ipt_canvas_NSCCanvasRenderingContext2D.rs b/...ipt_canvas_NSCCanvasRenderingContext2D.rs → ...ipt_canvas_NSCCanvasRenderingContext2D.rs
diff --git a/.../org_nativescript_canvas_NSCImageAsset.rs → .../org_nativescript_canvas_NSCImageAsset.rs b/.../org_nativescript_canvas_NSCImageAsset.rs → .../org_nativescript_canvas_NSCImageAsset.rs
diff --git a/...script_canvas_NSCWebGLRenderingContext.rs → ...script_canvas_NSCWebGLRenderingContext.rs b/...script_canvas_NSCWebGLRenderingContext.rs → ...script_canvas_NSCWebGLRenderingContext.rs
diff --git a/...e/canvas-native/canvas-android/src/lib.rs → crates/canvas-android/src/lib.rs b/...e/canvas-native/canvas-android/src/lib.rs → crates/canvas-android/src/lib.rs
diff --git a/...native/canvas-android/src/utils/gl/mod.rs → crates/canvas-android/src/utils/gl/mod.rs b/...native/canvas-android/src/utils/gl/mod.rs → crates/canvas-android/src/utils/gl/mod.rs
diff --git a/...-native/canvas-android/src/utils/gl/st.rs → crates/canvas-android/src/utils/gl/st.rs b/...-native/canvas-android/src/utils/gl/st.rs → crates/canvas-android/src/utils/gl/st.rs
diff --git a/...s-android/src/utils/gl/surface_texture.rs → ...s-android/src/utils/gl/surface_texture.rs b/...s-android/src/utils/gl/surface_texture.rs → ...s-android/src/utils/gl/surface_texture.rs
diff --git a/...as-android/src/utils/gl/texture_render.rs → ...as-android/src/utils/gl/texture_render.rs b/...as-android/src/utils/gl/texture_render.rs → ...as-android/src/utils/gl/texture_render.rs
diff --git a/.../src/utils/gl/webgl2_rendering_context.rs → .../src/utils/gl/webgl2_rendering_context.rs b/.../src/utils/gl/webgl2_rendering_context.rs → .../src/utils/gl/webgl2_rendering_context.rs
diff --git a/...d/src/utils/gl/webgl_rendering_context.rs → ...d/src/utils/gl/webgl_rendering_context.rs b/...d/src/utils/gl/webgl_rendering_context.rs → ...d/src/utils/gl/webgl_rendering_context.rs
diff --git a/...-native/canvas-android/src/utils/image.rs → crates/canvas-android/src/utils/image.rs b/...-native/canvas-android/src/utils/image.rs → crates/canvas-android/src/utils/image.rs
diff --git a/...as-native/canvas-android/src/utils/mod.rs → crates/canvas-android/src/utils/mod.rs b/...as-native/canvas-android/src/utils/mod.rs → crates/canvas-android/src/utils/mod.rs
diff --git a/...ve/canvas-native/canvas-android/wrapper.h → crates/canvas-android/wrapper.h b/...ve/canvas-native/canvas-android/wrapper.h → crates/canvas-android/wrapper.h
diff --git a/...tive/canvas-native/canvas-c/cbindgen.toml → crates/canvas-c/cbindgen.toml b/...tive/canvas-native/canvas-c/cbindgen.toml → crates/canvas-c/cbindgen.toml
diff --git a/...ive/canvas-native/canvas-c/src/buffers.rs → crates/canvas-c/src/buffers.rs b/...ive/canvas-native/canvas-c/src/buffers.rs → crates/canvas-c/src/buffers.rs
@@ -189,6 +189,13 @@ impl From<Vec<String>> for StringBuffer {
     }
 }
 
+// todo use convert StringBuffer to enum
+impl From<Vec<&str>> for StringBuffer {
+    fn from(value: Vec<&str>) -> Self {
+        Self(value.into_iter().map(|v| v.to_string()).collect())
+    }
+}
+
 impl StringBuffer {
     pub fn get_buffer(&self) -> &[String] {
         self.0.as_slice()

diff --git a/...nvas-native/canvas-c/src/choreographer.rs → crates/canvas-c/src/choreographer.rs b/...nvas-native/canvas-c/src/choreographer.rs → crates/canvas-c/src/choreographer.rs
diff --git a/...e/canvas-native/canvas-c/src/impl_test.rs → crates/canvas-c/src/impl_test.rs b/...e/canvas-native/canvas-c/src/impl_test.rs → crates/canvas-c/src/impl_test.rs
diff --git a/...canvas-native/canvas-c/src/raf/android.rs → crates/canvas-c/src/raf/android.rs b/...canvas-native/canvas-c/src/raf/android.rs → crates/canvas-c/src/raf/android.rs
diff --git a/...ive/canvas-native/canvas-c/src/raf/ios.rs → crates/canvas-c/src/raf/ios.rs b/...ive/canvas-native/canvas-c/src/raf/ios.rs → crates/canvas-c/src/raf/ios.rs
diff --git a/...ive/canvas-native/canvas-c/src/raf/mod.rs → crates/canvas-c/src/raf/mod.rs b/...ive/canvas-native/canvas-c/src/raf/mod.rs → crates/canvas-c/src/raf/mod.rs
diff --git a/...tive/canvas-native/canvas-core/Cargo.toml → crates/canvas-core/Cargo.toml b/...tive/canvas-native/canvas-core/Cargo.toml → crates/canvas-core/Cargo.toml
@@ -12,7 +12,7 @@ gl-bindings = { path = "../gl-bindings" }
 raw-window-handle = "0.5.2"
 parking_lot = "0.12.0"
 stb_image = { git = "https://github.com/triniwiz/rust-stb-image", rev = "869380b" }
-skia-safe = { version = "0.72.0", features = ["gl", "textlayout"], optional = true }
+skia-safe = { version = "0.75.0", features = ["gl", "textlayout"], optional = true }
 once_cell = "1.19.0"
 log = "0.4.21"
 

diff --git a/...ive/canvas-core/src/context_attributes.rs → crates/canvas-core/src/context_attributes.rs b/...ive/canvas-core/src/context_attributes.rs → crates/canvas-core/src/context_attributes.rs
diff --git a/...nvas-native/canvas-core/src/gl/android.rs → crates/canvas-core/src/gl/android.rs b/...nvas-native/canvas-core/src/gl/android.rs → crates/canvas-core/src/gl/android.rs
diff --git a/...e/canvas-native/canvas-core/src/gl/ios.rs → crates/canvas-core/src/gl/ios.rs b/...e/canvas-native/canvas-core/src/gl/ios.rs → crates/canvas-core/src/gl/ios.rs
diff --git a/...e/canvas-native/canvas-core/src/gl/mac.rs → crates/canvas-core/src/gl/mac.rs b/...e/canvas-native/canvas-core/src/gl/mac.rs → crates/canvas-core/src/gl/mac.rs
diff --git a/...e/canvas-native/canvas-core/src/gl/mod.rs → crates/canvas-core/src/gl/mod.rs b/...e/canvas-native/canvas-core/src/gl/mod.rs → crates/canvas-core/src/gl/mod.rs
diff --git a/...vas-native/canvas-core/src/image_asset.rs → crates/canvas-core/src/image_asset.rs b/...vas-native/canvas-core/src/image_asset.rs → crates/canvas-core/src/image_asset.rs
diff --git a/...tive/canvas-native/canvas-core/src/lib.rs → crates/canvas-core/src/lib.rs b/...tive/canvas-native/canvas-core/src/lib.rs → crates/canvas-core/src/lib.rs
diff --git a/...ative/canvas-native/canvas-cxx/Cargo.toml → crates/canvas-cxx/Cargo.toml b/...ative/canvas-native/canvas-cxx/Cargo.toml → crates/canvas-cxx/Cargo.toml
diff --git a/...-native/canvas-native/canvas-cxx/build.rs → crates/canvas-cxx/build.rs b/...-native/canvas-native/canvas-cxx/build.rs → crates/canvas-cxx/build.rs
diff --git a/...vas-native/canvas-cxx/src/choregrapher.rs → crates/canvas-cxx/src/choregrapher.rs b/...vas-native/canvas-cxx/src/choregrapher.rs → crates/canvas-cxx/src/choregrapher.rs
diff --git a/...ative/canvas-native/canvas-cxx/src/lib.rs → crates/canvas-cxx/src/lib.rs b/...ative/canvas-native/canvas-cxx/src/lib.rs → crates/canvas-cxx/src/lib.rs
diff --git a/...nvas-native/canvas-cxx/src/raf/android.rs → crates/canvas-cxx/src/raf/android.rs b/...nvas-native/canvas-cxx/src/raf/android.rs → crates/canvas-cxx/src/raf/android.rs
diff --git a/...e/canvas-native/canvas-cxx/src/raf/ios.rs → crates/canvas-cxx/src/raf/ios.rs b/...e/canvas-native/canvas-cxx/src/raf/ios.rs → crates/canvas-cxx/src/raf/ios.rs
diff --git a/...e/canvas-native/canvas-cxx/src/raf/mod.rs → crates/canvas-cxx/src/raf/mod.rs b/...e/canvas-native/canvas-cxx/src/raf/mod.rs → crates/canvas-cxx/src/raf/mod.rs
diff --git a/...ative/canvas-native/canvas-ffi/Cargo.toml → crates/canvas-ffi/Cargo.toml b/...ative/canvas-native/canvas-ffi/Cargo.toml → crates/canvas-ffi/Cargo.toml
diff --git a/...-native/canvas-native/canvas-ffi/build.rs → crates/canvas-ffi/build.rs b/...-native/canvas-native/canvas-ffi/build.rs → crates/canvas-ffi/build.rs
diff --git a/...ve/canvas-native/canvas-ffi/cbindgen.toml → crates/canvas-ffi/cbindgen.toml b/...ve/canvas-native/canvas-ffi/cbindgen.toml → crates/canvas-ffi/cbindgen.toml
diff --git a/...ve/canvas-native/canvas-ffi/src/arrays.rs → crates/canvas-ffi/src/arrays.rs b/...ve/canvas-native/canvas-ffi/src/arrays.rs → crates/canvas-ffi/src/arrays.rs
diff --git a/...e/canvas-native/canvas-ffi/src/context.rs → crates/canvas-ffi/src/context.rs b/...e/canvas-native/canvas-ffi/src/context.rs → crates/canvas-ffi/src/context.rs
diff --git a/...native/canvas-native/canvas-ffi/src/gl.rs → crates/canvas-ffi/src/gl.rs b/...native/canvas-native/canvas-ffi/src/gl.rs → crates/canvas-ffi/src/gl.rs
diff --git a/.../canvas-native/canvas-ffi/src/gradient.rs → crates/canvas-ffi/src/gradient.rs b/.../canvas-native/canvas-ffi/src/gradient.rs → crates/canvas-ffi/src/gradient.rs
diff --git a/...nvas-native/canvas-ffi/src/image_asset.rs → crates/canvas-ffi/src/image_asset.rs b/...nvas-native/canvas-ffi/src/image_asset.rs → crates/canvas-ffi/src/image_asset.rs
diff --git a/...vas-native/canvas-ffi/src/image_bitmap.rs → crates/canvas-ffi/src/image_bitmap.rs b/...vas-native/canvas-ffi/src/image_bitmap.rs → crates/canvas-ffi/src/image_bitmap.rs
diff --git a/...anvas-native/canvas-ffi/src/image_data.rs → crates/canvas-ffi/src/image_data.rs b/...anvas-native/canvas-ffi/src/image_data.rs → crates/canvas-ffi/src/image_data.rs
diff --git a/...ative/canvas-native/canvas-ffi/src/lib.rs → crates/canvas-ffi/src/lib.rs b/...ative/canvas-native/canvas-ffi/src/lib.rs → crates/canvas-ffi/src/lib.rs
diff --git a/...ve/canvas-native/canvas-ffi/src/matrix.rs → crates/canvas-ffi/src/matrix.rs b/...ve/canvas-native/canvas-ffi/src/matrix.rs → crates/canvas-ffi/src/matrix.rs
diff --git a/...ive/canvas-native/canvas-ffi/src/paint.rs → crates/canvas-ffi/src/paint.rs b/...ive/canvas-native/canvas-ffi/src/paint.rs → crates/canvas-ffi/src/paint.rs
diff --git a/...tive/canvas-native/canvas-ffi/src/path.rs → crates/canvas-ffi/src/path.rs b/...tive/canvas-native/canvas-ffi/src/path.rs → crates/canvas-ffi/src/path.rs
diff --git a/...e/canvas-native/canvas-ffi/src/pattern.rs → crates/canvas-ffi/src/pattern.rs b/...e/canvas-native/canvas-ffi/src/pattern.rs → crates/canvas-ffi/src/pattern.rs
diff --git a/...ative/canvas-native/canvas-ffi/src/svg.rs → crates/canvas-ffi/src/svg.rs b/...ative/canvas-native/canvas-ffi/src/svg.rs → crates/canvas-ffi/src/svg.rs
diff --git a/...vas-native/canvas-ffi/src/text_decoder.rs → crates/canvas-ffi/src/text_decoder.rs b/...vas-native/canvas-ffi/src/text_decoder.rs → crates/canvas-ffi/src/text_decoder.rs
diff --git a/...vas-native/canvas-ffi/src/text_encoder.rs → crates/canvas-ffi/src/text_encoder.rs b/...vas-native/canvas-ffi/src/text_encoder.rs → crates/canvas-ffi/src/text_encoder.rs
diff --git a/...vas-native/canvas-ffi/src/text_metrics.rs → crates/canvas-ffi/src/text_metrics.rs b/...vas-native/canvas-ffi/src/text_metrics.rs → crates/canvas-ffi/src/text_metrics.rs
diff --git a/.../canvas-native/canvas-ffi/src/utils/gl.rs → crates/canvas-ffi/src/utils/gl.rs b/.../canvas-native/canvas-ffi/src/utils/gl.rs → crates/canvas-ffi/src/utils/gl.rs
diff --git a/...canvas-native/canvas-ffi/src/utils/mod.rs → crates/canvas-ffi/src/utils/mod.rs b/...canvas-native/canvas-ffi/src/utils/mod.rs → crates/canvas-ffi/src/utils/mod.rs
diff --git a/...ative/canvas-native/canvas-ios/Cargo.toml → crates/canvas-ios/Cargo.toml b/...ative/canvas-native/canvas-ios/Cargo.toml → crates/canvas-ios/Cargo.toml
@@ -3,9 +3,6 @@ name = "canvas-ios"
 version = "2.0.0"
 edition = "2021"
 
-[build]
-rustflags = ["-Cpanic=abort", "-C target-cpu=native"]
-
 [lib]
 name = "canvasnative"
 crate-type = ["staticlib"]
@@ -21,6 +18,6 @@ ureq = "2.9.1"
 parking_lot = "0.12.0"
 once_cell = "1.10.0"
 utf16string = "0.2.0"
-log = "0.4.17"
+log = "0.4.21"
 env_logger = "0.11.2"
-skia-safe = { version = "0.72.0", features = ["gl", "textlayout"] }
+skia-safe = { version = "0.75.0", features = ["gl", "textlayout"] }
diff --git a/...ve/canvas-native/canvas-ios/cbindgen.toml → crates/canvas-ios/cbindgen.toml b/...ve/canvas-native/canvas-ios/cbindgen.toml → crates/canvas-ios/cbindgen.toml
diff --git a/...ative/canvas-native/canvas-ios/src/lib.rs → crates/canvas-ios/src/lib.rs b/...ative/canvas-native/canvas-ios/src/lib.rs → crates/canvas-ios/src/lib.rs
diff --git a/crates/canvas-svg/Cargo.toml b/crates/canvas-svg/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "canvas-svg"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+name = "canvassvg"
+crate-type = ["staticlib", "cdylib"]
+
+
+
+[dependencies]
+skia-safe = { version = "0.75.0", features = ["svg", "textlayout"] }
+
+[target.'cfg(target_os = "android")'.dependencies]
+jni = "0.21.1"
+ndk = { version = "0.7.0", features = ["bitmap"] }
diff --git a/...canvas-svg/src-native/canvas-svg/build.rs → crates/canvas-svg/build.rs b/...canvas-svg/src-native/canvas-svg/build.rs → crates/canvas-svg/build.rs
diff --git a/...s-svg/src-native/canvas-svg/cbindgen.toml → crates/canvas-svg/cbindgen.toml b/...s-svg/src-native/canvas-svg/cbindgen.toml → crates/canvas-svg/cbindgen.toml
diff --git a/...-svg/src-native/canvas-svg/src/android.rs → crates/canvas-svg/src/android.rs b/...-svg/src-native/canvas-svg/src/android.rs → crates/canvas-svg/src/android.rs
diff --git a/...nvas-svg/src-native/canvas-svg/src/ios.rs → crates/canvas-svg/src/ios.rs b/...nvas-svg/src-native/canvas-svg/src/ios.rs → crates/canvas-svg/src/ios.rs
diff --git a/...nvas-svg/src-native/canvas-svg/src/lib.rs → crates/canvas-svg/src/lib.rs b/...nvas-svg/src-native/canvas-svg/src/lib.rs → crates/canvas-svg/src/lib.rs
diff --git a/...ive/canvas-native/canvas-webgl/Cargo.toml → crates/canvas-webgl/Cargo.toml b/...ive/canvas-native/canvas-webgl/Cargo.toml → crates/canvas-webgl/Cargo.toml
diff --git a/...ive/canvas-native/canvas-webgl/src/lib.rs → crates/canvas-webgl/src/lib.rs b/...ive/canvas-native/canvas-webgl/src/lib.rs → crates/canvas-webgl/src/lib.rs
diff --git a/...canvas-native/canvas-webgl/src/prelude.rs → crates/canvas-webgl/src/prelude.rs b/...canvas-native/canvas-webgl/src/prelude.rs → crates/canvas-webgl/src/prelude.rs
diff --git a/...anvas-native/canvas-webgl/src/utils/gl.rs → crates/canvas-webgl/src/utils/gl.rs b/...anvas-native/canvas-webgl/src/utils/gl.rs → crates/canvas-webgl/src/utils/gl.rs
diff --git a/...nvas-native/canvas-webgl/src/utils/mod.rs → crates/canvas-webgl/src/utils/mod.rs b/...nvas-native/canvas-webgl/src/utils/mod.rs → crates/canvas-webgl/src/utils/mod.rs
diff --git a/...e/canvas-native/canvas-webgl/src/webgl.rs → crates/canvas-webgl/src/webgl.rs b/...e/canvas-native/canvas-webgl/src/webgl.rs → crates/canvas-webgl/src/webgl.rs
diff --git a/.../canvas-native/canvas-webgl/src/webgl2.rs → crates/canvas-webgl/src/webgl2.rs b/.../canvas-native/canvas-webgl/src/webgl2.rs → crates/canvas-webgl/src/webgl2.rs
diff --git a/...tive/canvas-native/gl-bindings/.gitignore → crates/gl-bindings/.gitignore b/...tive/canvas-native/gl-bindings/.gitignore → crates/gl-bindings/.gitignore
diff --git a/...tive/canvas-native/gl-bindings/Cargo.toml → crates/gl-bindings/Cargo.toml b/...tive/canvas-native/gl-bindings/Cargo.toml → crates/gl-bindings/Cargo.toml
diff --git a/...native/canvas-native/gl-bindings/build.rs → crates/gl-bindings/build.rs b/...native/canvas-native/gl-bindings/build.rs → crates/gl-bindings/build.rs
diff --git a/...tive/canvas-native/gl-bindings/src/lib.rs → crates/gl-bindings/src/lib.rs b/...tive/canvas-native/gl-bindings/src/lib.rs → crates/gl-bindings/src/lib.rs
diff --git a/...ative/canvas-native/gl-bindings/wrapper.h → crates/gl-bindings/wrapper.h b/...ative/canvas-native/gl-bindings/wrapper.h → crates/gl-bindings/wrapper.h
diff --git a/...ative/canvas-native/playground/Cargo.toml → crates/playground/Cargo.toml b/...ative/canvas-native/playground/Cargo.toml → crates/playground/Cargo.toml
diff --git a/...ative/canvas-native/playground/src/fs.txt → crates/playground/src/fs.txt b/...ative/canvas-native/playground/src/fs.txt → crates/playground/src/fs.txt
diff --git a/...tive/canvas-native/playground/src/main.rs → crates/playground/src/main.rs b/...tive/canvas-native/playground/src/main.rs → crates/playground/src/main.rs
diff --git a/...ive/canvas-native/playground/src/svh.jpeg → crates/playground/src/svh.jpeg b/...ive/canvas-native/playground/src/svh.jpeg → crates/playground/src/svh.jpeg
diff --git a/...ative/canvas-native/playground/src/vs.txt → crates/playground/src/vs.txt b/...ative/canvas-native/playground/src/vs.txt → crates/playground/src/vs.txt
diff --git a/packages/canvas-svg/src-native/canvas-svg/.gitignore b/packages/canvas-svg/src-native/canvas-svg/.gitignore
diff --git a/packages/canvas-svg/src-native/canvas-svg/.idea/.gitignore b/packages/canvas-svg/src-native/canvas-svg/.idea/.gitignore
diff --git a/packages/canvas-svg/src-native/canvas-svg/.idea/canvas-svg.iml b/packages/canvas-svg/src-native/canvas-svg/.idea/canvas-svg.iml
diff --git a/packages/canvas-svg/src-native/canvas-svg/.idea/modules.xml b/packages/canvas-svg/src-native/canvas-svg/.idea/modules.xml
diff --git a/packages/canvas-svg/src-native/canvas-svg/.idea/vcs.xml b/packages/canvas-svg/src-native/canvas-svg/.idea/vcs.xml
diff --git a/packages/canvas-svg/src-native/canvas-svg/Cargo.toml b/packages/canvas-svg/src-native/canvas-svg/Cargo.toml
diff --git a/packages/canvas/src-native/canvas-native/.gitignore b/packages/canvas/src-native/canvas-native/.gitignore
diff --git a/packages/canvas/src-native/canvas-native/.idea/.gitignore b/packages/canvas/src-native/canvas-native/.idea/.gitignore