Skip to content

Commit 900cadc

Browse files
vincentparrettvincentparrett
committed
Merge branch 'develop' of https://bitbucket.org/sglienke/spring4d into develop
2 parents 312f340 + d8fa4ce commit 900cadc

File tree

79 files changed

+8035
-2793
lines changed

Some content is hidden

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

79 files changed

+8035
-2793
lines changed

‎Build.Settings.Compilers.ini‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,3 +320,39 @@ DisplayName=Delphi 10.4 (Android ARM 64)
320320
Platform=Android64
321321
Keys.BDS=Software\Embarcadero\BDS\21.0
322322
Keys.Library=Library\Android64
323+
324+
[Delphi11.Win32]
325+
DisplayName=Delphi 11 (Win32)
326+
Platform=Win32
327+
Keys.BDS=Software\Embarcadero\BDS\22.0
328+
Keys.Library=Library\Win32
329+
330+
[Delphi11.Win64]
331+
DisplayName=Delphi 11 (Win64)
332+
Platform=Win64
333+
Keys.BDS=Software\Embarcadero\BDS\22.0
334+
Keys.Library=Library\Win64
335+
336+
[Delphi11.OSX64]
337+
DisplayName=Delphi 11 (OSX64)
338+
Platform=OSX64
339+
Keys.BDS=Software\Embarcadero\BDS\22.0
340+
Keys.Library=Library\OSX64
341+
342+
[Delphi11.Linux64]
343+
DisplayName=Delphi 11 (Linux64)
344+
Platform=Linux64
345+
Keys.BDS=Software\Embarcadero\BDS\22.0
346+
Keys.Library=Library\Linux64
347+
348+
[Delphi11.iOSDevice64]
349+
DisplayName=Delphi 11 (iOS Device ARM64)
350+
Platform=iOSDevice64
351+
Keys.BDS=Software\Embarcadero\BDS\22.0
352+
Keys.Library=Library\iOSDevice64
353+
354+
[Delphi11.AndroidARM64]
355+
DisplayName=Delphi 11 (Android ARM 64)
356+
Platform=Android64
357+
Keys.BDS=Software\Embarcadero\BDS\22.0
358+
Keys.Library=Library\Android64

‎Build.Settings.ini‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,3 +323,27 @@ UnitOutputPaths=Library\Delphi10Sydney\$(Platform)\$(Config)
323323
[Delphi10Sydney.AndroidARM64]
324324
Projects=Packages\Delphi10Sydney\Spring4D.groupproj
325325
UnitOutputPaths=Library\Delphi10Sydney\$(Platform)\$(Config)
326+
327+
[Delphi11.Win32]
328+
Projects=Packages\Delphi11\Spring4D.groupproj
329+
UnitOutputPaths=Library\Delphi11\$(Platform)\$(Config)
330+
331+
[Delphi11.Win64]
332+
Projects=Packages\Delphi11\Spring4D.groupproj
333+
UnitOutputPaths=Library\Delphi11\$(Platform)\$(Config)
334+
335+
[Delphi11.OSX64]
336+
Projects=Packages\Delphi11\Spring4D.groupproj
337+
UnitOutputPaths=Library\Delphi11\$(Platform)\$(Config)
338+
339+
[Delphi11.Linux64]
340+
Projects=Packages\Delphi11\Spring4D.groupproj
341+
UnitOutputPaths=Library\Delphi11\$(Platform)\$(Config)
342+
343+
[Delphi11.iOSDevice64]
344+
Projects=Packages\Delphi11\Spring4D.groupproj
345+
UnitOutputPaths=Library\Delphi11y\$(Platform)\$(Config)
346+
347+
[Delphi11.AndroidARM64]
348+
Projects=Packages\Delphi11\Spring4D.groupproj
349+
UnitOutputPaths=Library\Delphi11\$(Platform)\$(Config)

