Merge tag 'v2.1.1' into develop

Author: Tanner Blair

LVJSON Build Specification.vipb

@@ -1,15 +1,15 @@
-<VI_Package_Builder_Settings Version="2017" Created_Date="2017-08-08 12:01:46" Modified_Date="2018-02-01 18:05:44" Creator="tblair" Comments="" ID="aa89afed0b1a99d2996594660fad5b11">
+<VI_Package_Builder_Settings Version="2017" Created_Date="2017-08-08 12:01:46" Modified_Date="2018-05-04 13:59:55" Creator="tblair" Comments="" ID="1efce55d59ea4af28d8d0a9c079e96bc">
   <Library_General_Settings>
     <Package_File_Name>NI_lib_LVJSON</Package_File_Name>
-    <Library_Version>2.1.0.68</Library_Version>
+    <Library_Version>2.1.1.69</Library_Version>
     <Auto_Increment_Version>false</Auto_Increment_Version>
     <Library_Source_Folder>Source</Library_Source_Folder>
     <Library_Output_Folder>Builds</Library_Output_Folder>
     <Company_Name>National Instruments</Company_Name>
     <Library_Summary/>
     <Library_License>Apache 2.0</Library_License>
     <Package_LabVIEW_Version>16.0</Package_LabVIEW_Version>
