From 013ba7828733fe9af8b521a73f8c35283af2cde3 Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Tue, 16 Jan 2024 13:35:42 -0800
Subject: [PATCH 1/3] chore: nx migrate @nativescript/plugin-tools

---
 .eslintignore                  | 1 +
 apps/demo-angular/package.json | 4 ++--
 package.json                   | 7 +++----
 workspace.json                 | 9 ---------
 4 files changed, 6 insertions(+), 15 deletions(-)
 create mode 100644 .eslintignore
 delete mode 100644 workspace.json

diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 00000000..3c3629e6
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1 @@
+node_modules
diff --git a/apps/demo-angular/package.json b/apps/demo-angular/package.json
index 3db47768..e8759f75 100644
--- a/apps/demo-angular/package.json
+++ b/apps/demo-angular/package.json
@@ -5,8 +5,8 @@
     "@triniwiz/nativescript-masonkit": "file:../../dist/packages/nativescript-masonkit"
   },
   "devDependencies": {
-    "@nativescript/android": "8.5.1",
-    "@nativescript/ios": "8.5.2",
+    "@nativescript/android": "^8.6.2",
+    "@nativescript/ios": "^8.6.3",
     "@nativescript/detox": "1.0.1",
     "detox": "20.1.1",
     "pixelmatch": "5.3.0",
diff --git a/package.json b/package.json
index 68cbee04..defcb2ed 100644
--- a/package.json
+++ b/package.json
@@ -28,9 +28,9 @@
     "@angular/platform-browser-dynamic": "^15.0.0",
     "@angular/router": "^15.0.0",
     "@nativescript/angular": "^15.0.0",
-    "@nativescript/core": "~8.4.0",
-    "@nativescript/plugin-tools": "5.0.3",
-    "@nativescript/types": "~8.4.0",
+    "@nativescript/core": "~8.6.0",
+    "@nativescript/plugin-tools": "5.1.0",
+    "@nativescript/types": "~8.6.0",
     "@nativescript/webpack": "~5.0.5",
     "@ngtools/webpack": "^15.0.0",
     "husky": "^8.0.0",
@@ -41,7 +41,6 @@
     "typescript": "~4.8.0",
     "zone.js": "~0.11.1",
     "@angular-devkit/build-angular": "^15.0.0",
-    "nativescript-permissions": "1.3.11",
     "cheerio": "^1.0.0-rc.12"
   },
   "lint-staged": {
diff --git a/workspace.json b/workspace.json
deleted file mode 100644
index 19b5934f..00000000
--- a/workspace.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "version": 2,
-  "projects": {
-    "demo": "apps/demo",
-    "demo-angular": "apps/demo-angular",
-    "nativescript-masonkit": "packages/nativescript-masonkit"
-  },
-  "$schema": "./node_modules/nx/schemas/workspace-schema.json"
-}

From 48a9e96452804db082994cc1611b98371ea04ce0 Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Tue, 16 Jan 2024 19:10:12 -0800
Subject: [PATCH 2/3] chore: cleanup mason setup

---
 apps/demo/src/main-page.xml                   |  1 -
 .../plugin-demos/nativescript-masonkit.xml    | 87 +++++++++----------
 tools/assets/App_Resources/Android/app.gradle |  5 +-
 tools/assets/App_Resources/iOS/Podfile        |  5 +-
 tools/assets/App_Resources/iOS/build.xcconfig |  1 +
 5 files changed, 49 insertions(+), 50 deletions(-)

diff --git a/apps/demo/src/main-page.xml b/apps/demo/src/main-page.xml
index 88af520f..8f6ec868 100644
--- a/apps/demo/src/main-page.xml
+++ b/apps/demo/src/main-page.xml
@@ -5,7 +5,6 @@
   <StackLayout class="p-20">
     <ScrollView class="h-full">
       <StackLayout>
-        <Button text="add a package first" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
 <Button text="nativescript-masonkit" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
       </StackLayout>
     </ScrollView>
diff --git a/apps/demo/src/plugin-demos/nativescript-masonkit.xml b/apps/demo/src/plugin-demos/nativescript-masonkit.xml
index dd714c03..1371106b 100644
--- a/apps/demo/src/plugin-demos/nativescript-masonkit.xml
+++ b/apps/demo/src/plugin-demos/nativescript-masonkit.xml
@@ -1,17 +1,17 @@
 <Page xmlns="http://schemas.nativescript.org/tns.xsd" navigatingTo="navigatingTo" class="p"
