Skip to content

Commit d01b2da

Browse files
triniwiztriniwiz
committed
feat: m1 support
1 parent ab4a94d commit d01b2da

File tree

159 files changed

+77471
-1017
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+77471
-1017
lines changed

‎CanvasNative.podspec

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
22

33
s.name = "CanvasNative"
44

5-
s.version = "1.0.0-alpha.11"
5+
s.version = "1.0.0-alpha.12"
66

77
s.summary = "A Canvas library"
88

@@ -19,8 +19,7 @@ Pod::Spec.new do |s|
1919

2020
s.pod_target_xcconfig = {
2121
'FRAMEWORK_SEARCH_PATHS' => '$(inherited) "${PODS_ROOT}/dist"',
22-
'ENABLE_BITCODE' => 'YES',
23-
'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => '"arm64"',
22+
'ENABLE_BITCODE' => 'YES'
2423
}
2524
s.swift_versions = ['4.0','4.2', '5.0']
2625
s.vendored_frameworks = 'packages/canvas/src-native/canvas-ios/dist/CanvasNative.xcframework'

‎apps/demo/nativescript.config.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,8 @@ export default {
1010
appPath: 'src',
1111
ios: {
1212
discardUncaughtJsExceptions: false
13+
},
14+
cli: {
15+
packageManager: 'npm'
1316
}
1417
} as NativeScriptConfig;

‎apps/demo/src/plugin-demos/canvas.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
</ActionBar>
55
</Page.actionBar>
66
<GridLayout loaded="{{ gridLoaded }}" rows="*,*" columns="*,*" iosOverflowSafeArea="false" width="100%" height="100%">
7-
<WebView rowSpan="2" colSpan="2" height="100%" width="100%" loaded="loaded"/>
8-
<!-- <canvas:Canvas rowSpan="2" colSpan="2" width="100%" height="100%" ready="{{ canvasLoaded }}"
9-
layoutChanged="{{ onLayout }}"/> -->
7+
<!-- <WebView rowSpan="2" colSpan="2" height="100%" width="100%" loaded="loaded"/> -->
8+
<canvas:Canvas rowSpan="2" colSpan="2" width="100%" height="100%" ready="{{ canvasLoaded }}"
9+
layoutChanged="{{ onLayout }}"/>
1010
<!-- <canvas:Svg id="1" width="100%" height="100%" src="{{src1}}" loaded="{{svgViewLoaded}}"/>
1111
<canvas:Svg id="2" col="1" width="100%" height="100%" src="{{src2}}" loaded="{{svgViewLoaded}}"/>
1212
<canvas:Svg id="3" row="1" width="100%" height="100%" src="{{src3}}" loaded="{{svgViewLoaded}}"/>

‎packages/canvas-babylon/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/canvas-babylon",
3-
"version": "1.0.0-beta.11",
3+
"version": "1.0.0-beta.12",
44
"description": "",
55
"main": "index",
66
"typings": "index.d.ts",

‎packages/canvas-media/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/canvas-media",
3-
"version": "0.13.7",
3+
"version": "0.13.8",
44
"description": "Canvas media",
55
"main": "index",
66
"typings": "index.d.ts",

‎packages/canvas-phaser-ce/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/canvas-phaser-ce",
3-
"version": "1.0.0-beta.11",
3+
"version": "1.0.0-beta.12",
44
"description": "Tools for using Phaser-ce to build native 2D games in NativeScript 👾",
55
"main": "index",
66
"typings": "index.d.ts",

‎packages/canvas-phaser/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/canvas-phaser",
3-
"version": "1.0.0-beta.11",
3+
"version": "1.0.0-beta.12",
44
"description": "Build awesome 2D games with Phaser.js and NativeScript",
55
"main": "index",
66
"typings": "index.d.ts",

‎packages/canvas-pixi/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/canvas-pixi",
3-
"version": "1.0.0-beta.12",
3+
"version": "1.0.0-beta.13",
44
"description": "Plugin for using pixi.js in NativeScript",
55
"main": "index",
66
"typings": "index.d.ts",

‎packages/canvas-polyfill/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/canvas-polyfill",
3-
"version": "1.0.0-beta.12",
3+
"version": "1.0.0-beta.13",
44
"description": "Polyfill for making NativeScript compatible with web libs like pixi.js, three.js, phaser.js, babylon.js, etc....",
55
"main": "index",
66
"typings": "index.d.ts",

‎packages/canvas-three/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/canvas-three",
3-
"version": "1.0.0-beta.11",
3+
"version": "1.0.0-beta.12",
44
"description": "Utilities for using THREE.js on NativeScript",
55
"main": "index",
66
"typings": "index.d.ts",

0 commit comments

Comments
 (0)