‎Packages/Delphi10Berlin/Spring.Base.dpk‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ contains
4545
Spring.Collections.Dictionaries in '..\..\Source\Base\Collections\Spring.Collections.Dictionaries.pas',
4646
Spring.Collections.Events in '..\..\Source\Base\Collections\Spring.Collections.Events.pas',
4747
Spring.Collections.Extensions in '..\..\Source\Base\Collections\Spring.Collections.Extensions.pas',
48-
Spring.Collections.HashTable in '..\..\Source\Base\Collections\Spring.Collections.HashTable.pas',
4948
Spring.Collections.Lists in '..\..\Source\Base\Collections\Spring.Collections.Lists.pas',
5049
Spring.Collections.LinkedLists in '..\..\Source\Base\Collections\Spring.Collections.LinkedLists.pas',
5150
Spring.Collections.MultiMaps in '..\..\Source\Base\Collections\Spring.Collections.MultiMaps.pas',
@@ -54,9 +53,12 @@ contains
5453
Spring.Collections.Sets in '..\..\Source\Base\Collections\Spring.Collections.Sets.pas',
5554
Spring.Collections.Stacks in '..\..\Source\Base\Collections\Spring.Collections.Stacks.pas',
5655
Spring.Collections.Trees in '..\..\Source\Base\Collections\Spring.Collections.Trees.pas',
56+
Spring.Comparers in '..\..\Source\Base\Spring.Comparers.pas',
5757
Spring.DesignPatterns in '..\..\Source\Base\Spring.DesignPatterns.pas',
5858
Spring.Events in '..\..\Source\Base\Spring.Events.pas',
5959
Spring.Events.Base in '..\..\Source\Base\Spring.Events.Base.pas',
60+
Spring.Hash in '..\..\Source\Base\Spring.Hash.pas',
61+
Spring.HashTable in '..\..\Source\Base\Spring.HashTable.pas',
6062
Spring.HazardEra in '..\..\Source\Base\Spring.HazardEra.pas',
6163
Spring.Helpers in '..\..\Source\Base\Spring.Helpers.pas',
6264
Spring.Logging in '..\..\Source\Base\Logging\Spring.Logging.pas',

‎Packages/Delphi10Berlin/Spring.Base.dproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@
101101
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Dictionaries.pas"/>
102102
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Events.pas"/>
103103
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Extensions.pas"/>
104-
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.HashTable.pas"/>
105104
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Lists.pas"/>
106105
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.LinkedLists.pas"/>
107106
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.MultiMaps.pas"/>
@@ -110,9 +109,12 @@
110109
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Sets.pas"/>
111110
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Stacks.pas"/>
112111
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Trees.pas"/>
112+
<DCCReference Include="..\..\Source\Base\Spring.Comparers.pas"/>
113113
<DCCReference Include="..\..\Source\Base\Spring.DesignPatterns.pas"/>
114114
<DCCReference Include="..\..\Source\Base\Spring.Events.pas"/>
115115
<DCCReference Include="..\..\Source\Base\Spring.Events.Base.pas"/>
116+
<DCCReference Include="..\..\Source\Base\Spring.Hash.pas"/>
117+
<DCCReference Include="..\..\Source\Base\Spring.HashTable.pas"/>
116118
<DCCReference Include="..\..\Source\Base\Spring.HazardEra.pas"/>
117119
<DCCReference Include="..\..\Source\Base\Spring.Helpers.pas"/>
118120
<DCCReference Include="..\..\Source\Base\Logging\Spring.Logging.pas"/>

‎Packages/Delphi10Rio/Spring.Base.dpk‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ contains
4545
Spring.Collections.Dictionaries in '..\..\Source\Base\Collections\Spring.Collections.Dictionaries.pas',
4646
Spring.Collections.Events in '..\..\Source\Base\Collections\Spring.Collections.Events.pas',
4747
Spring.Collections.Extensions in '..\..\Source\Base\Collections\Spring.Collections.Extensions.pas',
48-
Spring.Collections.HashTable in '..\..\Source\Base\Collections\Spring.Collections.HashTable.pas',
4948
Spring.Collections.Lists in '..\..\Source\Base\Collections\Spring.Collections.Lists.pas',
5049
Spring.Collections.LinkedLists in '..\..\Source\Base\Collections\Spring.Collections.LinkedLists.pas',
5150
Spring.Collections.MultiMaps in '..\..\Source\Base\Collections\Spring.Collections.MultiMaps.pas',
@@ -54,9 +53,12 @@ contains
5453
Spring.Collections.Sets in '..\..\Source\Base\Collections\Spring.Collections.Sets.pas',
5554
Spring.Collections.Stacks in '..\..\Source\Base\Collections\Spring.Collections.Stacks.pas',
5655
Spring.Collections.Trees in '..\..\Source\Base\Collections\Spring.Collections.Trees.pas',
56+
Spring.Comparers in '..\..\Source\Base\Spring.Comparers.pas',
5757
Spring.DesignPatterns in '..\..\Source\Base\Spring.DesignPatterns.pas',
5858
Spring.Events in '..\..\Source\Base\Spring.Events.pas',
5959
Spring.Events.Base in '..\..\Source\Base\Spring.Events.Base.pas',
60+
Spring.Hash in '..\..\Source\Base\Spring.Hash.pas',
61+
Spring.HashTable in '..\..\Source\Base\Spring.HashTable.pas',
6062
Spring.HazardEra in '..\..\Source\Base\Spring.HazardEra.pas',
6163
Spring.Helpers in '..\..\Source\Base\Spring.Helpers.pas',
6264
Spring.Logging in '..\..\Source\Base\Logging\Spring.Logging.pas',