-      xmlns:ui="@triniwiz/nativescript-masonkit">
+  xmlns:ui="@triniwiz/nativescript-masonkit">
   <Page.actionBar>
     <ActionBar title="nativescript-masonkit" icon="" class="action-bar">
     </ActionBar>
   </Page.actionBar>
 
 
-    <!-- <ui:Flex class="flex-example" color="white">
+  <!-- <ui:Flex class="flex-example" color="white">
     <Label text="a" class="a"/>
     <Label text="b" class="b"/>
   </ui:Flex> -->
 
-  
+
 
 
   <!-- https://gridbyexample.com/examples/example5/ -->
@@ -21,30 +21,30 @@
   <ui:Grid class="wrapper-5">
 
     <ui:Grid class="box a">
-    <Label text="A" />
+      <Label text="A" />
     </ui:Grid>
 
-     <ui:Grid class="box b">
-    <Label text="B" />
+    <ui:Grid class="box b">
+      <Label text="B" />
     </ui:Grid>
 
-     <ui:Grid class="box c">
-    <Label text="C" />
+    <ui:Grid class="box c">
+      <Label text="C" />
     </ui:Grid>
 
-     <ui:Grid class="box d">
-    <Label text="D" />
+    <ui:Grid class="box d">
+      <Label text="D" />
     </ui:Grid>
   </ui:Grid>
 
- 
+
 
   <!--
   https://gridbyexample.com/examples/example26/ -->
 
 
 
-   <!-- <ui:Container class="wrapper-6">
+  <!-- <ui:Container class="wrapper-6">
     <ui:Container class="box a">
       <Label text="This is box A."></Label>
       <Label text="align-self: stretch"></Label>
@@ -66,9 +66,7 @@
     </ui:Container>
 
     <ui:Container class="box e">
-      <Label
-        textWrap="true"
-        text="Each of the boxes on the left has a grid area of 3 columns and 3 rows (we're counting the gutter col/row). So each covers the same size area as box A."></Label>
+      <Label textWrap="true" text="Each of the boxes on the left has a grid area of 3 columns and 3 rows (we're counting the gutter col/row). So each covers the same size area as box A."></Label>
       <Label text="The align-self property is used to align the content inside the grid-area."></Label>
     </ui:Container> 
 
@@ -96,13 +94,13 @@
       <ui:TSCView class="bg-red" width="100%" height="100%" flexDirection="column" backgroundColor="red" rows="auto,auto">
       <Label text="First"/>
       </ui:TSCView>
-       <ui:TSCView width="100%" height="100%"  flexDirection="column" backgroundColor="blue" rows="auto,auto">
+       <ui:TSCView width="100%" height="100%" flexDirection="column" backgroundColor="blue" rows="auto,auto">
       <Label text="Second"/>
       </ui:TSCView>
-       <ui:TSCView width="100%" height="100%"  flexDirection="column" backgroundColor="purple" rows="auto,auto">
+       <ui:TSCView width="100%" height="100%" flexDirection="column" backgroundColor="purple" rows="auto,auto">
       <Label text="Third"/>
       </ui:TSCView>
-       <ui:TSCView width="100%" height="100%"  flexDirection="column" backgroundColor="orange" rows="auto,auto">
+       <ui:TSCView width="100%" height="100%" flexDirection="column" backgroundColor="orange" rows="auto,auto">
       <Label text="Fourth"/>
       </ui:TSCView>
      </ui:TSCView>  -->
@@ -141,8 +139,7 @@
           <Button text="Test 4.3" tap="{{ testIt }}" class="btn btn-primary"/>
         </ui:TSCView>
 
-        <ui:TSCView width="100%" height="100%" class="p-20" backgroundColor="purple" flexDirection="column" width="100%"
-                    height="100%">
+        <ui:TSCView width="100%" height="100%" class="p-20" backgroundColor="purple" flexDirection="column" width="100%" height="100%">
           <Button text="Test 1.4" tap="{{ testIt }}" class="btn btn-primary"/>
           <Button text="Test 2.4" tap="{{ testIt }}" class="btn btn-primary"/>
           <Button text="Test 3.4" tap="{{ testIt }}" class="btn btn-primary"/>
@@ -163,47 +160,47 @@
        <ScrollView>
       <ui:TSCView class="p-20" backgroundColor="red" flexDirection="column">
       <Image width="100%" height="100%" src="https://picsum.photos/200/300"/>