-    <Community_Edition>false</Community_Edition>
+    <Community_Edition>true</Community_Edition>
     <Package_Icon>00000D7E002800000C9A00000400000200020022002200080000000000FFFFFF00FF80000000FFFFFFFFFFFF0000FFFFFFFFCCCC0000FFFFFFFF99990000FFFFFFFF66660000FFFFFFFF33330000FFFFFFFF00000000FFFFCCCCFFFF0000FFFFCCCCCCCC0000FFFFCCCC99990000FFFFCCCC66660000FFFFCCCC33330000FFFFCCCC00000000FFFF9999FFFF0000FFFF9999CCCC0000FFFF999999990000FFFF999966660000FFFF999933330000FFFF999900000000FFFF6666FFFF0000FFFF6666CCCC0000FFFF666699990000FFFF666666660000FFFF666633330000FFFF666600000000FFFF3333FFFF0000FFFF3333CCCC0000FFFF333399990000FFFF333366660000FFFF333333330000FFFF333300000000FFFF0000FFFF0000FFFF0000CCCC0000FFFF000099990000FFFF000066660000FFFF000033330000FFFF000000000000CCCCFFFFFFFF0000CCCCFFFFCCCC0000CCCCFFFF99990000CCCCFFFF66660000CCCCFFFF33330000CCCCFFFF00000000CCCCCCCCFFFF0000CCCCCCCCCCCC0000CCCCCCCC99990000CCCCCCCC66660000CCCCCCCC33330000CCCCCCCC00000000CCCC9999FFFF0000CCCC9999CCCC0000CCCC999999990000CCCC999966660000CCCC999933330000CCCC999900000000CCCC6666FFFF0000CCCC6666CCCC0000CCCC666699990000CCCC666666660000CCCC666633330000CCCC666600000000CCCC3333FFFF0000CCCC3333CCCC0000CCCC333399990000CCCC333366660000CCCC333333330000CCCC333300000000CCCC0000FFFF0000CCCC0000CCCC0000CCCC000099990000CCCC000066660000CCCC000033330000CCCC0000000000009999FFFFFFFF00009999FFFFCCCC00009999FFFF999900009999FFFF666600009999FFFF333300009999FFFF000000009999CCCCFFFF00009999CCCCCCCC00009999CCCC999900009999CCCC666600009999CCCC333300009999CCCC0000000099999999FFFF000099999999CCCC0000999999999999000099999999666600009999999933330000999999990000000099996666FFFF000099996666CCCC0000999966669999000099996666666600009999666633330000999966660000000099993333FFFF000099993333CCCC0000999933339999000099993333666600009999333333330000999933330000000099990000FFFF000099990000CCCC000099990000999900009999000066660000999900003333000099990000000000006666FFFFFFFF00006666FFFFCCCC00006666FFFF999900006666FFFF666600006666FFFF333300006666FFFF000000006666CCCCFFFF00006666CCCCCCCC00006666CCCC999900006666CCCC666600006666CCCC333300006666CCCC0000000066669999FFFF000066669999CCCC0000666699999999000066669999666600006666999933330000666699990000000066666666FFFF000066666666CCCC0000666666669999000066666666666600006666666633330000666666660000000066663333FFFF000066663333CCCC0000666633339999000066663333666600006666333333330000666633330000000066660000FFFF000066660000CCCC000066660000999900006666000066660000666600003333000066660000000000003333FFFFFFFF00003333FFFFCCCC00003333FFFF999900003333FFFF666600003333FFFF333300003333FFFF000000003333CCCCFFFF00003333CCCCCCCC00003333CCCC999900003333CCCC666600003333CCCC333300003333CCCC0000000033339999FFFF000033339999CCCC0000333399999999000033339999666600003333999933330000333399990000000033336666FFFF000033336666CCCC0000333366669999000033336666666600003333666633330000333366660000000033333333FFFF000033333333CCCC0000333333339999000033333333666600003333333333330000333333330000000033330000FFFF000033330000CCCC000033330000999900003333000066660000333300003333000033330000000000000000FFFFFFFF00000000FFFFCCCC00000000FFFF999900000000FFFF666600000000FFFF333300000000FFFF000000000000CCCCFFFF00000000CCCCCCCC00000000CCCC999900000000CCCC666600000000CCCC333300000000CCCC0000000000009999FFFF000000009999CCCC0000000099999999000000009999666600000000999933330000000099990000000000006666FFFF000000006666CCCC0000000066669999000000006666666600000000666633330000000066660000000000003333FFFF000000003333CCCC0000000033339999000000003333666600000000333333330000000033330000000000000000FFFF000000000000CCCC0000000000009999000000000000666600000000000033330000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000000000000000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000000000000000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000EEEEEEEEEEEE0000DDDDDDDDDDDD0000BBBBBBBBBBBB0000AAAAAAAAAAAA000088888888888800007777777777770000555555555555000044444444444400002222222222220000111111111111000000000000000000000000000000000000000000000000000000000000000000000000000000000000F8F8F8F8F8F8F8F8F8F8F8F8F8000000000000000000000000000000000000F8F8F8F8F8F8F8F8F8F8F8F8F8F8F80000000000000000000000000000000000F8F8F805F8F8F8F8F8F8F8F8F8F8F80000000000000000000000000000000000F8F8F8050505F8F8F8F8F8F8F8F8F80000000000000000000000000000000000F6F6F60505050505F8F8F8F8F8F8F80000000000000000000000000000000000F8F8F8050505F8050505F8F8F8F8F80000000000000000000000000000000000F8F8F8050505F80505050505F8F8F80000000000000000000000000000000000F8F8F805F8F8F8F8F805050505F6F6F600FFFFFFFF0000000000000000000000F8F8F8050505F80505050505F8F8F8000000000000FF00000000000000000000F8F8F8050505F8050505F8F8F8F8F800000000000000FF000000000000000000F6F6F60505050505F8F8F8F8F8F8F800000000000000FF000000000000000000F8F8F8050505F8F8F8F8F8F8F8F8F8000000000000FFFFFF0000000000000000F8F8F805F8F8F8F8F8F8F8F8F8F8F800000000000000FF000000000000000000F8F8F8F8F8F8F8F8F8F8F8F8F8F8F8000000000000000000000000000000000000F8F8F8F8F8F8F8F8F8F8F8F8F80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFFFF0000000000000000000000000000FF0000000000000000000000FFFEACFCFA5681FE0000000000000000000000FFFFFF000000000000000000FFACACFCFCFC8156F8FE0000000000000000000000FF000000000000000000FFACACFCFCACAC81815656FE00000000000000000000FF000000000000000000FEACFC81810000FCFAFA56FC0000000000000000000000FF00000000000000FFACFC81F800000000FAFAFAFAFF0000000000000000000000FFFFFFFF000000FFFCFC56F800000000FA5681FAFF000000000000000000000000000000000000FF8181F8F80000000056FA8181FF000000000000000000000000000000000000FF81815656000000005681FCACFF00000000000000000000000000000000000000ACFA56FA8100008181FCACFE0000000000000000000000000000000000000000FFFA56FA81ACACFCACACFEFF000000000000000000000000000000000000000000FEFAFA81FCFCACACFEFF0000000000000000000000000000000000000000000000FFFC8181ACFEFEFF00000000000000000000000000000000000000000000000000FFFFFFFFFFFF00000000000000000000000000000000000000000000000000000000000000000000000000000000003FFE00007FFF00007FFF00007FFF00007FFF00007FFF00007FFF00007FFFBC007FFF02007FFF01007FFF01007FFF03807FFF01007FFF00003FFE000000000000000003C000800FF001C01FF800803FFC00803FFC00407FFE003C7FFE00007FFE00007FFE00003FFC00003FFC00001FF800000FF0000007E000000000002900000012000000020000000D01000000000100000000000A000000080000000000240024002900000012000000020000000D00B2B2B900010000000000100000001000000002002300000000000000000023002900000012000000020000000D00FCFCFD00010000000000100000001000000002002200010001000100010022002900000012000000020000000D00B2B2B900010000000000100000001000000002000000240024002400240000002900000012000000020000000D0080808A00010000000000100000001000000002000100230023002300230001</Package_Icon>
     <Product_Name>JSON Support for LabVIEW</Product_Name>
     <Was_Built>true</Was_Built>