‎Packages/Delphi10Rio/Spring.Base.dproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@
9090
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Dictionaries.pas"/>
9191
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Events.pas"/>
9292
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Extensions.pas"/>
93-
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.HashTable.pas"/>
9493
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Lists.pas"/>
9594
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.LinkedLists.pas"/>
9695
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.MultiMaps.pas"/>
@@ -99,9 +98,12 @@
9998
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Sets.pas"/>
10099
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Stacks.pas"/>
101100
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Trees.pas"/>
101+
<DCCReference Include="..\..\Source\Base\Spring.Comparers.pas"/>
102102
<DCCReference Include="..\..\Source\Base\Spring.DesignPatterns.pas"/>
103103
<DCCReference Include="..\..\Source\Base\Spring.Events.pas"/>
104104
<DCCReference Include="..\..\Source\Base\Spring.Events.Base.pas"/>
105+
<DCCReference Include="..\..\Source\Base\Spring.Hash.pas"/>
106+
<DCCReference Include="..\..\Source\Base\Spring.HashTable.pas"/>
105107
<DCCReference Include="..\..\Source\Base\Spring.HazardEra.pas"/>
106108
<DCCReference Include="..\..\Source\Base\Spring.Helpers.pas"/>
107109
<DCCReference Include="..\..\Source\Base\Logging\Spring.Logging.pas"/>

‎Packages/Delphi10Seattle/Spring.Base.dpk‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ contains
4545
Spring.Collections.Dictionaries in '..\..\Source\Base\Collections\Spring.Collections.Dictionaries.pas',
4646
Spring.Collections.Events in '..\..\Source\Base\Collections\Spring.Collections.Events.pas',
4747
Spring.Collections.Extensions in '..\..\Source\Base\Collections\Spring.Collections.Extensions.pas',
48-
Spring.Collections.HashTable in '..\..\Source\Base\Collections\Spring.Collections.HashTable.pas',
4948
Spring.Collections.Lists in '..\..\Source\Base\Collections\Spring.Collections.Lists.pas',
5049
Spring.Collections.LinkedLists in '..\..\Source\Base\Collections\Spring.Collections.LinkedLists.pas',
5150
Spring.Collections.MultiMaps in '..\..\Source\Base\Collections\Spring.Collections.MultiMaps.pas',
@@ -54,9 +53,12 @@ contains
5453
Spring.Collections.Sets in '..\..\Source\Base\Collections\Spring.Collections.Sets.pas',
5554
Spring.Collections.Stacks in '..\..\Source\Base\Collections\Spring.Collections.Stacks.pas',
5655
Spring.Collections.Trees in '..\..\Source\Base\Collections\Spring.Collections.Trees.pas',
56+
Spring.Comparers in '..\..\Source\Base\Spring.Comparers.pas',
5757
Spring.DesignPatterns in '..\..\Source\Base\Spring.DesignPatterns.pas',
5858
Spring.Events in '..\..\Source\Base\Spring.Events.pas',
5959
Spring.Events.Base in '..\..\Source\Base\Spring.Events.Base.pas',
60+
Spring.Hash in '..\..\Source\Base\Spring.Hash.pas',
61+
Spring.HashTable in '..\..\Source\Base\Spring.HashTable.pas',
6062
Spring.HazardEra in '..\..\Source\Base\Spring.HazardEra.pas',
6163
Spring.Helpers in '..\..\Source\Base\Spring.Helpers.pas',
6264
Spring.Logging in '..\..\Source\Base\Logging\Spring.Logging.pas',

