Skip to content

Commit 12abc88

Browse files
Ronierys2Ronierys2
authored
suporte TLS 1.3, retorno dos datasets e melhorias gerais de compatibilidade (#413)
2 parents 2bacff4 + 978dc16 commit 12abc88

35 files changed

Lines changed: 1774 additions & 923 deletions

‎CORE/Extras/TaurusTLS.zip‎

8.4 MB
Binary file not shown.

‎CORE/Packages/Delphi/Connectors/Indy/RESTDWSocketIndy.dpk‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ requires
3333
RESTDWCore,
3434
IndySystem,
3535
IndyCore,
36-
IndyProtocols;
36+
IndyProtocols,
37+
TaurusTLS_RT;
3738

3839
contains
3940
uRESTDWIdBase in '..\..\..\..\Source\Sockets\Indy\uRESTDWIdBase.pas';

‎CORE/Packages/Delphi/Connectors/Indy/RESTDWSocketIndy.dproj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@
188188
<DCCReference Include="IndySystem.dcp"/>
189189
<DCCReference Include="IndyCore.dcp"/>
190190
<DCCReference Include="IndyProtocols.dcp"/>
191+
<DCCReference Include="TaurusTLS_RT.dcp"/>
191192
<DCCReference Include="..\..\..\..\Source\Sockets\Indy\uRESTDWIdBase.pas"/>
192193
<BuildConfiguration Include="Base">
193194
<Key>Base</Key>
@@ -235,6 +236,12 @@
235236
<DeployFile LocalName="..\..\..\..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\22.0\Bpl\Win64\RESTDWSocketIndy.bpl" Configuration="Debug" Class="ProjectOutput"/>
236237
<DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\20.0\Bpl\RESTDWSocketIndy.bpl" Configuration="Debug" Class="ProjectOutput"/>
237238
<DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\RESTDWSocketIndy.bpl" Configuration="Debug" Class="ProjectOutput"/>
239+
<DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\RESTDWSocketIndy.bpl" Configuration="Debug" Class="ProjectOutput">
240+
<Platform Name="Win32">
241+
<RemoteName>RESTDWSocketIndy.bpl</RemoteName>
242+
<Overwrite>true</Overwrite>
243+
</Platform>
244+
</DeployFile>
238245
<DeployClass Name="AdditionalDebugSymbols">
239246
<Platform Name="OSX32">
240247
<Operation>1</Operation>

‎CORE/Packages/Delphi/Drivers/FireDAC/RESTDWFireDACDriver.dproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<FrameworkType>None</FrameworkType>
77
<Base>True</Base>
88
<Config Condition="'$(Config)'==''">Debug</Config>
9-
<Platform Condition="'$(Platform)'==''">Win64</Platform>
9+
<Platform Condition="'$(Platform)'==''">Win32</Platform>
1010
<TargetedPlatforms>3</TargetedPlatforms>
1111
<AppType>Package</AppType>
1212
<ProjectName Condition="'$(ProjectName)'==''">RESTDWFireDACDriver</ProjectName>

‎CORE/Packages/Delphi/Drivers/Zeos/RESTDWZEOSDriver.dproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<AppType>Package</AppType>
99
<FrameworkType>None</FrameworkType>
1010
<ProjectVersion>20.3</ProjectVersion>
11-
<Platform Condition="'$(Platform)'==''">Win64</Platform>
11+
<Platform Condition="'$(Platform)'==''">Win32</Platform>
1212
<ProjectName Condition="'$(ProjectName)'==''">RESTDWZEOSDriver</ProjectName>
1313
</PropertyGroup>
1414
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">

‎CORE/Packages/Delphi/RESTDWCore.dpk‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ package RESTDWCore;
3232
requires
3333
rtl,
3434
soaprtl,
35-
dbrtl;
35+
dbrtl,
36+
FireDAC,
37+
FireDACCommonDriver,
38+
FireDACCommon;
3639

3740
contains
3841
uRESTDWBasic in '..\..\Source\Basic\uRESTDWBasic.pas',
@@ -95,7 +98,9 @@ contains
9598
uRESTDWURLFunctions in '..\..\Source\utils\uRESTDWURLFunctions.pas',
9699
uRESTDWPropertyPersist in '..\..\Source\Basic\uRESTDWPropertyPersist.pas',
97100
uRESTDWStorageBin in '..\..\Source\Basic\uRESTDWStorageBin.pas',
98-
uRESTDWMemoryDataset in '..\..\Source\Plugins\Memdataset\uRESTDWMemoryDataset.pas',
101+
{$IFDEF RESTDWMEMTABLE}
102+
uRESTDWMemoryDataset in '..\..\Source\Plugins\Memdataset\uRESTDWMemoryDataset.pas',
103+
{$ENDIF}
99104
uRESTDWProtoTypes in '..\..\Source\Basic\uRESTDWProtoTypes.pas',
100105
uRESTDWExprParser in '..\..\Source\Plugins\Memdataset\uRESTDWExprParser.pas',
101106
uRESTDWDriverBase in '..\..\Source\Database_Drivers\uRESTDWDriverBase.pas',

‎CORE/Packages/Delphi/RESTDWCore.dproj‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,12 +218,12 @@
218218
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
219219
<DCC_DcuOutput>..\..\compiled</DCC_DcuOutput>
220220
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
221-
<VerInfo_Keys>CompanyName=XyberPower Desenvolvimento;FileDescription=$(MSBuildProjectName);FileVersion=2.1.0.131;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
221+
<VerInfo_Keys>CompanyName=XyberPower Desenvolvimento;FileDescription=$(MSBuildProjectName);FileVersion=2.1.0.144;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
222222
<VerInfo_Locale>1033</VerInfo_Locale>
223223
<VerInfo_MajorVer>2</VerInfo_MajorVer>
224224
<VerInfo_MinorVer>1</VerInfo_MinorVer>
225225
<DCC_Description>REST Dataware - Core</DCC_Description>
226-
<VerInfo_Build>131</VerInfo_Build>
226+
<VerInfo_Build>144</VerInfo_Build>
227227
<VerInfo_AutoIncVersion>true</VerInfo_AutoIncVersion>
228228
<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
229229
</PropertyGroup>
@@ -239,6 +239,9 @@
239239
<DCCReference Include="rtl.dcp"/>
240240
<DCCReference Include="soaprtl.dcp"/>
241241
<DCCReference Include="dbrtl.dcp"/>
242+
<DCCReference Include="FireDAC.dcp"/>
243+
<DCCReference Include="FireDACCommonDriver.dcp"/>
244+
<DCCReference Include="FireDACCommon.dcp"/>
242245
<DCCReference Include="..\..\Source\Basic\uRESTDWBasic.pas"/>
243246
<DCCReference Include="..\..\Source\Basic\uRESTDWBasicDB.pas"/>
244247
<DCCReference Include="..\..\Source\Basic\uRESTDWBasicTypes.pas"/>
@@ -302,7 +305,6 @@
302305
<DCCReference Include="..\..\Source\utils\uRESTDWURLFunctions.pas"/>
303306
<DCCReference Include="..\..\Source\Basic\uRESTDWPropertyPersist.pas"/>
304307
<DCCReference Include="..\..\Source\Basic\uRESTDWStorageBin.pas"/>
305-
<DCCReference Include="..\..\Source\Plugins\Memdataset\uRESTDWMemoryDataset.pas"/>
306308
<DCCReference Include="..\..\Source\Basic\uRESTDWProtoTypes.pas"/>
307309
<DCCReference Include="..\..\Source\Plugins\Memdataset\uRESTDWExprParser.pas"/>
308310
<DCCReference Include="..\..\Source\Database_Drivers\uRESTDWDriverBase.pas"/>
@@ -367,6 +369,12 @@
367369
<DeployFile LocalName="..\..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\19.0\Bpl\RESTDWCore.bpl" Configuration="Debug" Class="ProjectOutput"/>
368370
<DeployFile LocalName="..\..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\22.0\Bpl\RESTDWCore.bpl" Configuration="Debug" Class="ProjectOutput"/>
369371
<DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\RESTDWCore.bpl" Configuration="Debug" Class="ProjectOutput"/>
372+
<DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\RESTDWCore.bpl" Configuration="Debug" Class="ProjectOutput">
373+
<Platform Name="Win32">
374+
<RemoteName>RESTDWCore.bpl</RemoteName>
375+
<Overwrite>true</Overwrite>
376+
</Platform>
377+
</DeployFile>
370378
<DeployClass Name="AdditionalDebugSymbols">
371379
<Platform Name="OSX32">
372380
<Operation>1</Operation>

‎CORE/Packages/Delphi/ShellTools/RESTDWShellServicesDesign.dproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<FrameworkType>None</FrameworkType>
77
<Base>True</Base>
88
<Config Condition="'$(Config)'==''">Debug</Config>
9-
<Platform Condition="'$(Platform)'==''">Win64</Platform>
9+
<Platform Condition="'$(Platform)'==''">Win32</Platform>
1010
<TargetedPlatforms>3</TargetedPlatforms>
1111
<AppType>Package</AppType>
1212
<ProjectName Condition="'$(ProjectName)'==''">RESTDWShellServicesDesign</ProjectName>

‎CORE/Source/Basic/uRESTDWBasic.pas‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ interface
3434
{$IFDEF RESTDWFMX}System.IOUtils,{$ENDIF}
3535
SysUtils, Classes, Db, Variants,
3636
{$IFNDEF RESTDWLAZARUS}SyncObjs,{$ENDIF}
37-
uRESTDWComponentEvents, uRESTDWBasicTypes, uRESTDWProtoTypes, uRESTDWJSONObject,
37+
uRESTDWComponentEvents, uRESTDWBasicTypes, uRESTDWBasicDbTypes, uRESTDWProtoTypes, uRESTDWJSONObject,
3838
uRESTDWParams, uRESTDWMassiveBuffer, uRESTDWDataUtils,
3939
uRESTDWTools, uRESTDWConsts, uRESTDWMessageCoderMIME,
4040
uRESTDWZlib, uRESTDWMimeTypes, uRESTDWAbout, uRESTDWAuthenticators, uRESTDWBasicClass;

0 commit comments

Comments
 (0)