-           <Button  text="Test 1" tap="{{ testIt }}" class="btn btn-primary"/>
-          <Button  text="Test 2" tap="{{ testIt }}" class="btn btn-primary"/>
-          <Button  text="Test 3" tap="{{ testIt }}" class="btn btn-primary"/>
-          <Button  text="Test 4" tap="{{ testIt }}" class="btn btn-primary"/>
+           <Button text="Test 1" tap="{{ testIt }}" class="btn btn-primary"/>
+          <Button text="Test 2" tap="{{ testIt }}" class="btn btn-primary"/>
+          <Button text="Test 3" tap="{{ testIt }}" class="btn btn-primary"/>
+          <Button text="Test 4" tap="{{ testIt }}" class="btn btn-primary"/>
 
           <Image src="https://picsum.photos/200/300"/>
 
           <ui:TSCView class="p-20" backgroundColor="green">
-          <Button  text="Test 1.1" tap="{{ testIt }}" class="btn btn-primary"/>
-          <Button  text="Test 2.1" tap="{{ testIt }}" class="btn btn-primary"/>
-          <Button  text="Test 3.1" tap="{{ testIt }}" class="btn btn-primary"/>
-          <Button  text="Test 4.1" tap="{{ testIt }}" class="btn btn-primary"/>
+          <Button text="Test 1.1" tap="{{ testIt }}" class="btn btn-primary"/>
+          <Button text="Test 2.1" tap="{{ testIt }}" class="btn btn-primary"/>
+          <Button text="Test 3.1" tap="{{ testIt }}" class="btn btn-primary"/>
+          <Button text="Test 4.1" tap="{{ testIt }}" class="btn btn-primary"/>
           </ui:TSCView>
 
           <ui:TSCView class="p-20" backgroundColor="blue">
-          <Button  text="Test 1.2" tap="{{ testIt }}" class="btn btn-primary"/>
-          <Button  text="Test 2.2" tap="{{ testIt }}" class="btn btn-primary"/>
-          <Button  text="Test 3.2" tap="{{ testIt }}" class="btn btn-primary"/>
-          <Button  text="Test 4.2" tap="{{ testIt }}" class="btn btn-primary"/>
+          <Button text="Test 1.2" tap="{{ testIt }}" class="btn btn-primary"/>
+          <Button text="Test 2.2" tap="{{ testIt }}" class="btn btn-primary"/>
+          <Button text="Test 3.2" tap="{{ testIt }}" class="btn btn-primary"/>
+          <Button text="Test 4.2" tap="{{ testIt }}" class="btn btn-primary"/>
           </ui:TSCView>
 
 
        <ui:TSCView class="p-20" backgroundColor="pink">
-          <Button  text="Test 1.3" tap="{{ testIt }}" class="btn btn-primary"/>
-          <Button  text="Test 2.3" tap="{{ testIt }}" class="btn btn-primary"/>
-          <Button  text="Test 3.3" tap="{{ testIt }}" class="btn btn-primary"/>
-          <Button  text="Test 4.3" tap="{{ testIt }}" class="btn btn-primary"/>
+          <Button text="Test 1.3" tap="{{ testIt }}" class="btn btn-primary"/>
+          <Button text="Test 2.3" tap="{{ testIt }}" class="btn btn-primary"/>
+          <Button text="Test 3.3" tap="{{ testIt }}" class="btn btn-primary"/>
+          <Button text="Test 4.3" tap="{{ testIt }}" class="btn btn-primary"/>
       </ui:TSCView>
 
-       <ui:TSCView width="100%" height="100%" class="p-20" backgroundColor="purple" >
-          <Button  text="Test 1.4" tap="{{ testIt }}" class="btn btn-primary"/>
-          <Button  text="Test 2.4" tap="{{ testIt }}" class="btn btn-primary"/>
-          <Button  text="Test 3.4" tap="{{ testIt }}" class="btn btn-primary"/>
-          <Button  text="Test 4.4" tap="{{ testIt }}" class="btn btn-primary"/>
+       <ui:TSCView width="100%" height="100%" class="p-20" backgroundColor="purple">
+          <Button text="Test 1.4" tap="{{ testIt }}" class="btn btn-primary"/>
+          <Button text="Test 2.4" tap="{{ testIt }}" class="btn btn-primary"/>
+          <Button text="Test 3.4" tap="{{ testIt }}" class="btn btn-primary"/>
+          <Button text="Test 4.4" tap="{{ testIt }}" class="btn btn-primary"/>
       </ui:TSCView>
 
           <ui:TSCView class="p-20" backgroundColor="yellow">