‎Packages/Delphi10Seattle/Spring.Base.dproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@
9898
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Dictionaries.pas"/>
9999
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Events.pas"/>
100100
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Extensions.pas"/>
101-
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.HashTable.pas"/>
102101
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Lists.pas"/>
103102
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.LinkedLists.pas"/>
104103
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.MultiMaps.pas"/>
@@ -107,9 +106,12 @@
107106
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Sets.pas"/>
108107
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Stacks.pas"/>
109108
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Trees.pas"/>
109+
<DCCReference Include="..\..\Source\Base\Spring.Comparers.pas"/>
110110
<DCCReference Include="..\..\Source\Base\Spring.DesignPatterns.pas"/>
111111
<DCCReference Include="..\..\Source\Base\Spring.Events.pas"/>
112112
<DCCReference Include="..\..\Source\Base\Spring.Events.Base.pas"/>
113+
<DCCReference Include="..\..\Source\Base\Spring.Hash.pas"/>
114+
<DCCReference Include="..\..\Source\Base\Spring.HashTable.pas"/>
113115
<DCCReference Include="..\..\Source\Base\Spring.HazardEra.pas"/>
114116
<DCCReference Include="..\..\Source\Base\Spring.Helpers.pas"/>
115117
<DCCReference Include="..\..\Source\Base\Logging\Spring.Logging.pas"/>

‎Packages/Delphi10Sydney/Spring.Base.dpk‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ contains
4545
Spring.Collections.Dictionaries in '..\..\Source\Base\Collections\Spring.Collections.Dictionaries.pas',
4646
Spring.Collections.Events in '..\..\Source\Base\Collections\Spring.Collections.Events.pas',
4747
Spring.Collections.Extensions in '..\..\Source\Base\Collections\Spring.Collections.Extensions.pas',
48-
Spring.Collections.HashTable in '..\..\Source\Base\Collections\Spring.Collections.HashTable.pas',
4948
Spring.Collections.Lists in '..\..\Source\Base\Collections\Spring.Collections.Lists.pas',
5049
Spring.Collections.LinkedLists in '..\..\Source\Base\Collections\Spring.Collections.LinkedLists.pas',
5150
Spring.Collections.MultiMaps in '..\..\Source\Base\Collections\Spring.Collections.MultiMaps.pas',
@@ -54,9 +53,12 @@ contains
5453
Spring.Collections.Sets in '..\..\Source\Base\Collections\Spring.Collections.Sets.pas',
5554
Spring.Collections.Stacks in '..\..\Source\Base\Collections\Spring.Collections.Stacks.pas',
5655
Spring.Collections.Trees in '..\..\Source\Base\Collections\Spring.Collections.Trees.pas',
56+
Spring.Comparers in '..\..\Source\Base\Spring.Comparers.pas',
5757
Spring.DesignPatterns in '..\..\Source\Base\Spring.DesignPatterns.pas',
5858
Spring.Events in '..\..\Source\Base\Spring.Events.pas',
5959
Spring.Events.Base in '..\..\Source\Base\Spring.Events.Base.pas',
60+
Spring.Hash in '..\..\Source\Base\Spring.Hash.pas',
61+
Spring.HashTable in '..\..\Source\Base\Spring.HashTable.pas',
6062
Spring.HazardEra in '..\..\Source\Base\Spring.HazardEra.pas',
6163
Spring.Helpers in '..\..\Source\Base\Spring.Helpers.pas',
6264
Spring.Logging in '..\..\Source\Base\Logging\Spring.Logging.pas',

‎Packages/Delphi10Sydney/Spring.Base.dproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@
8181
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Dictionaries.pas"/>
8282
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Events.pas"/>
8383
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Extensions.pas"/>
84-
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.HashTable.pas"/>
8584
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Lists.pas"/>
8685
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.LinkedLists.pas"/>
8786
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.MultiMaps.pas"/>
@@ -90,9 +89,12 @@
9089
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Sets.pas"/>
9190
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Stacks.pas"/>
9291
<DCCReference Include="..\..\Source\Base\Collections\Spring.Collections.Trees.pas"/>
92+
<DCCReference Include="..\..\Source\Base\Spring.Comparers.pas"/>
9393
<DCCReference Include="..\..\Source\Base\Spring.DesignPatterns.pas"/>
9494
<DCCReference Include="..\..\Source\Base\Spring.Events.pas"/>
9595
<DCCReference Include="..\..\Source\Base\Spring.Events.Base.pas"/>
96+
<DCCReference Include="..\..\Source\Base\Spring.Hash.pas"/>
97+
<DCCReference Include="..\..\Source\Base\Spring.HashTable.pas"/>
9698
<DCCReference Include="..\..\Source\Base\Spring.HazardEra.pas"/>
9799
<DCCReference Include="..\..\Source\Base\Spring.Helpers.pas"/>
98100
<DCCReference Include="..\..\Source\Base\Logging\Spring.Logging.pas"/>

0 commit comments

Comments
 (0)