@@ -32,8 +32,10 @@
       <Copyright/>
       <Packager>NI Systems Engineering</Packager>
       <URL/>
-      <Release_Notes>!!!BREAKING CHANGE!!!
-Simplified API, made all methods static. Added path VIs</Release_Notes>
+      <Release_Notes>2.1.1
+fixed Get Pointer Value terminals
+added "defaulted?" terminals to Get Value instances
+object to value now throws an assert error if type doesn't match.</Release_Notes>
     </Description>
     <Destinations>
       <Toolkit_VIs>
@@ -116,7 +118,7 @@ Simplified API, made all methods static. Added path VIs</Release_Notes>
         <Path>JSON Parsing.lvproj</Path>
       </Exclusions>
     </Source_Files>
-    <License_Agreement_Filepath>license.txt</License_Agreement_Filepath>
+    <License_Agreement_Filepath>Docs\license.txt</License_Agreement_Filepath>
     <Licensing_and_Activation>
       <License_LF_file_path/>
       <Licensed_library_file_path/>
@@ -326,7 +328,7 @@ Simplified API, made all methods static. Added path VIs</Release_Notes>
         <Path>Source\JSON Value\Helper Methods</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>FFC68ECDAF9CCFB0BC3FC0815369DE80</GUID>
+      <GUID>EFE79CB20290D9C5A233EA04BD246BA2</GUID>
     </Functions_Palette_Data>
     <Functions_Palette_Data>
       <Parent_Palette_Index>0</Parent_Palette_Index>
@@ -529,7 +531,7 @@ Simplified API, made all methods static. Added path VIs</Release_Notes>
         <Path>Source\JSON Value\Array\Get Array Values.vi</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>D97B0F793B83181F5C2DB9A8256F8459</GUID>
+      <GUID>839D5E1686488499D6A4BAE5CF4F8190</GUID>
     </Functions_Palette_Data>
     <Functions_Palette_Data>
       <Parent_Palette_Index>0</Parent_Palette_Index>