-          <Button  text="Test 1.5" tap="{{ testIt }}" class="btn btn-primary"/>
-          <Button  text="Test 2.5" tap="{{ testIt }}" class="btn btn-primary"/>
-          <Button  text="Test 3.5" tap="{{ testIt }}" class="btn btn-primary"/>
-          <Button  text="Test 4.5" tap="{{ testIt }}" class="btn btn-primary"/>
+          <Button text="Test 1.5" tap="{{ testIt }}" class="btn btn-primary"/>
+          <Button text="Test 2.5" tap="{{ testIt }}" class="btn btn-primary"/>
+          <Button text="Test 3.5" tap="{{ testIt }}" class="btn btn-primary"/>
+          <Button text="Test 4.5" tap="{{ testIt }}" class="btn btn-primary"/>
           </ui:TSCView>
       </ui:TSCView>
       </ScrollView> -->
diff --git a/tools/assets/App_Resources/Android/app.gradle b/tools/assets/App_Resources/Android/app.gradle
index 91cf7688..9677b26c 100644
--- a/tools/assets/App_Resources/Android/app.gradle
+++ b/tools/assets/App_Resources/Android/app.gradle
@@ -6,10 +6,11 @@
 //}
 
 android {
-  compileSdkVersion 33
+  compileSdkVersion 34
+  buildToolsVersion "34.0.0"
   defaultConfig {
     minSdkVersion 21
-    targetSdkVersion 33
+    targetSdkVersion 34
     multiDexEnabled true
     generatedDensities = []
     testBuildType System.getProperty('testBuildType', 'debug')
diff --git a/tools/assets/App_Resources/iOS/Podfile b/tools/assets/App_Resources/iOS/Podfile
index 3c8210b5..b3c1c495 100644
--- a/tools/assets/App_Resources/iOS/Podfile
+++ b/tools/assets/App_Resources/iOS/Podfile
@@ -3,7 +3,8 @@ platform :ios, '13.0'
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
-      config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
+      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
+      config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
     end
   end
-end
+end
\ No newline at end of file
diff --git a/tools/assets/App_Resources/iOS/build.xcconfig b/tools/assets/App_Resources/iOS/build.xcconfig
index e77e78db..08964126 100644
--- a/tools/assets/App_Resources/iOS/build.xcconfig
+++ b/tools/assets/App_Resources/iOS/build.xcconfig
@@ -4,3 +4,4 @@
 // To build for device with Xcode 8 you need to specify your development team. More info: https://developer.apple.com/library/prerelease/content/releasenotes/DeveloperTools/RN-Xcode/Introduction.html
 // DEVELOPMENT_TEAM = YOUR_TEAM_ID;
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+IPHONEOS_DEPLOYMENT_TARGET = 13.0
\ No newline at end of file

From 48cdf136bcb2ca5466fd02cb606d759da869252d Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Tue, 16 Jan 2024 19:37:56 -0800
Subject: [PATCH 3/3] fix: livesync

---
 apps/demo/package.json  | 2 +-
 apps/demo/tsconfig.json | 2 +-
 tsconfig.base.json      | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/demo/package.json b/apps/demo/package.json
index 8abf0f6f..fc255359 100644
--- a/apps/demo/package.json
+++ b/apps/demo/package.json
@@ -5,7 +5,7 @@
   "repository": "<fill-your-repository-here>",
   "dependencies": {
     "@nativescript/core": "file:../../node_modules/@nativescript/core",
-    "@triniwiz/nativescript-masonkit": "file:../../dist/packages/nativescript-masonkit"
+    "@triniwiz/nativescript-masonkit": "file:../../packages/nativescript-masonkit"
   },
   "devDependencies": {
     "@nativescript/android": "^8.6.2",
diff --git a/apps/demo/tsconfig.json b/apps/demo/tsconfig.json
index c8aa4893..a1df275c 100644
--- a/apps/demo/tsconfig.json
+++ b/apps/demo/tsconfig.json
@@ -6,7 +6,7 @@
     "paths": {
       "~/*": ["src/*"],
       "@demo/shared": ["../../tools/demo/index.ts"],
-      "@triniwiz/*": ["../../packages/*"]
+      "@triniwiz/nativescript-masonkit": ["../../packages/nativescript-masonkit/index.d.ts"]
     }
   }
 }
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 0ad61da4..16c0f088 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -21,7 +21,6 @@
     ],
     "paths": {
       "@demo/shared": ["tools/demo/index.ts"],
-      "@triniwiz/*": ["packages/*"],
       "@triniwiz/nativescript-masonkit": ["packages/nativescript-masonkit/index.d.ts"]
     }
   },