Skip to content

Commit a5ff04c

Browse files
author
shabtaisharon
authored
Merge pull request #290 from shabtaisharon/dev
Bump the version and update the windows build
2 parents a44a74c + 6e81bb7 commit a5ff04c

5 files changed

Lines changed: 54 additions & 54 deletions

File tree

‎Builders/Windows/SetupProject/SetupProject/DsbFiles.wxs‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<Component Win64="yes" Id="cmp177C7EF4A31A4CA81BDD2F717721906F" Guid="*">
2222
<File Id="filCCA24CF598B4BC318B31FBDCC28037DA" KeyPath="yes" Source="$(var.DsbPath)\atomicfu-common-0.11.5.jar" />
2323
</Component>
24-
<Component Win64="yes" Id="cmpFACB3776EB6D76B0275845FEC4EF5044" Guid="*">
25-
<File Id="filE601B39E9D2C31FC5254B8C78772996F" KeyPath="yes" Source="$(var.DsbPath)\checker-compat-qual-2.0.0.jar" />
24+
<Component Win64="yes" Id="cmpB7E95E36952E557D1ECA5F0BD286D83C" Guid="*">
25+
<File Id="filCBB6B2C2ADC459D8D5C9F36D1EA6C691" KeyPath="yes" Source="$(var.DsbPath)\checker-qual-2.5.2.jar" />
2626
</Component>
2727
<Component Win64="yes" Id="cmpBEBC4A77B7DF2734AC0750FEA8D077DD" Guid="*">
2828
<File Id="fil486BCDD3ACCC650E1CB98EAEF7CD4375" KeyPath="yes" Source="$(var.DsbPath)\commons-codec-1.10.jar" />
@@ -48,17 +48,17 @@
4848
<Component Win64="yes" Id="cmp18E1ACD5A0D265BA3CF5CECEA628E7BD" Guid="*">
4949
<File Id="fil6FD478A9744074740944F5F9CB9700B0" KeyPath="yes" Source="$(var.DsbPath)\ds3-utils-5.0.4.jar" />
5050
</Component>
51-
<Component Win64="yes" Id="cmp173BCC62E2012565858FF08D08B8DDAC" Guid="*">
52-
<File Id="fil8A4F91F22F52B349F1762D08042C24AD" KeyPath="yes" Source="$(var.DsbPath)\dsb-api-5.0.5.jar" />
51+
<Component Win64="yes" Id="cmp05C147F87095CCAC8D9F90C2A92827A2" Guid="*">
52+
<File Id="fil5B32004E35B0A3F847F3969CEE0F96FE" KeyPath="yes" Source="$(var.DsbPath)\dsb-api-5.0.6.jar" />
5353
</Component>
54-
<Component Win64="yes" Id="cmpE700890848D1CE53A04B6F6078376F4A" Guid="*">
55-
<File Id="fil1AB5DD7D3DAEF9FE93E89157DE46CD1A" KeyPath="yes" Source="$(var.DsbPath)\dsb-gui-5.0.5-all.jar" />
54+
<Component Win64="yes" Id="cmp510E6653FA1A349D4AC83640393E9BBB" Guid="*">
55+
<File Id="filD462870F96ED44F8325AD87BF6415D7B" KeyPath="yes" Source="$(var.DsbPath)\dsb-gui-5.0.6-all.jar" />
5656
</Component>
57-
<Component Win64="yes" Id="cmpF1D6506ED55DB133984DBEA3B8BAAF01" Guid="*">
58-
<File Id="filBC5B8D5E2A3C46651C3A84873D98B214" KeyPath="yes" Source="$(var.DsbPath)\dsb-gui-5.0.5.jar" />
57+
<Component Win64="yes" Id="cmp36FA02DD114BF0142E0008F16F6F4C08" Guid="*">
58+
<File Id="fil038263282A555C37F2C555D8D69EAF4A" KeyPath="yes" Source="$(var.DsbPath)\dsb-gui-5.0.6.jar" />
5959
</Component>
60-
<Component Win64="yes" Id="cmp30CCF754410B9A72BDEC80CE181B11B1" Guid="*">
61-
<File Id="filBE74C286E6F0D93DBFB208B08FA5AB19" KeyPath="yes" Source="$(var.DsbPath)\dsb-util-5.0.5.jar" />
60+
<Component Win64="yes" Id="cmp01165303741573D4953A08E282194B9E" Guid="*">
61+
<File Id="fil5EA0C46D31EF0CF0C1CBFDC7372261C3" KeyPath="yes" Source="$(var.DsbPath)\dsb-util-5.0.6.jar" />
6262
</Component>
6363
<Component Win64="yes" Id="cmp67C8CE44E28F997FEAC97FF167229D5B" Guid="*">
6464
<File Id="filA4B497FD8BD148D3F7E813CA3071514F" KeyPath="yes" Source="$(var.DsbPath)\error_prone_annotations-2.1.3.jar" />
@@ -72,14 +72,14 @@
7272
<Component Win64="yes" Id="cmp6AEEE436807C17B0EA88989C0FECBC51" Guid="*">
7373
<File Id="filE1C889DDE23D1E7F498419C80EAAE8D3" KeyPath="yes" Source="$(var.DsbPath)\fontawesomefx-8.9.jar" />
7474
</Component>
75-
<Component Win64="yes" Id="cmpC9548766B763CCA3BA00860ED7B3CA30" Guid="*">
76-
<File Id="fil216F17DE51EF85747C34896C0F875160" KeyPath="yes" Source="$(var.DsbPath)\guava-25.0-jre.jar" />
75+
<Component Win64="yes" Id="cmpC11CE6BE1F08613567030ACB8BC42524" Guid="*">
76+
<File Id="filF1B2FCB6BA17951482A2F1B75D3D36BC" KeyPath="yes" Source="$(var.DsbPath)\guava-26.0-jre.jar" />
7777
</Component>
78-
<Component Win64="yes" Id="cmp3832BB3A181BB1E2B86B320FD56C6DF6" Guid="*">
79-
<File Id="filD92302F12B1261F8C4A7E7A4D7DE39EB" KeyPath="yes" Source="$(var.DsbPath)\guice-4.2.0.jar" />
78+
<Component Win64="yes" Id="cmp5F565FD5350114DA3F959AA12A9B3B96" Guid="*">
79+
<File Id="filD34EF2A1B9A78792A4794A173297B21E" KeyPath="yes" Source="$(var.DsbPath)\guice-4.2.1.jar" />
8080
</Component>
81-
<Component Win64="yes" Id="cmp7B11D42054E956D557A41E944392964B" Guid="*">
82-
<File Id="filA71D6D35973E425815F0053DE4248DEE" KeyPath="yes" Source="$(var.DsbPath)\guice-assistedinject-4.2.0.jar" />
81+
<Component Win64="yes" Id="cmp852AAE0DA24AA6A88941772CFD67D148" Guid="*">
82+
<File Id="fil55CEA2F940AB7D4A616B6F02D6AE1FCA" KeyPath="yes" Source="$(var.DsbPath)\guice-assistedinject-4.2.1.jar" />
8383
</Component>
8484
<Component Win64="yes" Id="cmpFD5674B7EA845E26924F297F039C1AC3" Guid="*">
8585
<File Id="fil67FC7A64D75FF5FF22463A30616F139F" KeyPath="yes" Source="$(var.DsbPath)\httpclient-4.5.3.jar" />
@@ -120,26 +120,26 @@
120120
<Component Win64="yes" Id="cmp5F3CCD0C6935C81E44A85C22491B2B9F" Guid="*">
121121
<File Id="filA5EB719356A791DCF7B7448E46671976" KeyPath="yes" Source="$(var.DsbPath)\jna-platform-4.5.2.jar" />
122122
</Component>
123-
<Component Win64="yes" Id="cmp334A6394C83DBE67F64EA8FBE394B02A" Guid="*">
124-
<File Id="filC8C9899AE5BF1EC370933FC501A7CE8A" KeyPath="yes" Source="$(var.DsbPath)\jsr305-3.0.1.jar" />
123+
<Component Win64="yes" Id="cmpD4563B5489ED605ADDB537D168BCC87D" Guid="*">
124+
<File Id="fil143987BBC12E057F792D4B84EC168A43" KeyPath="yes" Source="$(var.DsbPath)\jsr305-3.0.2.jar" />
125125
</Component>
126-
<Component Win64="yes" Id="cmpA23C4FA8B092EC5CB66EA755EF7223CE" Guid="*">
127-
<File Id="fil33AE603CFFCC272D774A6AA3301FF15D" KeyPath="yes" Source="$(var.DsbPath)\kotlin-stdlib-1.2.70.jar" />
126+
<Component Win64="yes" Id="cmp1EB2B845735AAD8077FE47633209C6CB" Guid="*">
127+
<File Id="filAB0068C9314895350D5E1CCC0BD5776F" KeyPath="yes" Source="$(var.DsbPath)\kotlin-stdlib-1.2.71.jar" />
128128
</Component>
129-
<Component Win64="yes" Id="cmp1819C4317F634E025C4A143A093034AE" Guid="*">
130-
<File Id="fil4323D738B45DE28D90C5FEFEE149429D" KeyPath="yes" Source="$(var.DsbPath)\kotlin-stdlib-common-1.2.70.jar" />
129+
<Component Win64="yes" Id="cmpE8D7B97D2463A95523D49CD1A92CE0E6" Guid="*">
130+
<File Id="fil377956F96F9AEA4FFF157603D2AB0FDB" KeyPath="yes" Source="$(var.DsbPath)\kotlin-stdlib-common-1.2.71.jar" />
131131
</Component>
132-
<Component Win64="yes" Id="cmpFC1D3E62CF437B66AF5E22F000FB4E3F" Guid="*">
133-
<File Id="fil33F28C06FF881FD78A0CA1989D21FA23" KeyPath="yes" Source="$(var.DsbPath)\kotlin-stdlib-jdk7-1.2.61.jar" />
132+
<Component Win64="yes" Id="cmpE0DC70C5239282219D37B60CD5EF0A30" Guid="*">
133+
<File Id="filCB7DABD1E0A11B65E6CDB9494976CE2C" KeyPath="yes" Source="$(var.DsbPath)\kotlin-stdlib-jdk7-1.2.71.jar" />
134134
</Component>
135-
<Component Win64="yes" Id="cmp70ADA9FDBB16462C395603485879EB86" Guid="*">
136-
<File Id="filA3B01A36F0303057938D85163CD825EF" KeyPath="yes" Source="$(var.DsbPath)\kotlin-stdlib-jdk8-1.2.61.jar" />
135+
<Component Win64="yes" Id="cmpBB8F907D240842932F39C9CF66062242" Guid="*">
136+
<File Id="fil24B3FB75438602AEA0EE85B1BD295B3B" KeyPath="yes" Source="$(var.DsbPath)\kotlin-stdlib-jdk8-1.2.71.jar" />
137137
</Component>
138-
<Component Win64="yes" Id="cmpC7F6EA20FE06BE1A82E119075826D5F1" Guid="*">
139-
<File Id="filAB000407D935CE151A31367BB8D5E260" KeyPath="yes" Source="$(var.DsbPath)\kotlinx-coroutines-core-0.25.3.jar" />
138+
<Component Win64="yes" Id="cmp6D0C1E72C4834FBB02B29007F1DC5EAB" Guid="*">
139+
<File Id="fil7B6FEA60269F2086B1EFF80390B08C9D" KeyPath="yes" Source="$(var.DsbPath)\kotlinx-coroutines-core-0.26.1.jar" />
140140
</Component>
141-
<Component Win64="yes" Id="cmp2AB498902D587273112D55C91A739D41" Guid="*">
142-
<File Id="filC15FF8B412E4F2AC9678A4069DC04551" KeyPath="yes" Source="$(var.DsbPath)\kotlinx-coroutines-core-common-0.25.3.jar" />
141+
<Component Win64="yes" Id="cmp82504C92431E0B3723CA8636A0CC3A4C" Guid="*">
142+
<File Id="filEDE0348E03D88DBDE1BD368FA050A2E8" KeyPath="yes" Source="$(var.DsbPath)\kotlinx-coroutines-core-common-0.26.1.jar" />
143143
</Component>
144144
<Component Win64="yes" Id="cmp06A9E5D8D3CCE9BC42F7B3E0DC00E2A7" Guid="*">
145145
<File Id="fil5BC6FDBD5181516455F4630337B42F20" KeyPath="yes" Source="$(var.DsbPath)\logback-classic-1.2.3.jar" />
@@ -162,8 +162,8 @@
162162
<Component Win64="yes" Id="cmp302899050A059915A570A4EDD4C30927" Guid="*">
163163
<File Id="fil0DE869DEAB500C1EF77843FDF5F59707" KeyPath="yes" Source="$(var.DsbPath)\rxjavafx-2.2.2.jar" />
164164
</Component>
165-
<Component Win64="yes" Id="cmpDB5A744941E00A96FC0741BA14A04FEA" Guid="*">
166-
<File Id="filBF2DCFE762562050D5BB7B13F83EC65C" KeyPath="yes" Source="$(var.DsbPath)\rxkotlin-2.2.0.jar" />
165+
<Component Win64="yes" Id="cmp426109D9487E2D140329D94F13BD9289" Guid="*">
166+
<File Id="fil306B3027D0B546BB5AC954D8A4C8833D" KeyPath="yes" Source="$(var.DsbPath)\rxkotlin-2.3.0.jar" />
167167
</Component>
168168
<Component Win64="yes" Id="cmpD15958C6F5D4EC2200C58FFCF7BFC108" Guid="*">
169169
<File Id="fil32FDBB020392B0203761F6AF79E0602E" KeyPath="yes" Source="$(var.DsbPath)\rxkotlinfx-2.2.2.jar" />
@@ -200,7 +200,7 @@
200200
<ComponentRef Id="cmpBA9117160EEA4097A2B8A46B7FF3104C" />
201201
<ComponentRef Id="cmpFC6FB28BEAF3966BACD33B96384A4A38" />
202202
<ComponentRef Id="cmp177C7EF4A31A4CA81BDD2F717721906F" />
203-
<ComponentRef Id="cmpFACB3776EB6D76B0275845FEC4EF5044" />
203+
<ComponentRef Id="cmpB7E95E36952E557D1ECA5F0BD286D83C" />
204204
<ComponentRef Id="cmpBEBC4A77B7DF2734AC0750FEA8D077DD" />
205205
<ComponentRef Id="cmpCAFC8B140EF7A7F0A90AF20CCA67B467" />
206206
<ComponentRef Id="cmp2FD8C1740A993012CFE50DB3B08733AE" />
@@ -209,17 +209,17 @@
209209
<ComponentRef Id="cmp5DF3C49C2723E26412193190D1A2F32A" />
210210
<ComponentRef Id="cmpA46CEC9F6230CBA23238F5C25D8E23E9" />
211211
<ComponentRef Id="cmp18E1ACD5A0D265BA3CF5CECEA628E7BD" />
212-
<ComponentRef Id="cmp173BCC62E2012565858FF08D08B8DDAC" />
213-
<ComponentRef Id="cmpE700890848D1CE53A04B6F6078376F4A" />
214-
<ComponentRef Id="cmpF1D6506ED55DB133984DBEA3B8BAAF01" />
215-
<ComponentRef Id="cmp30CCF754410B9A72BDEC80CE181B11B1" />
212+
<ComponentRef Id="cmp05C147F87095CCAC8D9F90C2A92827A2" />
213+
<ComponentRef Id="cmp510E6653FA1A349D4AC83640393E9BBB" />
214+
<ComponentRef Id="cmp36FA02DD114BF0142E0008F16F6F4C08" />
215+
<ComponentRef Id="cmp01165303741573D4953A08E282194B9E" />
216216
<ComponentRef Id="cmp67C8CE44E28F997FEAC97FF167229D5B" />
217217
<ComponentRef Id="cmp8E58DEDBF54CD1426A62D1048B23BBE6" />
218218
<ComponentRef Id="cmp9567460C94E8835F3750DD7172F39DE2" />
219219
<ComponentRef Id="cmp6AEEE436807C17B0EA88989C0FECBC51" />
220-
<ComponentRef Id="cmpC9548766B763CCA3BA00860ED7B3CA30" />
221-
<ComponentRef Id="cmp3832BB3A181BB1E2B86B320FD56C6DF6" />
222-
<ComponentRef Id="cmp7B11D42054E956D557A41E944392964B" />
220+
<ComponentRef Id="cmpC11CE6BE1F08613567030ACB8BC42524" />
221+
<ComponentRef Id="cmp5F565FD5350114DA3F959AA12A9B3B96" />
222+
<ComponentRef Id="cmp852AAE0DA24AA6A88941772CFD67D148" />
223223
<ComponentRef Id="cmpFD5674B7EA845E26924F297F039C1AC3" />
224224
<ComponentRef Id="cmpE04B0F3F96045567C41F68FFFA0076C7" />
225225
<ComponentRef Id="cmp9E6D45580B762122DD5200C8C983A5C8" />
@@ -233,21 +233,21 @@
233233
<ComponentRef Id="cmpCD6AD685522DF68D5181FEAD85B297E8" />
234234
<ComponentRef Id="cmp97EFDBF9C76488F17C1DCC8BC8DF619F" />
235235
<ComponentRef Id="cmp5F3CCD0C6935C81E44A85C22491B2B9F" />
236-
<ComponentRef Id="cmp334A6394C83DBE67F64EA8FBE394B02A" />
237-
<ComponentRef Id="cmpA23C4FA8B092EC5CB66EA755EF7223CE" />
238-
<ComponentRef Id="cmp1819C4317F634E025C4A143A093034AE" />
239-
<ComponentRef Id="cmpFC1D3E62CF437B66AF5E22F000FB4E3F" />
240-
<ComponentRef Id="cmp70ADA9FDBB16462C395603485879EB86" />
241-
<ComponentRef Id="cmpC7F6EA20FE06BE1A82E119075826D5F1" />
242-
<ComponentRef Id="cmp2AB498902D587273112D55C91A739D41" />
236+
<ComponentRef Id="cmpD4563B5489ED605ADDB537D168BCC87D" />
237+
<ComponentRef Id="cmp1EB2B845735AAD8077FE47633209C6CB" />
238+
<ComponentRef Id="cmpE8D7B97D2463A95523D49CD1A92CE0E6" />
239+
<ComponentRef Id="cmpE0DC70C5239282219D37B60CD5EF0A30" />
240+
<ComponentRef Id="cmpBB8F907D240842932F39C9CF66062242" />
241+
<ComponentRef Id="cmp6D0C1E72C4834FBB02B29007F1DC5EAB" />
242+
<ComponentRef Id="cmp82504C92431E0B3723CA8636A0CC3A4C" />
243243
<ComponentRef Id="cmp06A9E5D8D3CCE9BC42F7B3E0DC00E2A7" />
244244
<ComponentRef Id="cmp2E66FE7608AEE42B0820E081251DCBFB" />
245245
<ComponentRef Id="cmp0ECD51BD3914BAA43635C47E89C1CDAD" />
246246
<ComponentRef Id="cmp7D49CAB47554563D92415BBD2B8306EE" />
247247
<ComponentRef Id="cmpF3F034485DE2DB5BE644A66A755B40AA" />
248248
<ComponentRef Id="cmp3E2189D7C4B5B47885098FD856951F7D" />
249249
<ComponentRef Id="cmp302899050A059915A570A4EDD4C30927" />
250-
<ComponentRef Id="cmpDB5A744941E00A96FC0741BA14A04FEA" />
250+
<ComponentRef Id="cmp426109D9487E2D140329D94F13BD9289" />
251251
<ComponentRef Id="cmpD15958C6F5D4EC2200C58FFCF7BFC108" />
252252
<ComponentRef Id="cmp0F436D4E723A1A62103E533D3109F37B" />
253253
<ComponentRef Id="cmpFD66811BD8ACD5D5DC6DD8DD2E7CDD47" />