@@ -606,7 +608,7 @@ Simplified API, made all methods static. Added path VIs</Release_Notes>
         <Path>Source\JSON Value\Object\Remove Value.vi</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>B55AA9AAA371ED398A82C478BCAC9CFE</GUID>
+      <GUID>EF89557665690C2B013D6E4F53AD1F5B</GUID>
     </Functions_Palette_Data>
     <Functions_Palette_Data>
       <Parent_Palette_Index>0</Parent_Palette_Index>
@@ -683,7 +685,7 @@ Simplified API, made all methods static. Added path VIs</Release_Notes>
         <Path>Source\JSON Value\Helper Methods\To File.vi</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>E927C0E454C92F1ED4893027BF68CBB9</GUID>
+      <GUID>5582CA3D93EE837DC46480389D70830B</GUID>
     </Functions_Palette_Data>
     <Functions_Palette_Data>
       <Parent_Palette_Index>0</Parent_Palette_Index>
@@ -746,7 +748,7 @@ Simplified API, made all methods static. Added path VIs</Release_Notes>
         <Path>Source\JSON Value\By Pointer\Set(path).vi</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>7B5162AD2BFF38AA5C8DE3DACB5999B6</GUID>
+      <GUID>C6013507058DBE6A3AB5B3391C4A339C</GUID>
     </Functions_Palette_Data>
   </Library_Palette_Definition>
 </VI_Package_Builder_Settings>

Source/JSON Parsing.lvproj

@@ -12,11 +12,22 @@
 		<Property Name="server.vi.propertiesEnabled" Type="Bool">true</Property>
 		<Property Name="specify.custom.address" Type="Bool">false</Property>
 		<Item Name="JSON Value.lvclass" Type="LVClass" URL="../JSON Value/JSON Value.lvclass"/>
+		<Item Name="JSFL Variant Support.lvlib" Type="Library" URL="../JSON Value/Variant Support/JSFL Variant Support.lvlib"/>
 		<Item Name="Dependencies" Type="Dependencies">
 			<Item Name="vi.lib" Type="Folder">
 				<Item Name="Trim Whitespace.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Trim Whitespace.vi"/>
 				<Item Name="whitespace.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/whitespace.ctl"/>
+				<Item Name="NI_Data Type.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/Data Type/NI_Data Type.lvlib"/>
+				<Item Name="Error Cluster From Error Code.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Error Cluster From Error Code.vi"/>
+				<Item Name="LVNumericRepresentation.ctl" Type="VI" URL="/&lt;vilib&gt;/numeric/LVNumericRepresentation.ctl"/>
+				<Item Name="Create From Variant (Numeric).vi" Type="VI" URL="/&lt;vilib&gt;/NI/JSON Support for LabVIEW/JSON Value/Variant Support/Create From Variant/Create From Variant (Numeric).vi"/>
+				<Item Name="Create From Variant (String).vi" Type="VI" URL="/&lt;vilib&gt;/NI/JSON Support for LabVIEW/JSON Value/Variant Support/Create From Variant/Create From Variant (String).vi"/>
 			</Item>
+			<Item Name="Create From Variant (Object).vi" Type="VI" URL="../JSON Value/Variant Support/Create From Variant/Create From Variant (Object).vi"/>
+			<Item Name="Create From Variant (Boolean).vi" Type="VI" URL="../JSON Value/Variant Support/Create From Variant/Create From Variant (Boolean).vi"/>
+			<Item Name="Create From Variant (Array).vi" Type="VI" URL="../JSON Value/Variant Support/Create From Variant/Create From Variant (Array).vi"/>
+			<Item Name="Cast To Variant (Array).vi" Type="VI" URL="../JSON Value/Variant Support/Cast To Variant/Cast To Variant (Array).vi"/>
+			<Item Name="Cast To Variant (Object).vi" Type="VI" URL="../JSON Value/Variant Support/Cast To Variant/Cast To Variant (Object).vi"/>
 		</Item>
 		<Item Name="Build Specifications" Type="Build"/>
 	</Item>