‎Builders/Windows/SetupProject/SetupProject/SetupProject.wixproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
2828
</PropertyGroup>
2929
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
30-
<DefineConstants>Version=5.0.5;DsbPath=..\..\..\..\..\..\..\dsb-gui\build\libs;JavaPath=..\..\Java</DefineConstants>
30+
<DefineConstants>Version=5.0.6;DsbPath=..\..\..\..\..\..\..\dsb-gui\build\libs;JavaPath=..\..\Java</DefineConstants>
3131
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
3232
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
3333
<SuppressIces>ICE57</SuppressIces>
@@ -64,7 +64,7 @@ call ..\..\..\createWXSDbsFiles.bat</PreBuildEvent>
6464
</PropertyGroup>
6565
<PropertyGroup>
6666
<PostBuildEvent>rmdir ..\..\..\..\..\Java /S /Q
67-
xcopy !(TargetPath) $(SolutionDir)bin\$(TargetName)-5.0.5$(TargetExt)%2a /Y</PostBuildEvent>
67+
xcopy !(TargetPath) $(SolutionDir)bin\$(TargetName)-5.0.6$(TargetExt)%2a /Y</PostBuildEvent>
6868
</PropertyGroup>
6969
<!--
7070
To modify your build process, add your task inside one of the targets below and uncomment it.

‎Builders/Windows/SetupProject/Version.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
using System.Reflection;
22

3-
[assembly: AssemblyVersion("5.0.5.3")]
4-
[assembly: AssemblyFileVersion("5.0.5.3")]
3+
[assembly: AssemblyVersion("5.0.6.1")]
4+
[assembly: AssemblyFileVersion("5.0.6.1")]

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ buildscript {
3232

3333
allprojects {
3434
group = 'com.spectralogic.dsbrowser'
35-
version = '5.0.5'
35+
version = '5.0.6'
3636
}
3737

3838
subprojects {

‎dsb-gui/launch4j.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<launch4jConfig>
33
<dontWrapJar>false</dontWrapJar>
44
<headerType>gui</headerType>
5-
<jar>build\libs\dsb-gui-5.0.5.jar</jar>
5+
<jar>build\libs\dsb-gui-5.0.6.jar</jar>
66
<outfile>build\dsb-gui.exe</outfile>
77
<errTitle></errTitle>
88
<cmdLine></cmdLine>

0 commit comments

Comments
 (0)