diff --git a/CORE/Packages/Delphi/Connectors/Ics/RESTDWSocketIcs.dproj b/CORE/Packages/Delphi/Connectors/Ics/RESTDWSocketIcs.dproj index a490ccf4..be023321 100644 --- a/CORE/Packages/Delphi/Connectors/Ics/RESTDWSocketIcs.dproj +++ b/CORE/Packages/Delphi/Connectors/Ics/RESTDWSocketIcs.dproj @@ -2,13 +2,14 @@ {A67F6316-69EF-47DE-B9B2-6F96F4AF1CEB} RESTDWSocketIcs.dpk - 19.5 + 20.3 None True Debug Win32 3 Package + RESTDWSocketIcs true @@ -48,6 +49,11 @@ Base true + + true + Base + true + true Base @@ -128,6 +134,13 @@ CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= 1033 + + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + 1033 + DEBUG;$(DCC_Define) true @@ -188,7 +201,7 @@ RESTDWSocketIcs.dpk - + @@ -217,16 +230,6 @@ 0 - - - classes - 64 - - - classes - 64 - - res\xml @@ -237,12 +240,6 @@ 1 - - - library\lib\armeabi-v7a - 1 - - library\lib\armeabi @@ -295,6 +292,16 @@ 1 + + + res\drawable-anydpi-v21 + 1 + + + res\drawable-anydpi-v21 + 1 + + res\values @@ -315,6 +322,76 @@ 1 + + + res\values-v31 + 1 + + + res\values-v31 + 1 + + + + + res\values-v35 + 1 + + + res\values-v35 + 1 + + + + + res\drawable-anydpi-v26 + 1 + + + res\drawable-anydpi-v26 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-anydpi-v33 + 1 + + + res\drawable-anydpi-v33 + 1 + + res\values @@ -325,6 +402,16 @@ 1 + + + res\values-night-v21 + 1 + + + res\values-night-v21 + 1 + + res\drawable @@ -495,6 +582,56 @@ 1 + + + res\drawable-anydpi-v24 + 1 + + + res\drawable-anydpi-v24 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-night-anydpi-v21 + 1 + + + res\drawable-night-anydpi-v21 + 1 + + + + + res\drawable-anydpi-v31 + 1 + + + res\drawable-anydpi-v31 + 1 + + + + + res\drawable-night-anydpi-v31 + 1 + + + res\drawable-night-anydpi-v31 + 1 + + 1 @@ -672,6 +809,9 @@ 1 + + 1 + @@ -933,15 +1073,18 @@ + False False False False + False False True True + False 12 diff --git a/CORE/Packages/Delphi/Connectors/Ics/RESTDWSocketIcsDesign.dproj b/CORE/Packages/Delphi/Connectors/Ics/RESTDWSocketIcsDesign.dproj index e9ce317e..d9e411de 100644 --- a/CORE/Packages/Delphi/Connectors/Ics/RESTDWSocketIcsDesign.dproj +++ b/CORE/Packages/Delphi/Connectors/Ics/RESTDWSocketIcsDesign.dproj @@ -2,13 +2,14 @@ {645810E3-443D-4DFA-AC30-B0C8146C08FE} RESTDWSocketIcsDesign.dpk - 19.5 + 20.3 VCL True Debug - Win32 + Win64 3 Package + RESTDWSocketIcsDesign true @@ -33,6 +34,11 @@ Base true + + true + Base + true + true Base @@ -99,6 +105,13 @@ rtl;RESTDWSocketIndy;RESTDWSocketIcs;$(DCC_UsePackage) Debug + + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + 1033 + DEBUG;$(DCC_Define) true @@ -154,7 +167,7 @@ RESTDWSocketIcsDesign.dpk - + @@ -169,16 +182,6 @@ 0 - - - classes - 64 - - - classes - 64 - - res\xml @@ -189,12 +192,6 @@ 1 - - - library\lib\armeabi-v7a - 1 - - library\lib\armeabi @@ -247,6 +244,16 @@ 1 + + + res\drawable-anydpi-v21 + 1 + + + res\drawable-anydpi-v21 + 1 + + res\values @@ -267,6 +274,76 @@ 1 + + + res\values-v31 + 1 + + + res\values-v31 + 1 + + + + + res\values-v35 + 1 + + + res\values-v35 + 1 + + + + + res\drawable-anydpi-v26 + 1 + + + res\drawable-anydpi-v26 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-anydpi-v33 + 1 + + + res\drawable-anydpi-v33 + 1 + + res\values @@ -277,6 +354,16 @@ 1 + + + res\values-night-v21 + 1 + + + res\values-night-v21 + 1 + + res\drawable @@ -447,6 +534,56 @@ 1 + + + res\drawable-anydpi-v24 + 1 + + + res\drawable-anydpi-v24 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-night-anydpi-v21 + 1 + + + res\drawable-night-anydpi-v21 + 1 + + + + + res\drawable-anydpi-v31 + 1 + + + res\drawable-anydpi-v31 + 1 + + + + + res\drawable-night-anydpi-v31 + 1 + + + res\drawable-night-anydpi-v31 + 1 + + 1 @@ -624,6 +761,9 @@ 1 + + 1 + @@ -885,12 +1025,14 @@ + False False True True + False 12 diff --git a/CORE/Packages/Delphi/Connectors/Indy/RESTDWSocketIndy.dproj b/CORE/Packages/Delphi/Connectors/Indy/RESTDWSocketIndy.dproj index 18dc2bfa..907b4880 100644 --- a/CORE/Packages/Delphi/Connectors/Indy/RESTDWSocketIndy.dproj +++ b/CORE/Packages/Delphi/Connectors/Indy/RESTDWSocketIndy.dproj @@ -2,13 +2,14 @@ {8B3C90C4-F0A2-4045-BF82-210E62FA85E0} RESTDWSocketIndy.dpk - 19.5 + 20.3 None True Debug Win32 33811 Package + RESTDWSocketIndy true @@ -53,6 +54,11 @@ Base true + + true + Base + true + true Base @@ -93,11 +99,11 @@ None annotation-1.2.0.dex.jar;asynclayoutinflater-1.0.0.dex.jar;billing-4.0.0.dex.jar;browser-1.0.0.dex.jar;cloud-messaging.dex.jar;collection-1.0.0.dex.jar;coordinatorlayout-1.0.0.dex.jar;core-1.5.0-rc02.dex.jar;core-common-2.0.1.dex.jar;core-runtime-2.0.1.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;firebase-annotations-16.0.0.dex.jar;firebase-common-20.0.0.dex.jar;firebase-components-17.0.0.dex.jar;firebase-datatransport-18.0.0.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.0.0.dex.jar;firebase-installations-interop-17.0.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-22.0.0.dex.jar;fmx.dex.jar;fragment-1.0.0.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;legacy-support-core-ui-1.0.0.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.0.0.dex.jar;lifecycle-livedata-2.0.0.dex.jar;lifecycle-livedata-core-2.0.0.dex.jar;lifecycle-runtime-2.0.0.dex.jar;lifecycle-service-2.0.0.dex.jar;lifecycle-viewmodel-2.0.0.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;play-services-ads-20.1.0.dex.jar;play-services-ads-base-20.1.0.dex.jar;play-services-ads-identifier-17.0.0.dex.jar;play-services-ads-lite-20.1.0.dex.jar;play-services-base-17.5.0.dex.jar;play-services-basement-17.6.0.dex.jar;play-services-cloud-messaging-16.0.0.dex.jar;play-services-drive-17.0.0.dex.jar;play-services-games-21.0.0.dex.jar;play-services-location-18.0.0.dex.jar;play-services-maps-17.0.1.dex.jar;play-services-measurement-base-18.0.0.dex.jar;play-services-measurement-sdk-api-18.0.0.dex.jar;play-services-places-placereport-17.0.0.dex.jar;play-services-stats-17.0.0.dex.jar;play-services-tasks-17.2.0.dex.jar;print-1.0.0.dex.jar;room-common-2.1.0.dex.jar;room-runtime-2.1.0.dex.jar;slidingpanelayout-1.0.0.dex.jar;sqlite-2.0.1.dex.jar;sqlite-framework-2.0.1.dex.jar;swiperefreshlayout-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.0.0.dex.jar;transport-runtime-3.0.0.dex.jar;user-messaging-platform-1.0.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.1.0.dex.jar - package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=;minSdkVersion=23;targetSdkVersion=35 Debug - package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=;minSdkVersion=23;targetSdkVersion=35 Debug annotation-1.2.0.dex.jar;asynclayoutinflater-1.0.0.dex.jar;billing-4.0.0.dex.jar;browser-1.0.0.dex.jar;cloud-messaging.dex.jar;collection-1.0.0.dex.jar;coordinatorlayout-1.0.0.dex.jar;core-1.5.0-rc02.dex.jar;core-common-2.0.1.dex.jar;core-runtime-2.0.1.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;firebase-annotations-16.0.0.dex.jar;firebase-common-20.0.0.dex.jar;firebase-components-17.0.0.dex.jar;firebase-datatransport-18.0.0.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.0.0.dex.jar;firebase-installations-interop-17.0.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-22.0.0.dex.jar;fmx.dex.jar;fragment-1.0.0.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;legacy-support-core-ui-1.0.0.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.0.0.dex.jar;lifecycle-livedata-2.0.0.dex.jar;lifecycle-livedata-core-2.0.0.dex.jar;lifecycle-runtime-2.0.0.dex.jar;lifecycle-service-2.0.0.dex.jar;lifecycle-viewmodel-2.0.0.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;play-services-ads-20.1.0.dex.jar;play-services-ads-base-20.1.0.dex.jar;play-services-ads-identifier-17.0.0.dex.jar;play-services-ads-lite-20.1.0.dex.jar;play-services-base-17.5.0.dex.jar;play-services-basement-17.6.0.dex.jar;play-services-cloud-messaging-16.0.0.dex.jar;play-services-drive-17.0.0.dex.jar;play-services-games-21.0.0.dex.jar;play-services-location-18.0.0.dex.jar;play-services-maps-17.0.1.dex.jar;play-services-measurement-base-18.0.0.dex.jar;play-services-measurement-sdk-api-18.0.0.dex.jar;play-services-places-placereport-17.0.0.dex.jar;play-services-stats-17.0.0.dex.jar;play-services-tasks-17.2.0.dex.jar;print-1.0.0.dex.jar;room-common-2.1.0.dex.jar;room-runtime-2.1.0.dex.jar;slidingpanelayout-1.0.0.dex.jar;sqlite-2.0.1.dex.jar;sqlite-framework-2.0.1.dex.jar;swiperefreshlayout-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.0.0.dex.jar;transport-runtime-3.0.0.dex.jar;user-messaging-platform-1.0.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.1.0.dex.jar @@ -136,6 +142,13 @@ CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= 1033 + + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + 1033 + DEBUG;$(DCC_Define) true @@ -200,7 +213,7 @@ RESTDWSocketIndy.dpk - + @@ -221,12 +234,7 @@ - - - RESTDWSocketIndy.bpl - true - - + 1 @@ -235,16 +243,6 @@ 0 - - - classes - 64 - - - classes - 64 - - res\xml @@ -255,12 +253,6 @@ 1 - - - library\lib\armeabi-v7a - 1 - - library\lib\armeabi @@ -313,6 +305,16 @@ 1 + + + res\drawable-anydpi-v21 + 1 + + + res\drawable-anydpi-v21 + 1 + + res\values @@ -333,6 +335,76 @@ 1 + + + res\values-v31 + 1 + + + res\values-v31 + 1 + + + + + res\values-v35 + 1 + + + res\values-v35 + 1 + + + + + res\drawable-anydpi-v26 + 1 + + + res\drawable-anydpi-v26 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-anydpi-v33 + 1 + + + res\drawable-anydpi-v33 + 1 + + res\values @@ -343,6 +415,16 @@ 1 + + + res\values-night-v21 + 1 + + + res\values-night-v21 + 1 + + res\drawable @@ -513,6 +595,56 @@ 1 + + + res\drawable-anydpi-v24 + 1 + + + res\drawable-anydpi-v24 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-night-anydpi-v21 + 1 + + + res\drawable-night-anydpi-v21 + 1 + + + + + res\drawable-anydpi-v31 + 1 + + + res\drawable-anydpi-v31 + 1 + + + + + res\drawable-night-anydpi-v31 + 1 + + + res\drawable-night-anydpi-v31 + 1 + + 1 @@ -690,6 +822,9 @@ 1 + + 1 + @@ -951,16 +1086,19 @@ + True True True False + False False False True True + False 12 diff --git a/CORE/Packages/Delphi/Connectors/Indy/RESTDWSocketIndyDesign.dproj b/CORE/Packages/Delphi/Connectors/Indy/RESTDWSocketIndyDesign.dproj index d49f3429..9393c7e6 100644 --- a/CORE/Packages/Delphi/Connectors/Indy/RESTDWSocketIndyDesign.dproj +++ b/CORE/Packages/Delphi/Connectors/Indy/RESTDWSocketIndyDesign.dproj @@ -2,13 +2,14 @@ {FD20C3A3-AC3B-448C-89FA-744644EB144E} RESTDWSocketIndyDesign.dpk - 19.5 + 20.3 None True Debug - Win32 + Win64 558099 Package + RESTDWSocketIndyDesign true @@ -43,6 +44,11 @@ Base true + + true + Base + true + true Base @@ -76,12 +82,12 @@ ..\..\..\..\compiled - package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=;minSdkVersion=23;targetSdkVersion=35 Debug activity-1.1.0.dex.jar;annotation-1.2.0.dex.jar;appcompat-1.2.0.dex.jar;appcompat-resources-1.2.0.dex.jar;asynclayoutinflater-1.0.0.dex.jar;billing-4.0.0.dex.jar;biometric-1.1.0.dex.jar;browser-1.0.0.dex.jar;cloud-messaging.dex.jar;collection-1.1.0.dex.jar;coordinatorlayout-1.0.0.dex.jar;core-1.5.0-rc02.dex.jar;core-common-2.1.0.dex.jar;core-runtime-2.1.0.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;firebase-annotations-16.0.0.dex.jar;firebase-common-20.0.0.dex.jar;firebase-components-17.0.0.dex.jar;firebase-datatransport-18.0.0.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.0.0.dex.jar;firebase-installations-interop-17.0.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-22.0.0.dex.jar;fmx.dex.jar;fragment-1.2.5.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;legacy-support-core-ui-1.0.0.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.2.0.dex.jar;lifecycle-livedata-2.0.0.dex.jar;lifecycle-livedata-core-2.2.0.dex.jar;lifecycle-runtime-2.2.0.dex.jar;lifecycle-service-2.0.0.dex.jar;lifecycle-viewmodel-2.2.0.dex.jar;lifecycle-viewmodel-savedstate-2.2.0.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;play-services-ads-20.1.0.dex.jar;play-services-ads-base-20.1.0.dex.jar;play-services-ads-identifier-17.0.0.dex.jar;play-services-ads-lite-20.1.0.dex.jar;play-services-base-17.5.0.dex.jar;play-services-basement-17.6.0.dex.jar;play-services-cloud-messaging-16.0.0.dex.jar;play-services-drive-17.0.0.dex.jar;play-services-games-21.0.0.dex.jar;play-services-location-18.0.0.dex.jar;play-services-maps-17.0.1.dex.jar;play-services-measurement-base-18.0.0.dex.jar;play-services-measurement-sdk-api-18.0.0.dex.jar;play-services-places-placereport-17.0.0.dex.jar;play-services-stats-17.0.0.dex.jar;play-services-tasks-17.2.0.dex.jar;print-1.0.0.dex.jar;room-common-2.1.0.dex.jar;room-runtime-2.1.0.dex.jar;savedstate-1.0.0.dex.jar;slidingpanelayout-1.0.0.dex.jar;sqlite-2.0.1.dex.jar;sqlite-framework-2.0.1.dex.jar;swiperefreshlayout-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.0.0.dex.jar;transport-runtime-3.0.0.dex.jar;user-messaging-platform-1.0.0.dex.jar;vectordrawable-1.1.0.dex.jar;vectordrawable-animated-1.1.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.1.0.dex.jar - package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=;minSdkVersion=23;targetSdkVersion=35 Debug activity-1.1.0.dex.jar;annotation-1.2.0.dex.jar;appcompat-1.2.0.dex.jar;appcompat-resources-1.2.0.dex.jar;asynclayoutinflater-1.0.0.dex.jar;billing-4.0.0.dex.jar;biometric-1.1.0.dex.jar;browser-1.0.0.dex.jar;cloud-messaging.dex.jar;collection-1.1.0.dex.jar;coordinatorlayout-1.0.0.dex.jar;core-1.5.0-rc02.dex.jar;core-common-2.1.0.dex.jar;core-runtime-2.1.0.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;firebase-annotations-16.0.0.dex.jar;firebase-common-20.0.0.dex.jar;firebase-components-17.0.0.dex.jar;firebase-datatransport-18.0.0.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.0.0.dex.jar;firebase-installations-interop-17.0.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-22.0.0.dex.jar;fmx.dex.jar;fragment-1.2.5.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;legacy-support-core-ui-1.0.0.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.2.0.dex.jar;lifecycle-livedata-2.0.0.dex.jar;lifecycle-livedata-core-2.2.0.dex.jar;lifecycle-runtime-2.2.0.dex.jar;lifecycle-service-2.0.0.dex.jar;lifecycle-viewmodel-2.2.0.dex.jar;lifecycle-viewmodel-savedstate-2.2.0.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;play-services-ads-20.1.0.dex.jar;play-services-ads-base-20.1.0.dex.jar;play-services-ads-identifier-17.0.0.dex.jar;play-services-ads-lite-20.1.0.dex.jar;play-services-base-17.5.0.dex.jar;play-services-basement-17.6.0.dex.jar;play-services-cloud-messaging-16.0.0.dex.jar;play-services-drive-17.0.0.dex.jar;play-services-games-21.0.0.dex.jar;play-services-location-18.0.0.dex.jar;play-services-maps-17.0.1.dex.jar;play-services-measurement-base-18.0.0.dex.jar;play-services-measurement-sdk-api-18.0.0.dex.jar;play-services-places-placereport-17.0.0.dex.jar;play-services-stats-17.0.0.dex.jar;play-services-tasks-17.2.0.dex.jar;print-1.0.0.dex.jar;room-common-2.1.0.dex.jar;room-runtime-2.1.0.dex.jar;savedstate-1.0.0.dex.jar;slidingpanelayout-1.0.0.dex.jar;sqlite-2.0.1.dex.jar;sqlite-framework-2.0.1.dex.jar;swiperefreshlayout-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.0.0.dex.jar;transport-runtime-3.0.0.dex.jar;user-messaging-platform-1.0.0.dex.jar;vectordrawable-1.1.0.dex.jar;vectordrawable-animated-1.1.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.1.0.dex.jar @@ -113,6 +119,13 @@ rtl;RESTDWSocketIndy;$(DCC_UsePackage) Debug + + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + 1033 + DEBUG;$(DCC_Define) true @@ -168,7 +181,7 @@ RESTDWSocketIndyDesign.dpk - + @@ -196,16 +209,6 @@ 0 - - - classes - 64 - - - classes - 64 - - res\xml @@ -216,12 +219,6 @@ 1 - - - library\lib\armeabi-v7a - 1 - - library\lib\armeabi @@ -274,6 +271,16 @@ 1 + + + res\drawable-anydpi-v21 + 1 + + + res\drawable-anydpi-v21 + 1 + + res\values @@ -294,6 +301,76 @@ 1 + + + res\values-v31 + 1 + + + res\values-v31 + 1 + + + + + res\values-v35 + 1 + + + res\values-v35 + 1 + + + + + res\drawable-anydpi-v26 + 1 + + + res\drawable-anydpi-v26 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-anydpi-v33 + 1 + + + res\drawable-anydpi-v33 + 1 + + res\values @@ -304,6 +381,16 @@ 1 + + + res\values-night-v21 + 1 + + + res\values-night-v21 + 1 + + res\drawable @@ -474,6 +561,56 @@ 1 + + + res\drawable-anydpi-v24 + 1 + + + res\drawable-anydpi-v24 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-night-anydpi-v21 + 1 + + + res\drawable-night-anydpi-v21 + 1 + + + + + res\drawable-anydpi-v31 + 1 + + + res\drawable-anydpi-v31 + 1 + + + + + res\drawable-night-anydpi-v31 + 1 + + + res\drawable-night-anydpi-v31 + 1 + + 1 @@ -651,6 +788,9 @@ 1 + + 1 + @@ -912,14 +1052,17 @@ + True True True True + False True True + False 12 diff --git a/CORE/Packages/Delphi/Drivers/AnyDAC/RESTDWAnyDACDriver.dproj b/CORE/Packages/Delphi/Drivers/AnyDAC/RESTDWAnyDACDriver.dproj index 5db129f9..a8417ffe 100644 --- a/CORE/Packages/Delphi/Drivers/AnyDAC/RESTDWAnyDACDriver.dproj +++ b/CORE/Packages/Delphi/Drivers/AnyDAC/RESTDWAnyDACDriver.dproj @@ -2,13 +2,14 @@ {5B6D7BDD-2939-4069-8FA3-FE2F16712918} RESTDWAnyDACDriver.dpk - 19.5 + 20.3 None True Debug - Win32 + Win64 693267 Package + RESTDWAnyDACDriver true @@ -53,6 +54,11 @@ Base true + + true + Base + true + true Base @@ -86,13 +92,13 @@ None annotation-1.2.0.dex.jar;asynclayoutinflater-1.0.0.dex.jar;billing-4.0.0.dex.jar;browser-1.0.0.dex.jar;cloud-messaging.dex.jar;collection-1.0.0.dex.jar;coordinatorlayout-1.0.0.dex.jar;core-1.5.0-rc02.dex.jar;core-common-2.0.1.dex.jar;core-runtime-2.0.1.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;firebase-annotations-16.0.0.dex.jar;firebase-common-20.0.0.dex.jar;firebase-components-17.0.0.dex.jar;firebase-datatransport-18.0.0.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.0.0.dex.jar;firebase-installations-interop-17.0.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-22.0.0.dex.jar;fmx.dex.jar;fragment-1.0.0.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;legacy-support-core-ui-1.0.0.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.0.0.dex.jar;lifecycle-livedata-2.0.0.dex.jar;lifecycle-livedata-core-2.0.0.dex.jar;lifecycle-runtime-2.0.0.dex.jar;lifecycle-service-2.0.0.dex.jar;lifecycle-viewmodel-2.0.0.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;play-services-ads-20.1.0.dex.jar;play-services-ads-base-20.1.0.dex.jar;play-services-ads-identifier-17.0.0.dex.jar;play-services-ads-lite-20.1.0.dex.jar;play-services-base-17.5.0.dex.jar;play-services-basement-17.6.0.dex.jar;play-services-cloud-messaging-16.0.0.dex.jar;play-services-drive-17.0.0.dex.jar;play-services-games-21.0.0.dex.jar;play-services-location-18.0.0.dex.jar;play-services-maps-17.0.1.dex.jar;play-services-measurement-base-18.0.0.dex.jar;play-services-measurement-sdk-api-18.0.0.dex.jar;play-services-places-placereport-17.0.0.dex.jar;play-services-stats-17.0.0.dex.jar;play-services-tasks-17.2.0.dex.jar;print-1.0.0.dex.jar;room-common-2.1.0.dex.jar;room-runtime-2.1.0.dex.jar;slidingpanelayout-1.0.0.dex.jar;sqlite-2.0.1.dex.jar;sqlite-framework-2.0.1.dex.jar;swiperefreshlayout-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.0.0.dex.jar;transport-runtime-3.0.0.dex.jar;user-messaging-platform-1.0.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.1.0.dex.jar - package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=;minSdkVersion=23;targetSdkVersion=35 Debug None annotation-1.2.0.dex.jar;asynclayoutinflater-1.0.0.dex.jar;billing-4.0.0.dex.jar;browser-1.0.0.dex.jar;cloud-messaging.dex.jar;collection-1.0.0.dex.jar;coordinatorlayout-1.0.0.dex.jar;core-1.5.0-rc02.dex.jar;core-common-2.0.1.dex.jar;core-runtime-2.0.1.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;firebase-annotations-16.0.0.dex.jar;firebase-common-20.0.0.dex.jar;firebase-components-17.0.0.dex.jar;firebase-datatransport-18.0.0.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.0.0.dex.jar;firebase-installations-interop-17.0.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-22.0.0.dex.jar;fmx.dex.jar;fragment-1.0.0.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;legacy-support-core-ui-1.0.0.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.0.0.dex.jar;lifecycle-livedata-2.0.0.dex.jar;lifecycle-livedata-core-2.0.0.dex.jar;lifecycle-runtime-2.0.0.dex.jar;lifecycle-service-2.0.0.dex.jar;lifecycle-viewmodel-2.0.0.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;play-services-ads-20.1.0.dex.jar;play-services-ads-base-20.1.0.dex.jar;play-services-ads-identifier-17.0.0.dex.jar;play-services-ads-lite-20.1.0.dex.jar;play-services-base-17.5.0.dex.jar;play-services-basement-17.6.0.dex.jar;play-services-cloud-messaging-16.0.0.dex.jar;play-services-drive-17.0.0.dex.jar;play-services-games-21.0.0.dex.jar;play-services-location-18.0.0.dex.jar;play-services-maps-17.0.1.dex.jar;play-services-measurement-base-18.0.0.dex.jar;play-services-measurement-sdk-api-18.0.0.dex.jar;play-services-places-placereport-17.0.0.dex.jar;play-services-stats-17.0.0.dex.jar;play-services-tasks-17.2.0.dex.jar;print-1.0.0.dex.jar;room-common-2.1.0.dex.jar;room-runtime-2.1.0.dex.jar;slidingpanelayout-1.0.0.dex.jar;sqlite-2.0.1.dex.jar;sqlite-framework-2.0.1.dex.jar;swiperefreshlayout-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.0.0.dex.jar;transport-runtime-3.0.0.dex.jar;user-messaging-platform-1.0.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.1.0.dex.jar - package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=;minSdkVersion=23;targetSdkVersion=35 Debug @@ -110,11 +116,11 @@ true - CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false + CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing the Bluetooth interface Debug - CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false + CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing the Bluetooth interface Debug @@ -131,6 +137,13 @@ CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= 1033 + + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + 1033 + DEBUG;$(DCC_Define) true @@ -189,7 +202,7 @@ (untitled) - + true @@ -205,12 +218,7 @@ true - - - RESTDWAnyDACDriver.bpl - true - - + 1 @@ -219,16 +227,6 @@ 0 - - - classes - 64 - - - classes - 64 - - res\xml @@ -239,12 +237,6 @@ 1 - - - library\lib\armeabi-v7a - 1 - - library\lib\armeabi @@ -297,6 +289,16 @@ 1 + + + res\drawable-anydpi-v21 + 1 + + + res\drawable-anydpi-v21 + 1 + + res\values @@ -317,6 +319,76 @@ 1 + + + res\values-v31 + 1 + + + res\values-v31 + 1 + + + + + res\values-v35 + 1 + + + res\values-v35 + 1 + + + + + res\drawable-anydpi-v26 + 1 + + + res\drawable-anydpi-v26 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-anydpi-v33 + 1 + + + res\drawable-anydpi-v33 + 1 + + res\values @@ -327,6 +399,16 @@ 1 + + + res\values-night-v21 + 1 + + + res\values-night-v21 + 1 + + res\drawable @@ -497,6 +579,56 @@ 1 + + + res\drawable-anydpi-v24 + 1 + + + res\drawable-anydpi-v24 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-night-anydpi-v21 + 1 + + + res\drawable-night-anydpi-v21 + 1 + + + + + res\drawable-anydpi-v31 + 1 + + + res\drawable-anydpi-v31 + 1 + + + + + res\drawable-night-anydpi-v31 + 1 + + + res\drawable-night-anydpi-v31 + 1 + + 1 @@ -674,6 +806,9 @@ 1 + + 1 + @@ -934,16 +1069,19 @@ + True True True True + False True True True True + False 12 diff --git a/CORE/Packages/Delphi/Drivers/ApolloDB/RESTDWApolloDBDriver.dproj b/CORE/Packages/Delphi/Drivers/ApolloDB/RESTDWApolloDBDriver.dproj index 054ea4c6..885e6fab 100644 --- a/CORE/Packages/Delphi/Drivers/ApolloDB/RESTDWApolloDBDriver.dproj +++ b/CORE/Packages/Delphi/Drivers/ApolloDB/RESTDWApolloDBDriver.dproj @@ -2,13 +2,14 @@ {7514457C-7190-4D6E-A65D-950C052F0397} RESTDWApolloDBDriver.dpk - 19.5 + 20.3 None True Debug - Win32 + Win64 693267 Package + RESTDWApolloDBDriver true @@ -53,6 +54,11 @@ Base true + + true + Base + true + true Base @@ -86,13 +92,13 @@ None annotation-1.2.0.dex.jar;asynclayoutinflater-1.0.0.dex.jar;billing-4.0.0.dex.jar;browser-1.0.0.dex.jar;cloud-messaging.dex.jar;collection-1.0.0.dex.jar;coordinatorlayout-1.0.0.dex.jar;core-1.5.0-rc02.dex.jar;core-common-2.0.1.dex.jar;core-runtime-2.0.1.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;firebase-annotations-16.0.0.dex.jar;firebase-common-20.0.0.dex.jar;firebase-components-17.0.0.dex.jar;firebase-datatransport-18.0.0.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.0.0.dex.jar;firebase-installations-interop-17.0.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-22.0.0.dex.jar;fmx.dex.jar;fragment-1.0.0.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;legacy-support-core-ui-1.0.0.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.0.0.dex.jar;lifecycle-livedata-2.0.0.dex.jar;lifecycle-livedata-core-2.0.0.dex.jar;lifecycle-runtime-2.0.0.dex.jar;lifecycle-service-2.0.0.dex.jar;lifecycle-viewmodel-2.0.0.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;play-services-ads-20.1.0.dex.jar;play-services-ads-base-20.1.0.dex.jar;play-services-ads-identifier-17.0.0.dex.jar;play-services-ads-lite-20.1.0.dex.jar;play-services-base-17.5.0.dex.jar;play-services-basement-17.6.0.dex.jar;play-services-cloud-messaging-16.0.0.dex.jar;play-services-drive-17.0.0.dex.jar;play-services-games-21.0.0.dex.jar;play-services-location-18.0.0.dex.jar;play-services-maps-17.0.1.dex.jar;play-services-measurement-base-18.0.0.dex.jar;play-services-measurement-sdk-api-18.0.0.dex.jar;play-services-places-placereport-17.0.0.dex.jar;play-services-stats-17.0.0.dex.jar;play-services-tasks-17.2.0.dex.jar;print-1.0.0.dex.jar;room-common-2.1.0.dex.jar;room-runtime-2.1.0.dex.jar;slidingpanelayout-1.0.0.dex.jar;sqlite-2.0.1.dex.jar;sqlite-framework-2.0.1.dex.jar;swiperefreshlayout-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.0.0.dex.jar;transport-runtime-3.0.0.dex.jar;user-messaging-platform-1.0.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.1.0.dex.jar - package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=;minSdkVersion=23;targetSdkVersion=35 Debug None annotation-1.2.0.dex.jar;asynclayoutinflater-1.0.0.dex.jar;billing-4.0.0.dex.jar;browser-1.0.0.dex.jar;cloud-messaging.dex.jar;collection-1.0.0.dex.jar;coordinatorlayout-1.0.0.dex.jar;core-1.5.0-rc02.dex.jar;core-common-2.0.1.dex.jar;core-runtime-2.0.1.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;firebase-annotations-16.0.0.dex.jar;firebase-common-20.0.0.dex.jar;firebase-components-17.0.0.dex.jar;firebase-datatransport-18.0.0.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.0.0.dex.jar;firebase-installations-interop-17.0.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-22.0.0.dex.jar;fmx.dex.jar;fragment-1.0.0.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;legacy-support-core-ui-1.0.0.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.0.0.dex.jar;lifecycle-livedata-2.0.0.dex.jar;lifecycle-livedata-core-2.0.0.dex.jar;lifecycle-runtime-2.0.0.dex.jar;lifecycle-service-2.0.0.dex.jar;lifecycle-viewmodel-2.0.0.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;play-services-ads-20.1.0.dex.jar;play-services-ads-base-20.1.0.dex.jar;play-services-ads-identifier-17.0.0.dex.jar;play-services-ads-lite-20.1.0.dex.jar;play-services-base-17.5.0.dex.jar;play-services-basement-17.6.0.dex.jar;play-services-cloud-messaging-16.0.0.dex.jar;play-services-drive-17.0.0.dex.jar;play-services-games-21.0.0.dex.jar;play-services-location-18.0.0.dex.jar;play-services-maps-17.0.1.dex.jar;play-services-measurement-base-18.0.0.dex.jar;play-services-measurement-sdk-api-18.0.0.dex.jar;play-services-places-placereport-17.0.0.dex.jar;play-services-stats-17.0.0.dex.jar;play-services-tasks-17.2.0.dex.jar;print-1.0.0.dex.jar;room-common-2.1.0.dex.jar;room-runtime-2.1.0.dex.jar;slidingpanelayout-1.0.0.dex.jar;sqlite-2.0.1.dex.jar;sqlite-framework-2.0.1.dex.jar;swiperefreshlayout-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.0.0.dex.jar;transport-runtime-3.0.0.dex.jar;user-messaging-platform-1.0.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.1.0.dex.jar - package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=;minSdkVersion=23;targetSdkVersion=35 Debug @@ -110,11 +116,11 @@ true - CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false + CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing the Bluetooth interface Debug - CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false + CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing the Bluetooth interface Debug @@ -131,6 +137,13 @@ CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= 1033 + + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + 1033 + DEBUG;$(DCC_Define) true @@ -189,7 +202,7 @@ (untitled) - + true @@ -205,12 +218,7 @@ true - - - RESTDWApolloDBDriver.bpl - true - - + 1 @@ -219,16 +227,6 @@ 0 - - - classes - 64 - - - classes - 64 - - res\xml @@ -239,12 +237,6 @@ 1 - - - library\lib\armeabi-v7a - 1 - - library\lib\armeabi @@ -297,6 +289,16 @@ 1 + + + res\drawable-anydpi-v21 + 1 + + + res\drawable-anydpi-v21 + 1 + + res\values @@ -317,6 +319,76 @@ 1 + + + res\values-v31 + 1 + + + res\values-v31 + 1 + + + + + res\values-v35 + 1 + + + res\values-v35 + 1 + + + + + res\drawable-anydpi-v26 + 1 + + + res\drawable-anydpi-v26 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-anydpi-v33 + 1 + + + res\drawable-anydpi-v33 + 1 + + res\values @@ -327,6 +399,16 @@ 1 + + + res\values-night-v21 + 1 + + + res\values-night-v21 + 1 + + res\drawable @@ -497,6 +579,56 @@ 1 + + + res\drawable-anydpi-v24 + 1 + + + res\drawable-anydpi-v24 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-night-anydpi-v21 + 1 + + + res\drawable-night-anydpi-v21 + 1 + + + + + res\drawable-anydpi-v31 + 1 + + + res\drawable-anydpi-v31 + 1 + + + + + res\drawable-night-anydpi-v31 + 1 + + + res\drawable-night-anydpi-v31 + 1 + + 1 @@ -674,6 +806,9 @@ 1 + + 1 + @@ -934,16 +1069,19 @@ + True True True True + False True True True True + False 12 diff --git a/CORE/Packages/Delphi/Drivers/FireDAC/RESTDWFireDACDriver.dproj b/CORE/Packages/Delphi/Drivers/FireDAC/RESTDWFireDACDriver.dproj index 77cc9b2a..b5a607ac 100644 --- a/CORE/Packages/Delphi/Drivers/FireDAC/RESTDWFireDACDriver.dproj +++ b/CORE/Packages/Delphi/Drivers/FireDAC/RESTDWFireDACDriver.dproj @@ -2,13 +2,14 @@ {51492283-F4E3-4B42-AF62-715E4F0BADAF} RESTDWFireDACDriver.dpk - 19.5 + 20.3 None True Debug - Win32 + Win64 3 Package + RESTDWFireDACDriver true @@ -53,6 +54,11 @@ Base true + + true + Base + true + true Base @@ -130,6 +136,13 @@ Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + 1033 + DEBUG;$(DCC_Define) true @@ -189,7 +202,7 @@ Microsoft Office XP Sample Automation Server Wrapper Components - + @@ -218,16 +231,6 @@ 0 - - - classes - 64 - - - classes - 64 - - res\xml @@ -238,12 +241,6 @@ 1 - - - library\lib\armeabi-v7a - 1 - - library\lib\armeabi @@ -296,6 +293,16 @@ 1 + + + res\drawable-anydpi-v21 + 1 + + + res\drawable-anydpi-v21 + 1 + + res\values @@ -316,6 +323,76 @@ 1 + + + res\values-v31 + 1 + + + res\values-v31 + 1 + + + + + res\values-v35 + 1 + + + res\values-v35 + 1 + + + + + res\drawable-anydpi-v26 + 1 + + + res\drawable-anydpi-v26 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-anydpi-v33 + 1 + + + res\drawable-anydpi-v33 + 1 + + res\values @@ -326,6 +403,16 @@ 1 + + + res\values-night-v21 + 1 + + + res\values-night-v21 + 1 + + res\drawable @@ -496,6 +583,56 @@ 1 + + + res\drawable-anydpi-v24 + 1 + + + res\drawable-anydpi-v24 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-night-anydpi-v21 + 1 + + + res\drawable-night-anydpi-v21 + 1 + + + + + res\drawable-anydpi-v31 + 1 + + + res\drawable-anydpi-v31 + 1 + + + + + res\drawable-night-anydpi-v31 + 1 + + + res\drawable-night-anydpi-v31 + 1 + + 1 @@ -673,6 +810,9 @@ 1 + + 1 + @@ -934,16 +1074,19 @@ + False False False False + False False False True True + False 12 diff --git a/CORE/Packages/Delphi/Drivers/IbDAC/RESTDWIBDACDriver.dproj b/CORE/Packages/Delphi/Drivers/IbDAC/RESTDWIBDACDriver.dproj index 77ee0128..66c83586 100644 --- a/CORE/Packages/Delphi/Drivers/IbDAC/RESTDWIBDACDriver.dproj +++ b/CORE/Packages/Delphi/Drivers/IbDAC/RESTDWIBDACDriver.dproj @@ -2,13 +2,14 @@ {BB3A9615-7326-47EE-94D6-DF450652CC5D} RESTDWIbDACDriver.dpk - 19.5 + 20.3 None True Debug - Win32 + Win64 693267 Package + RESTDWIbDACDriver true @@ -53,6 +54,11 @@ Base true + + true + Base + true + true Base @@ -89,11 +95,11 @@ None android-support-v4.dex.jar;cloud-messaging.dex.jar;fmx.dex.jar;google-analytics-v2.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar;google-play-services.dex.jar $(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png - package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=;minSdkVersion=23;targetSdkVersion=35 Debug - package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=;minSdkVersion=23;targetSdkVersion=35 Debug annotation-1.2.0.dex.jar;asynclayoutinflater-1.0.0.dex.jar;billing-4.0.0.dex.jar;browser-1.0.0.dex.jar;cloud-messaging.dex.jar;collection-1.0.0.dex.jar;coordinatorlayout-1.0.0.dex.jar;core-1.5.0-rc02.dex.jar;core-common-2.0.1.dex.jar;core-runtime-2.0.1.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;firebase-annotations-16.0.0.dex.jar;firebase-common-20.0.0.dex.jar;firebase-components-17.0.0.dex.jar;firebase-datatransport-18.0.0.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.0.0.dex.jar;firebase-installations-interop-17.0.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-22.0.0.dex.jar;fmx.dex.jar;fragment-1.0.0.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;legacy-support-core-ui-1.0.0.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.0.0.dex.jar;lifecycle-livedata-2.0.0.dex.jar;lifecycle-livedata-core-2.0.0.dex.jar;lifecycle-runtime-2.0.0.dex.jar;lifecycle-service-2.0.0.dex.jar;lifecycle-viewmodel-2.0.0.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;play-services-ads-20.1.0.dex.jar;play-services-ads-base-20.1.0.dex.jar;play-services-ads-identifier-17.0.0.dex.jar;play-services-ads-lite-20.1.0.dex.jar;play-services-base-17.5.0.dex.jar;play-services-basement-17.6.0.dex.jar;play-services-cloud-messaging-16.0.0.dex.jar;play-services-drive-17.0.0.dex.jar;play-services-games-21.0.0.dex.jar;play-services-location-18.0.0.dex.jar;play-services-maps-17.0.1.dex.jar;play-services-measurement-base-18.0.0.dex.jar;play-services-measurement-sdk-api-18.0.0.dex.jar;play-services-places-placereport-17.0.0.dex.jar;play-services-stats-17.0.0.dex.jar;play-services-tasks-17.2.0.dex.jar;print-1.0.0.dex.jar;room-common-2.1.0.dex.jar;room-runtime-2.1.0.dex.jar;slidingpanelayout-1.0.0.dex.jar;sqlite-2.0.1.dex.jar;sqlite-framework-2.0.1.dex.jar;swiperefreshlayout-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.0.0.dex.jar;transport-runtime-3.0.0.dex.jar;user-messaging-platform-1.0.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.1.0.dex.jar RESTDWCore;RESTDWSocketIndy;dac280;ibdac280;$(DCC_UsePackage) @@ -114,12 +120,12 @@ true - CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false + CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing the Bluetooth interface Debug dac280;ibdac280;$(DCC_UsePackage) - CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false + CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing the Bluetooth interface Debug @@ -138,6 +144,13 @@ Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + 1033 + DEBUG;$(DCC_Define) true @@ -197,7 +210,7 @@ Microsoft Office XP Sample Automation Server Wrapper Components - + @@ -217,12 +230,7 @@ - - - RESTDWIbDACDriver.bpl - true - - + 1 @@ -231,16 +239,6 @@ 0 - - - classes - 64 - - - classes - 64 - - res\xml @@ -251,12 +249,6 @@ 1 - - - library\lib\armeabi-v7a - 1 - - library\lib\armeabi @@ -309,6 +301,16 @@ 1 + + + res\drawable-anydpi-v21 + 1 + + + res\drawable-anydpi-v21 + 1 + + res\values @@ -329,6 +331,76 @@ 1 + + + res\values-v31 + 1 + + + res\values-v31 + 1 + + + + + res\values-v35 + 1 + + + res\values-v35 + 1 + + + + + res\drawable-anydpi-v26 + 1 + + + res\drawable-anydpi-v26 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-anydpi-v33 + 1 + + + res\drawable-anydpi-v33 + 1 + + res\values @@ -339,6 +411,16 @@ 1 + + + res\values-night-v21 + 1 + + + res\values-night-v21 + 1 + + res\drawable @@ -509,6 +591,56 @@ 1 + + + res\drawable-anydpi-v24 + 1 + + + res\drawable-anydpi-v24 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-night-anydpi-v21 + 1 + + + res\drawable-night-anydpi-v21 + 1 + + + + + res\drawable-anydpi-v31 + 1 + + + res\drawable-anydpi-v31 + 1 + + + + + res\drawable-night-anydpi-v31 + 1 + + + res\drawable-night-anydpi-v31 + 1 + + 1 @@ -686,6 +818,9 @@ 1 + + 1 + @@ -947,16 +1082,19 @@ + True True True True + False True True True True + False 12 diff --git a/CORE/Packages/Delphi/Drivers/InterBase/RESTDWInterbaseDriver.dproj b/CORE/Packages/Delphi/Drivers/InterBase/RESTDWInterbaseDriver.dproj index 16d201be..bc0ccad1 100644 --- a/CORE/Packages/Delphi/Drivers/InterBase/RESTDWInterbaseDriver.dproj +++ b/CORE/Packages/Delphi/Drivers/InterBase/RESTDWInterbaseDriver.dproj @@ -2,13 +2,14 @@ {403054FA-84FF-41B9-928A-FF1D0B3B590A} RESTDWInterbaseDriver.dpk - 19.5 + 20.3 None True Debug - Win32 + Win64 693267 Package + RESTDWInterbaseDriver true @@ -53,6 +54,11 @@ Base true + + true + Base + true + true Base @@ -86,13 +92,13 @@ None annotation-1.2.0.dex.jar;asynclayoutinflater-1.0.0.dex.jar;billing-4.0.0.dex.jar;browser-1.0.0.dex.jar;cloud-messaging.dex.jar;collection-1.0.0.dex.jar;coordinatorlayout-1.0.0.dex.jar;core-1.5.0-rc02.dex.jar;core-common-2.0.1.dex.jar;core-runtime-2.0.1.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;firebase-annotations-16.0.0.dex.jar;firebase-common-20.0.0.dex.jar;firebase-components-17.0.0.dex.jar;firebase-datatransport-18.0.0.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.0.0.dex.jar;firebase-installations-interop-17.0.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-22.0.0.dex.jar;fmx.dex.jar;fragment-1.0.0.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;legacy-support-core-ui-1.0.0.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.0.0.dex.jar;lifecycle-livedata-2.0.0.dex.jar;lifecycle-livedata-core-2.0.0.dex.jar;lifecycle-runtime-2.0.0.dex.jar;lifecycle-service-2.0.0.dex.jar;lifecycle-viewmodel-2.0.0.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;play-services-ads-20.1.0.dex.jar;play-services-ads-base-20.1.0.dex.jar;play-services-ads-identifier-17.0.0.dex.jar;play-services-ads-lite-20.1.0.dex.jar;play-services-base-17.5.0.dex.jar;play-services-basement-17.6.0.dex.jar;play-services-cloud-messaging-16.0.0.dex.jar;play-services-drive-17.0.0.dex.jar;play-services-games-21.0.0.dex.jar;play-services-location-18.0.0.dex.jar;play-services-maps-17.0.1.dex.jar;play-services-measurement-base-18.0.0.dex.jar;play-services-measurement-sdk-api-18.0.0.dex.jar;play-services-places-placereport-17.0.0.dex.jar;play-services-stats-17.0.0.dex.jar;play-services-tasks-17.2.0.dex.jar;print-1.0.0.dex.jar;room-common-2.1.0.dex.jar;room-runtime-2.1.0.dex.jar;slidingpanelayout-1.0.0.dex.jar;sqlite-2.0.1.dex.jar;sqlite-framework-2.0.1.dex.jar;swiperefreshlayout-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.0.0.dex.jar;transport-runtime-3.0.0.dex.jar;user-messaging-platform-1.0.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.1.0.dex.jar - package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=;minSdkVersion=23;targetSdkVersion=35 Debug None annotation-1.2.0.dex.jar;asynclayoutinflater-1.0.0.dex.jar;billing-4.0.0.dex.jar;browser-1.0.0.dex.jar;cloud-messaging.dex.jar;collection-1.0.0.dex.jar;coordinatorlayout-1.0.0.dex.jar;core-1.5.0-rc02.dex.jar;core-common-2.0.1.dex.jar;core-runtime-2.0.1.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;firebase-annotations-16.0.0.dex.jar;firebase-common-20.0.0.dex.jar;firebase-components-17.0.0.dex.jar;firebase-datatransport-18.0.0.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.0.0.dex.jar;firebase-installations-interop-17.0.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-22.0.0.dex.jar;fmx.dex.jar;fragment-1.0.0.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;legacy-support-core-ui-1.0.0.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.0.0.dex.jar;lifecycle-livedata-2.0.0.dex.jar;lifecycle-livedata-core-2.0.0.dex.jar;lifecycle-runtime-2.0.0.dex.jar;lifecycle-service-2.0.0.dex.jar;lifecycle-viewmodel-2.0.0.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;play-services-ads-20.1.0.dex.jar;play-services-ads-base-20.1.0.dex.jar;play-services-ads-identifier-17.0.0.dex.jar;play-services-ads-lite-20.1.0.dex.jar;play-services-base-17.5.0.dex.jar;play-services-basement-17.6.0.dex.jar;play-services-cloud-messaging-16.0.0.dex.jar;play-services-drive-17.0.0.dex.jar;play-services-games-21.0.0.dex.jar;play-services-location-18.0.0.dex.jar;play-services-maps-17.0.1.dex.jar;play-services-measurement-base-18.0.0.dex.jar;play-services-measurement-sdk-api-18.0.0.dex.jar;play-services-places-placereport-17.0.0.dex.jar;play-services-stats-17.0.0.dex.jar;play-services-tasks-17.2.0.dex.jar;print-1.0.0.dex.jar;room-common-2.1.0.dex.jar;room-runtime-2.1.0.dex.jar;slidingpanelayout-1.0.0.dex.jar;sqlite-2.0.1.dex.jar;sqlite-framework-2.0.1.dex.jar;swiperefreshlayout-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.0.0.dex.jar;transport-runtime-3.0.0.dex.jar;user-messaging-platform-1.0.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.1.0.dex.jar - package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=;minSdkVersion=23;targetSdkVersion=35 Debug @@ -110,11 +116,11 @@ true - CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false + CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing the Bluetooth interface Debug - CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false + CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing the Bluetooth interface Debug @@ -131,6 +137,13 @@ CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= 1033 + + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + 1033 + DEBUG;$(DCC_Define) true @@ -189,7 +202,7 @@ RESTDWInterbaseDriver.dpk - + true @@ -205,12 +218,7 @@ true - - - RESTDWInterbaseDriver.bpl - true - - + 1 @@ -219,16 +227,6 @@ 0 - - - classes - 64 - - - classes - 64 - - res\xml @@ -239,12 +237,6 @@ 1 - - - library\lib\armeabi-v7a - 1 - - library\lib\armeabi @@ -297,6 +289,16 @@ 1 + + + res\drawable-anydpi-v21 + 1 + + + res\drawable-anydpi-v21 + 1 + + res\values @@ -317,6 +319,76 @@ 1 + + + res\values-v31 + 1 + + + res\values-v31 + 1 + + + + + res\values-v35 + 1 + + + res\values-v35 + 1 + + + + + res\drawable-anydpi-v26 + 1 + + + res\drawable-anydpi-v26 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-anydpi-v33 + 1 + + + res\drawable-anydpi-v33 + 1 + + res\values @@ -327,6 +399,16 @@ 1 + + + res\values-night-v21 + 1 + + + res\values-night-v21 + 1 + + res\drawable @@ -497,6 +579,56 @@ 1 + + + res\drawable-anydpi-v24 + 1 + + + res\drawable-anydpi-v24 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-night-anydpi-v21 + 1 + + + res\drawable-night-anydpi-v21 + 1 + + + + + res\drawable-anydpi-v31 + 1 + + + res\drawable-anydpi-v31 + 1 + + + + + res\drawable-night-anydpi-v31 + 1 + + + res\drawable-night-anydpi-v31 + 1 + + 1 @@ -674,6 +806,9 @@ 1 + + 1 + @@ -934,16 +1069,19 @@ + True True True True + False True True True True + False 12 diff --git a/CORE/Packages/Delphi/Drivers/MyDAC/RESTDWMyDACDriver.dproj b/CORE/Packages/Delphi/Drivers/MyDAC/RESTDWMyDACDriver.dproj index 0e8bafa2..1165b9b8 100644 --- a/CORE/Packages/Delphi/Drivers/MyDAC/RESTDWMyDACDriver.dproj +++ b/CORE/Packages/Delphi/Drivers/MyDAC/RESTDWMyDACDriver.dproj @@ -7,8 +7,9 @@ 693267 Package None - 19.5 - Win32 + 20.3 + Win64 + RESTDWMyDACDriver true @@ -53,6 +54,11 @@ Base true + + true + Base + true + true Base @@ -111,12 +117,12 @@ $(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png - package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=;minSdkVersion=23;targetSdkVersion=35 Debug android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar - package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=;minSdkVersion=23;targetSdkVersion=35 Debug annotation-1.2.0.dex.jar;asynclayoutinflater-1.0.0.dex.jar;billing-4.0.0.dex.jar;browser-1.0.0.dex.jar;cloud-messaging.dex.jar;collection-1.0.0.dex.jar;coordinatorlayout-1.0.0.dex.jar;core-1.5.0-rc02.dex.jar;core-common-2.0.1.dex.jar;core-runtime-2.0.1.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;firebase-annotations-16.0.0.dex.jar;firebase-common-20.0.0.dex.jar;firebase-components-17.0.0.dex.jar;firebase-datatransport-18.0.0.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.0.0.dex.jar;firebase-installations-interop-17.0.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-22.0.0.dex.jar;fmx.dex.jar;fragment-1.0.0.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;legacy-support-core-ui-1.0.0.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.0.0.dex.jar;lifecycle-livedata-2.0.0.dex.jar;lifecycle-livedata-core-2.0.0.dex.jar;lifecycle-runtime-2.0.0.dex.jar;lifecycle-service-2.0.0.dex.jar;lifecycle-viewmodel-2.0.0.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;play-services-ads-20.1.0.dex.jar;play-services-ads-base-20.1.0.dex.jar;play-services-ads-identifier-17.0.0.dex.jar;play-services-ads-lite-20.1.0.dex.jar;play-services-base-17.5.0.dex.jar;play-services-basement-17.6.0.dex.jar;play-services-cloud-messaging-16.0.0.dex.jar;play-services-drive-17.0.0.dex.jar;play-services-games-21.0.0.dex.jar;play-services-location-18.0.0.dex.jar;play-services-maps-17.0.1.dex.jar;play-services-measurement-base-18.0.0.dex.jar;play-services-measurement-sdk-api-18.0.0.dex.jar;play-services-places-placereport-17.0.0.dex.jar;play-services-stats-17.0.0.dex.jar;play-services-tasks-17.2.0.dex.jar;print-1.0.0.dex.jar;room-common-2.1.0.dex.jar;room-runtime-2.1.0.dex.jar;slidingpanelayout-1.0.0.dex.jar;sqlite-2.0.1.dex.jar;sqlite-framework-2.0.1.dex.jar;swiperefreshlayout-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.0.0.dex.jar;transport-runtime-3.0.0.dex.jar;user-messaging-platform-1.0.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.1.0.dex.jar @@ -134,11 +140,11 @@ true - CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false + CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing the Bluetooth interface Debug - CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false + CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing the Bluetooth interface Debug @@ -157,6 +163,13 @@ Debug 1033 + + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + 1033 + 0 0 @@ -226,12 +239,14 @@ True True True + False True True True True + False - + @@ -251,12 +266,7 @@ - - - RESTDWMyDACDriver.bpl - true - - + @@ -266,16 +276,6 @@ 0 - - - classes - 64 - - - classes - 64 - - res\xml @@ -286,12 +286,6 @@ 1 - - - library\lib\armeabi-v7a - 1 - - library\lib\armeabi @@ -344,6 +338,16 @@ 1 + + + res\drawable-anydpi-v21 + 1 + + + res\drawable-anydpi-v21 + 1 + + res\values @@ -364,6 +368,76 @@ 1 + + + res\values-v31 + 1 + + + res\values-v31 + 1 + + + + + res\values-v35 + 1 + + + res\values-v35 + 1 + + + + + res\drawable-anydpi-v26 + 1 + + + res\drawable-anydpi-v26 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-anydpi-v33 + 1 + + + res\drawable-anydpi-v33 + 1 + + res\values @@ -374,6 +448,16 @@ 1 + + + res\values-night-v21 + 1 + + + res\values-night-v21 + 1 + + res\drawable @@ -544,6 +628,56 @@ 1 + + + res\drawable-anydpi-v24 + 1 + + + res\drawable-anydpi-v24 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-night-anydpi-v21 + 1 + + + res\drawable-night-anydpi-v21 + 1 + + + + + res\drawable-anydpi-v31 + 1 + + + res\drawable-anydpi-v31 + 1 + + + + + res\drawable-night-anydpi-v31 + 1 + + + res\drawable-night-anydpi-v31 + 1 + + 1 @@ -721,6 +855,9 @@ 1 + + 1 + @@ -983,6 +1120,7 @@ + 12 diff --git a/CORE/Packages/Delphi/Drivers/UniDAC/RESTDWUniDACDriver.dproj b/CORE/Packages/Delphi/Drivers/UniDAC/RESTDWUniDACDriver.dproj index 3fa9b35b..350f8715 100644 --- a/CORE/Packages/Delphi/Drivers/UniDAC/RESTDWUniDACDriver.dproj +++ b/CORE/Packages/Delphi/Drivers/UniDAC/RESTDWUniDACDriver.dproj @@ -7,8 +7,9 @@ 693267 Package None - 19.5 - Win32 + 20.3 + Win64 + RESTDWUniDACDriver true @@ -53,6 +54,11 @@ Base true + + true + Base + true + true Base @@ -111,12 +117,12 @@ $(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png - package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=;minSdkVersion=23;targetSdkVersion=35 Debug android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar - package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=;minSdkVersion=23;targetSdkVersion=35 Debug annotation-1.2.0.dex.jar;asynclayoutinflater-1.0.0.dex.jar;billing-4.0.0.dex.jar;browser-1.0.0.dex.jar;cloud-messaging.dex.jar;collection-1.0.0.dex.jar;coordinatorlayout-1.0.0.dex.jar;core-1.5.0-rc02.dex.jar;core-common-2.0.1.dex.jar;core-runtime-2.0.1.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;firebase-annotations-16.0.0.dex.jar;firebase-common-20.0.0.dex.jar;firebase-components-17.0.0.dex.jar;firebase-datatransport-18.0.0.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.0.0.dex.jar;firebase-installations-interop-17.0.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-22.0.0.dex.jar;fmx.dex.jar;fragment-1.0.0.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;legacy-support-core-ui-1.0.0.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.0.0.dex.jar;lifecycle-livedata-2.0.0.dex.jar;lifecycle-livedata-core-2.0.0.dex.jar;lifecycle-runtime-2.0.0.dex.jar;lifecycle-service-2.0.0.dex.jar;lifecycle-viewmodel-2.0.0.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;play-services-ads-20.1.0.dex.jar;play-services-ads-base-20.1.0.dex.jar;play-services-ads-identifier-17.0.0.dex.jar;play-services-ads-lite-20.1.0.dex.jar;play-services-base-17.5.0.dex.jar;play-services-basement-17.6.0.dex.jar;play-services-cloud-messaging-16.0.0.dex.jar;play-services-drive-17.0.0.dex.jar;play-services-games-21.0.0.dex.jar;play-services-location-18.0.0.dex.jar;play-services-maps-17.0.1.dex.jar;play-services-measurement-base-18.0.0.dex.jar;play-services-measurement-sdk-api-18.0.0.dex.jar;play-services-places-placereport-17.0.0.dex.jar;play-services-stats-17.0.0.dex.jar;play-services-tasks-17.2.0.dex.jar;print-1.0.0.dex.jar;room-common-2.1.0.dex.jar;room-runtime-2.1.0.dex.jar;slidingpanelayout-1.0.0.dex.jar;sqlite-2.0.1.dex.jar;sqlite-framework-2.0.1.dex.jar;swiperefreshlayout-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.0.0.dex.jar;transport-runtime-3.0.0.dex.jar;user-messaging-platform-1.0.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.1.0.dex.jar @@ -134,11 +140,11 @@ true - CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false + CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing the Bluetooth interface Debug - CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false + CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing the Bluetooth interface Debug @@ -157,6 +163,13 @@ Debug 1033 + + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + 1033 + 0 0 @@ -226,12 +239,14 @@ True True True + False True True True True + False - + @@ -251,12 +266,7 @@ - - - RESTDWUniDACDriver.bpl - true - - + @@ -266,16 +276,6 @@ 0 - - - classes - 64 - - - classes - 64 - - res\xml @@ -286,12 +286,6 @@ 1 - - - library\lib\armeabi-v7a - 1 - - library\lib\armeabi @@ -344,6 +338,16 @@ 1 + + + res\drawable-anydpi-v21 + 1 + + + res\drawable-anydpi-v21 + 1 + + res\values @@ -364,6 +368,76 @@ 1 + + + res\values-v31 + 1 + + + res\values-v31 + 1 + + + + + res\values-v35 + 1 + + + res\values-v35 + 1 + + + + + res\drawable-anydpi-v26 + 1 + + + res\drawable-anydpi-v26 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-anydpi-v33 + 1 + + + res\drawable-anydpi-v33 + 1 + + res\values @@ -374,6 +448,16 @@ 1 + + + res\values-night-v21 + 1 + + + res\values-night-v21 + 1 + + res\drawable @@ -544,6 +628,56 @@ 1 + + + res\drawable-anydpi-v24 + 1 + + + res\drawable-anydpi-v24 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-night-anydpi-v21 + 1 + + + res\drawable-night-anydpi-v21 + 1 + + + + + res\drawable-anydpi-v31 + 1 + + + res\drawable-anydpi-v31 + 1 + + + + + res\drawable-night-anydpi-v31 + 1 + + + res\drawable-night-anydpi-v31 + 1 + + 1 @@ -721,6 +855,9 @@ 1 + + 1 + @@ -983,6 +1120,7 @@ + 12 diff --git a/CORE/Packages/Delphi/Drivers/Zeos/RESTDWZEOSDriver.dproj b/CORE/Packages/Delphi/Drivers/Zeos/RESTDWZEOSDriver.dproj index e5fe0bc3..e4e18037 100644 --- a/CORE/Packages/Delphi/Drivers/Zeos/RESTDWZEOSDriver.dproj +++ b/CORE/Packages/Delphi/Drivers/Zeos/RESTDWZEOSDriver.dproj @@ -7,8 +7,9 @@ 3 Package None - 19.5 - Win32 + 20.3 + Win64 + RESTDWZEOSDriver true @@ -53,6 +54,11 @@ Base true + + true + Base + true + true Base @@ -161,6 +167,13 @@ CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= 1033 + + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + 1033 + RELEASE;$(DCC_Define) 0 @@ -266,12 +279,14 @@ False False False + False False False True True + False - + @@ -301,16 +316,6 @@ 0 - - - classes - 64 - - - classes - 64 - - res\xml @@ -321,12 +326,6 @@ 1 - - - library\lib\armeabi-v7a - 1 - - library\lib\armeabi @@ -379,6 +378,16 @@ 1 + + + res\drawable-anydpi-v21 + 1 + + + res\drawable-anydpi-v21 + 1 + + res\values @@ -399,6 +408,76 @@ 1 + + + res\values-v31 + 1 + + + res\values-v31 + 1 + + + + + res\values-v35 + 1 + + + res\values-v35 + 1 + + + + + res\drawable-anydpi-v26 + 1 + + + res\drawable-anydpi-v26 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-anydpi-v33 + 1 + + + res\drawable-anydpi-v33 + 1 + + res\values @@ -409,6 +488,16 @@ 1 + + + res\values-night-v21 + 1 + + + res\values-night-v21 + 1 + + res\drawable @@ -579,6 +668,56 @@ 1 + + + res\drawable-anydpi-v24 + 1 + + + res\drawable-anydpi-v24 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-night-anydpi-v21 + 1 + + + res\drawable-night-anydpi-v21 + 1 + + + + + res\drawable-anydpi-v31 + 1 + + + res\drawable-anydpi-v31 + 1 + + + + + res\drawable-night-anydpi-v31 + 1 + + + res\drawable-night-anydpi-v31 + 1 + + 1 @@ -756,6 +895,9 @@ 1 + + 1 + @@ -1017,6 +1159,7 @@ + 12 diff --git a/CORE/Packages/Delphi/RESTDWCore.dproj b/CORE/Packages/Delphi/RESTDWCore.dproj index 0d6eae7d..dd5bcf10 100644 --- a/CORE/Packages/Delphi/RESTDWCore.dproj +++ b/CORE/Packages/Delphi/RESTDWCore.dproj @@ -7,7 +7,7 @@ 33811 Package None - 20.1 + 20.3 Win32 RESTDWCore @@ -130,12 +130,12 @@ ..\..\compiled - package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=;minSdkVersion=23;targetSdkVersion=35 Debug activity-1.1.0.dex.jar;annotation-1.2.0.dex.jar;appcompat-1.2.0.dex.jar;appcompat-resources-1.2.0.dex.jar;asynclayoutinflater-1.0.0.dex.jar;billing-4.0.0.dex.jar;biometric-1.1.0.dex.jar;browser-1.0.0.dex.jar;cloud-messaging.dex.jar;collection-1.1.0.dex.jar;coordinatorlayout-1.0.0.dex.jar;core-1.5.0-rc02.dex.jar;core-common-2.1.0.dex.jar;core-runtime-2.1.0.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;firebase-annotations-16.0.0.dex.jar;firebase-common-20.0.0.dex.jar;firebase-components-17.0.0.dex.jar;firebase-datatransport-18.0.0.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.0.0.dex.jar;firebase-installations-interop-17.0.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-22.0.0.dex.jar;fmx.dex.jar;fragment-1.2.5.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;legacy-support-core-ui-1.0.0.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.2.0.dex.jar;lifecycle-livedata-2.0.0.dex.jar;lifecycle-livedata-core-2.2.0.dex.jar;lifecycle-runtime-2.2.0.dex.jar;lifecycle-service-2.0.0.dex.jar;lifecycle-viewmodel-2.2.0.dex.jar;lifecycle-viewmodel-savedstate-2.2.0.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;play-services-ads-20.1.0.dex.jar;play-services-ads-base-20.1.0.dex.jar;play-services-ads-identifier-17.0.0.dex.jar;play-services-ads-lite-20.1.0.dex.jar;play-services-base-17.5.0.dex.jar;play-services-basement-17.6.0.dex.jar;play-services-cloud-messaging-16.0.0.dex.jar;play-services-drive-17.0.0.dex.jar;play-services-games-21.0.0.dex.jar;play-services-location-18.0.0.dex.jar;play-services-maps-17.0.1.dex.jar;play-services-measurement-base-18.0.0.dex.jar;play-services-measurement-sdk-api-18.0.0.dex.jar;play-services-places-placereport-17.0.0.dex.jar;play-services-stats-17.0.0.dex.jar;play-services-tasks-17.2.0.dex.jar;print-1.0.0.dex.jar;room-common-2.1.0.dex.jar;room-runtime-2.1.0.dex.jar;savedstate-1.0.0.dex.jar;slidingpanelayout-1.0.0.dex.jar;sqlite-2.0.1.dex.jar;sqlite-framework-2.0.1.dex.jar;swiperefreshlayout-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.0.0.dex.jar;transport-runtime-3.0.0.dex.jar;user-messaging-platform-1.0.0.dex.jar;vectordrawable-1.1.0.dex.jar;vectordrawable-animated-1.1.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.1.0.dex.jar - package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=;minSdkVersion=23;targetSdkVersion=35 Debug activity-1.1.0.dex.jar;annotation-1.2.0.dex.jar;appcompat-1.2.0.dex.jar;appcompat-resources-1.2.0.dex.jar;asynclayoutinflater-1.0.0.dex.jar;billing-4.0.0.dex.jar;biometric-1.1.0.dex.jar;browser-1.0.0.dex.jar;cloud-messaging.dex.jar;collection-1.1.0.dex.jar;coordinatorlayout-1.0.0.dex.jar;core-1.5.0-rc02.dex.jar;core-common-2.1.0.dex.jar;core-runtime-2.1.0.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;firebase-annotations-16.0.0.dex.jar;firebase-common-20.0.0.dex.jar;firebase-components-17.0.0.dex.jar;firebase-datatransport-18.0.0.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.0.0.dex.jar;firebase-installations-interop-17.0.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-22.0.0.dex.jar;fmx.dex.jar;fragment-1.2.5.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;legacy-support-core-ui-1.0.0.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.2.0.dex.jar;lifecycle-livedata-2.0.0.dex.jar;lifecycle-livedata-core-2.2.0.dex.jar;lifecycle-runtime-2.2.0.dex.jar;lifecycle-service-2.0.0.dex.jar;lifecycle-viewmodel-2.2.0.dex.jar;lifecycle-viewmodel-savedstate-2.2.0.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;play-services-ads-20.1.0.dex.jar;play-services-ads-base-20.1.0.dex.jar;play-services-ads-identifier-17.0.0.dex.jar;play-services-ads-lite-20.1.0.dex.jar;play-services-base-17.5.0.dex.jar;play-services-basement-17.6.0.dex.jar;play-services-cloud-messaging-16.0.0.dex.jar;play-services-drive-17.0.0.dex.jar;play-services-games-21.0.0.dex.jar;play-services-location-18.0.0.dex.jar;play-services-maps-17.0.1.dex.jar;play-services-measurement-base-18.0.0.dex.jar;play-services-measurement-sdk-api-18.0.0.dex.jar;play-services-places-placereport-17.0.0.dex.jar;play-services-stats-17.0.0.dex.jar;play-services-tasks-17.2.0.dex.jar;print-1.0.0.dex.jar;room-common-2.1.0.dex.jar;room-runtime-2.1.0.dex.jar;savedstate-1.0.0.dex.jar;slidingpanelayout-1.0.0.dex.jar;sqlite-2.0.1.dex.jar;sqlite-framework-2.0.1.dex.jar;swiperefreshlayout-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.0.0.dex.jar;transport-runtime-3.0.0.dex.jar;user-messaging-platform-1.0.0.dex.jar;vectordrawable-1.1.0.dex.jar;vectordrawable-animated-1.1.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.1.0.dex.jar @@ -218,12 +218,12 @@ ..\..\compiled true - CompanyName=XyberPower Desenvolvimento;FileDescription=$(MSBuildProjectName);FileVersion=2.1.0.116;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName) + 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) 1033 2 1 REST Dataware - Core - 116 + 131 true true @@ -236,6 +236,9 @@ MainSource + + + @@ -343,7 +346,7 @@ True False - + @@ -363,12 +366,7 @@ - - - RESTDWCore.bpl - true - - + 1 @@ -377,16 +375,6 @@ 0 - - - classes - 64 - - - classes - 64 - - res\xml @@ -397,12 +385,6 @@ 1 - - - library\lib\armeabi-v7a - 1 - - library\lib\armeabi @@ -495,6 +477,16 @@ 1 + + + res\values-v35 + 1 + + + res\values-v35 + 1 + + res\drawable-anydpi-v26 diff --git a/CORE/Packages/Delphi/RESTDWCoreDesign.dproj b/CORE/Packages/Delphi/RESTDWCoreDesign.dproj index 7f4dc973..52b7191b 100644 --- a/CORE/Packages/Delphi/RESTDWCoreDesign.dproj +++ b/CORE/Packages/Delphi/RESTDWCoreDesign.dproj @@ -2,13 +2,14 @@ {B229AD56-6CAC-4419-8C33-A144BCAD1177} RESTDWCoreDesign.dpk - 19.5 + 20.3 None True Debug Win32 558099 Package + RESTDWCoreDesign true @@ -43,6 +44,11 @@ Base true + + true + Base + true + true Base @@ -76,12 +82,12 @@ false - package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=;minSdkVersion=23;targetSdkVersion=35 Debug activity-1.1.0.dex.jar;annotation-1.2.0.dex.jar;appcompat-1.2.0.dex.jar;appcompat-resources-1.2.0.dex.jar;asynclayoutinflater-1.0.0.dex.jar;billing-4.0.0.dex.jar;biometric-1.1.0.dex.jar;browser-1.0.0.dex.jar;cloud-messaging.dex.jar;collection-1.1.0.dex.jar;coordinatorlayout-1.0.0.dex.jar;core-1.5.0-rc02.dex.jar;core-common-2.1.0.dex.jar;core-runtime-2.1.0.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;firebase-annotations-16.0.0.dex.jar;firebase-common-20.0.0.dex.jar;firebase-components-17.0.0.dex.jar;firebase-datatransport-18.0.0.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.0.0.dex.jar;firebase-installations-interop-17.0.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-22.0.0.dex.jar;fmx.dex.jar;fragment-1.2.5.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;legacy-support-core-ui-1.0.0.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.2.0.dex.jar;lifecycle-livedata-2.0.0.dex.jar;lifecycle-livedata-core-2.2.0.dex.jar;lifecycle-runtime-2.2.0.dex.jar;lifecycle-service-2.0.0.dex.jar;lifecycle-viewmodel-2.2.0.dex.jar;lifecycle-viewmodel-savedstate-2.2.0.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;play-services-ads-20.1.0.dex.jar;play-services-ads-base-20.1.0.dex.jar;play-services-ads-identifier-17.0.0.dex.jar;play-services-ads-lite-20.1.0.dex.jar;play-services-base-17.5.0.dex.jar;play-services-basement-17.6.0.dex.jar;play-services-cloud-messaging-16.0.0.dex.jar;play-services-drive-17.0.0.dex.jar;play-services-games-21.0.0.dex.jar;play-services-location-18.0.0.dex.jar;play-services-maps-17.0.1.dex.jar;play-services-measurement-base-18.0.0.dex.jar;play-services-measurement-sdk-api-18.0.0.dex.jar;play-services-places-placereport-17.0.0.dex.jar;play-services-stats-17.0.0.dex.jar;play-services-tasks-17.2.0.dex.jar;print-1.0.0.dex.jar;room-common-2.1.0.dex.jar;room-runtime-2.1.0.dex.jar;savedstate-1.0.0.dex.jar;slidingpanelayout-1.0.0.dex.jar;sqlite-2.0.1.dex.jar;sqlite-framework-2.0.1.dex.jar;swiperefreshlayout-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.0.0.dex.jar;transport-runtime-3.0.0.dex.jar;user-messaging-platform-1.0.0.dex.jar;vectordrawable-1.1.0.dex.jar;vectordrawable-animated-1.1.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.1.0.dex.jar - package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=;minSdkVersion=23;targetSdkVersion=35 Debug activity-1.1.0.dex.jar;annotation-1.2.0.dex.jar;appcompat-1.2.0.dex.jar;appcompat-resources-1.2.0.dex.jar;asynclayoutinflater-1.0.0.dex.jar;billing-4.0.0.dex.jar;biometric-1.1.0.dex.jar;browser-1.0.0.dex.jar;cloud-messaging.dex.jar;collection-1.1.0.dex.jar;coordinatorlayout-1.0.0.dex.jar;core-1.5.0-rc02.dex.jar;core-common-2.1.0.dex.jar;core-runtime-2.1.0.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;firebase-annotations-16.0.0.dex.jar;firebase-common-20.0.0.dex.jar;firebase-components-17.0.0.dex.jar;firebase-datatransport-18.0.0.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.0.0.dex.jar;firebase-installations-interop-17.0.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-22.0.0.dex.jar;fmx.dex.jar;fragment-1.2.5.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;legacy-support-core-ui-1.0.0.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.2.0.dex.jar;lifecycle-livedata-2.0.0.dex.jar;lifecycle-livedata-core-2.2.0.dex.jar;lifecycle-runtime-2.2.0.dex.jar;lifecycle-service-2.0.0.dex.jar;lifecycle-viewmodel-2.2.0.dex.jar;lifecycle-viewmodel-savedstate-2.2.0.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;play-services-ads-20.1.0.dex.jar;play-services-ads-base-20.1.0.dex.jar;play-services-ads-identifier-17.0.0.dex.jar;play-services-ads-lite-20.1.0.dex.jar;play-services-base-17.5.0.dex.jar;play-services-basement-17.6.0.dex.jar;play-services-cloud-messaging-16.0.0.dex.jar;play-services-drive-17.0.0.dex.jar;play-services-games-21.0.0.dex.jar;play-services-location-18.0.0.dex.jar;play-services-maps-17.0.1.dex.jar;play-services-measurement-base-18.0.0.dex.jar;play-services-measurement-sdk-api-18.0.0.dex.jar;play-services-places-placereport-17.0.0.dex.jar;play-services-stats-17.0.0.dex.jar;play-services-tasks-17.2.0.dex.jar;print-1.0.0.dex.jar;room-common-2.1.0.dex.jar;room-runtime-2.1.0.dex.jar;savedstate-1.0.0.dex.jar;slidingpanelayout-1.0.0.dex.jar;sqlite-2.0.1.dex.jar;sqlite-framework-2.0.1.dex.jar;swiperefreshlayout-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.0.0.dex.jar;transport-runtime-3.0.0.dex.jar;user-messaging-platform-1.0.0.dex.jar;vectordrawable-1.1.0.dex.jar;vectordrawable-animated-1.1.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.1.0.dex.jar @@ -113,6 +119,13 @@ CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= Debug + + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + 1033 + DEBUG;$(DCC_Define) true @@ -172,7 +185,7 @@ Microsoft Office XP Sample Automation Server Wrapper Components - + @@ -200,16 +213,6 @@ 0 - - - classes - 64 - - - classes - 64 - - res\xml @@ -220,12 +223,6 @@ 1 - - - library\lib\armeabi-v7a - 1 - - library\lib\armeabi @@ -278,6 +275,16 @@ 1 + + + res\drawable-anydpi-v21 + 1 + + + res\drawable-anydpi-v21 + 1 + + res\values @@ -298,6 +305,76 @@ 1 + + + res\values-v31 + 1 + + + res\values-v31 + 1 + + + + + res\values-v35 + 1 + + + res\values-v35 + 1 + + + + + res\drawable-anydpi-v26 + 1 + + + res\drawable-anydpi-v26 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-anydpi-v33 + 1 + + + res\drawable-anydpi-v33 + 1 + + res\values @@ -308,6 +385,16 @@ 1 + + + res\values-night-v21 + 1 + + + res\values-night-v21 + 1 + + res\drawable @@ -478,6 +565,56 @@ 1 + + + res\drawable-anydpi-v24 + 1 + + + res\drawable-anydpi-v24 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-night-anydpi-v21 + 1 + + + res\drawable-night-anydpi-v21 + 1 + + + + + res\drawable-anydpi-v31 + 1 + + + res\drawable-anydpi-v31 + 1 + + + + + res\drawable-night-anydpi-v31 + 1 + + + res\drawable-night-anydpi-v31 + 1 + + 1 @@ -655,6 +792,9 @@ 1 + + 1 + @@ -916,14 +1056,17 @@ + True True True True + False True True + False 12 diff --git a/CORE/Packages/Delphi/ShellTools/RESTDWShellServices.dproj b/CORE/Packages/Delphi/ShellTools/RESTDWShellServices.dproj index 547473d3..0325466c 100644 --- a/CORE/Packages/Delphi/ShellTools/RESTDWShellServices.dproj +++ b/CORE/Packages/Delphi/ShellTools/RESTDWShellServices.dproj @@ -2,13 +2,14 @@ {EADFFC95-BEC1-4CAE-AAFE-AEEE50783690} RESTDWShellServices.dpk - 19.5 + 20.3 None True Debug Win32 558099 Package + RESTDWShellServices true @@ -53,6 +54,11 @@ Base true + + true + Base + true + true Base @@ -92,7 +98,7 @@ false - package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=;minSdkVersion=23;targetSdkVersion=35 None Debug android-support-v4.dex.jar;cloud-messaging.dex.jar;fmx.dex.jar;google-analytics-v2.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar;google-play-services.dex.jar @@ -100,7 +106,7 @@ $(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png - package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=;minSdkVersion=23;targetSdkVersion=35 Debug annotation-1.2.0.dex.jar;asynclayoutinflater-1.0.0.dex.jar;billing-4.0.0.dex.jar;browser-1.0.0.dex.jar;cloud-messaging.dex.jar;collection-1.0.0.dex.jar;coordinatorlayout-1.0.0.dex.jar;core-1.5.0-rc02.dex.jar;core-common-2.0.1.dex.jar;core-runtime-2.0.1.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;firebase-annotations-16.0.0.dex.jar;firebase-common-20.0.0.dex.jar;firebase-components-17.0.0.dex.jar;firebase-datatransport-18.0.0.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.0.0.dex.jar;firebase-installations-interop-17.0.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-22.0.0.dex.jar;fmx.dex.jar;fragment-1.0.0.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;legacy-support-core-ui-1.0.0.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.0.0.dex.jar;lifecycle-livedata-2.0.0.dex.jar;lifecycle-livedata-core-2.0.0.dex.jar;lifecycle-runtime-2.0.0.dex.jar;lifecycle-service-2.0.0.dex.jar;lifecycle-viewmodel-2.0.0.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;play-services-ads-20.1.0.dex.jar;play-services-ads-base-20.1.0.dex.jar;play-services-ads-identifier-17.0.0.dex.jar;play-services-ads-lite-20.1.0.dex.jar;play-services-base-17.5.0.dex.jar;play-services-basement-17.6.0.dex.jar;play-services-cloud-messaging-16.0.0.dex.jar;play-services-drive-17.0.0.dex.jar;play-services-games-21.0.0.dex.jar;play-services-location-18.0.0.dex.jar;play-services-maps-17.0.1.dex.jar;play-services-measurement-base-18.0.0.dex.jar;play-services-measurement-sdk-api-18.0.0.dex.jar;play-services-places-placereport-17.0.0.dex.jar;play-services-stats-17.0.0.dex.jar;play-services-tasks-17.2.0.dex.jar;print-1.0.0.dex.jar;room-common-2.1.0.dex.jar;room-runtime-2.1.0.dex.jar;slidingpanelayout-1.0.0.dex.jar;sqlite-2.0.1.dex.jar;sqlite-framework-2.0.1.dex.jar;swiperefreshlayout-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.0.0.dex.jar;transport-runtime-3.0.0.dex.jar;user-messaging-platform-1.0.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.1.0.dex.jar @@ -146,6 +152,13 @@ Debug CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + 1033 + DEBUG;$(DCC_Define) true @@ -211,7 +224,7 @@ File C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\RESTDWZEOSDriver.bpl not found - + @@ -229,12 +242,7 @@ true - - - RESTDWShellServices.bpl - true - - + @@ -244,16 +252,6 @@ 0 - - - classes - 64 - - - classes - 64 - - res\xml @@ -264,12 +262,6 @@ 1 - - - library\lib\armeabi-v7a - 1 - - library\lib\armeabi @@ -322,6 +314,16 @@ 1 + + + res\drawable-anydpi-v21 + 1 + + + res\drawable-anydpi-v21 + 1 + + res\values @@ -342,6 +344,76 @@ 1 + + + res\values-v31 + 1 + + + res\values-v31 + 1 + + + + + res\values-v35 + 1 + + + res\values-v35 + 1 + + + + + res\drawable-anydpi-v26 + 1 + + + res\drawable-anydpi-v26 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-anydpi-v33 + 1 + + + res\drawable-anydpi-v33 + 1 + + res\values @@ -352,6 +424,16 @@ 1 + + + res\values-night-v21 + 1 + + + res\values-night-v21 + 1 + + res\drawable @@ -522,6 +604,56 @@ 1 + + + res\drawable-anydpi-v24 + 1 + + + res\drawable-anydpi-v24 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-night-anydpi-v21 + 1 + + + res\drawable-night-anydpi-v21 + 1 + + + + + res\drawable-anydpi-v31 + 1 + + + res\drawable-anydpi-v31 + 1 + + + + + res\drawable-night-anydpi-v31 + 1 + + + res\drawable-night-anydpi-v31 + 1 + + 1 @@ -699,6 +831,9 @@ 1 + + 1 + @@ -960,16 +1095,19 @@ + True True True True + False False False True True + False 12 diff --git a/CORE/Packages/Delphi/ShellTools/RESTDWShellServicesDesign.dproj b/CORE/Packages/Delphi/ShellTools/RESTDWShellServicesDesign.dproj index 947231d8..974a719b 100644 --- a/CORE/Packages/Delphi/ShellTools/RESTDWShellServicesDesign.dproj +++ b/CORE/Packages/Delphi/ShellTools/RESTDWShellServicesDesign.dproj @@ -2,13 +2,14 @@ {C0D36021-A16C-44B0-8921-7852ADD1D0F2} RESTDWShellServicesDesign.dpk - 19.5 + 20.3 None True Debug - Win32 + Win64 3 Package + RESTDWShellServicesDesign true @@ -43,6 +44,11 @@ Base true + + true + Base + true + true Base @@ -113,6 +119,13 @@ Debug CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + 1033 + DEBUG;$(DCC_Define) true @@ -168,7 +181,7 @@ (untitled) - + @@ -196,16 +209,6 @@ 0 - - - classes - 64 - - - classes - 64 - - res\xml @@ -216,12 +219,6 @@ 1 - - - library\lib\armeabi-v7a - 1 - - library\lib\armeabi @@ -274,6 +271,16 @@ 1 + + + res\drawable-anydpi-v21 + 1 + + + res\drawable-anydpi-v21 + 1 + + res\values @@ -294,6 +301,76 @@ 1 + + + res\values-v31 + 1 + + + res\values-v31 + 1 + + + + + res\values-v35 + 1 + + + res\values-v35 + 1 + + + + + res\drawable-anydpi-v26 + 1 + + + res\drawable-anydpi-v26 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-anydpi-v33 + 1 + + + res\drawable-anydpi-v33 + 1 + + res\values @@ -304,6 +381,16 @@ 1 + + + res\values-night-v21 + 1 + + + res\values-night-v21 + 1 + + res\drawable @@ -474,6 +561,56 @@ 1 + + + res\drawable-anydpi-v24 + 1 + + + res\drawable-anydpi-v24 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-night-anydpi-v21 + 1 + + + res\drawable-night-anydpi-v21 + 1 + + + + + res\drawable-anydpi-v31 + 1 + + + res\drawable-anydpi-v31 + 1 + + + + + res\drawable-night-anydpi-v31 + 1 + + + res\drawable-night-anydpi-v31 + 1 + + 1 @@ -651,6 +788,9 @@ 1 + + 1 + @@ -912,14 +1052,17 @@ + False False False False + False True True + False 12 diff --git a/CORE/Packages/Delphi/Tools/RESTDWSelfSigned.dproj b/CORE/Packages/Delphi/Tools/RESTDWSelfSigned.dproj index 0a1cf81d..bac2a43d 100644 --- a/CORE/Packages/Delphi/Tools/RESTDWSelfSigned.dproj +++ b/CORE/Packages/Delphi/Tools/RESTDWSelfSigned.dproj @@ -2,13 +2,14 @@ {2E043D86-B418-4A04-8BD2-D8C8E05DB577} RESTDWSelfSigned.dpk - 19.5 + 20.3 None True Debug - Win32 + Win64 693267 Package + RESTDWSelfSigned true @@ -53,6 +54,11 @@ Base true + + true + Base + true + true Base @@ -87,14 +93,14 @@ None annotation-1.2.0.dex.jar;asynclayoutinflater-1.0.0.dex.jar;billing-4.0.0.dex.jar;browser-1.0.0.dex.jar;cloud-messaging.dex.jar;collection-1.0.0.dex.jar;coordinatorlayout-1.0.0.dex.jar;core-1.5.0-rc02.dex.jar;core-common-2.0.1.dex.jar;core-runtime-2.0.1.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;firebase-annotations-16.0.0.dex.jar;firebase-common-20.0.0.dex.jar;firebase-components-17.0.0.dex.jar;firebase-datatransport-18.0.0.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.0.0.dex.jar;firebase-installations-interop-17.0.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-22.0.0.dex.jar;fmx.dex.jar;fragment-1.0.0.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;legacy-support-core-ui-1.0.0.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.0.0.dex.jar;lifecycle-livedata-2.0.0.dex.jar;lifecycle-livedata-core-2.0.0.dex.jar;lifecycle-runtime-2.0.0.dex.jar;lifecycle-service-2.0.0.dex.jar;lifecycle-viewmodel-2.0.0.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;play-services-ads-20.1.0.dex.jar;play-services-ads-base-20.1.0.dex.jar;play-services-ads-identifier-17.0.0.dex.jar;play-services-ads-lite-20.1.0.dex.jar;play-services-base-17.5.0.dex.jar;play-services-basement-17.6.0.dex.jar;play-services-cloud-messaging-16.0.0.dex.jar;play-services-drive-17.0.0.dex.jar;play-services-games-21.0.0.dex.jar;play-services-location-18.0.0.dex.jar;play-services-maps-17.0.1.dex.jar;play-services-measurement-base-18.0.0.dex.jar;play-services-measurement-sdk-api-18.0.0.dex.jar;play-services-places-placereport-17.0.0.dex.jar;play-services-stats-17.0.0.dex.jar;play-services-tasks-17.2.0.dex.jar;print-1.0.0.dex.jar;room-common-2.1.0.dex.jar;room-runtime-2.1.0.dex.jar;slidingpanelayout-1.0.0.dex.jar;sqlite-2.0.1.dex.jar;sqlite-framework-2.0.1.dex.jar;swiperefreshlayout-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.0.0.dex.jar;transport-runtime-3.0.0.dex.jar;user-messaging-platform-1.0.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.1.0.dex.jar - package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=;minSdkVersion=23;targetSdkVersion=35 Debug rtl;soaprtl;dbrtl;FireDAC;FireDACCommonDriver;FireDACCommon;RESTDWCore;$(DCC_UsePackage) None annotation-1.2.0.dex.jar;asynclayoutinflater-1.0.0.dex.jar;billing-4.0.0.dex.jar;browser-1.0.0.dex.jar;cloud-messaging.dex.jar;collection-1.0.0.dex.jar;coordinatorlayout-1.0.0.dex.jar;core-1.5.0-rc02.dex.jar;core-common-2.0.1.dex.jar;core-runtime-2.0.1.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;firebase-annotations-16.0.0.dex.jar;firebase-common-20.0.0.dex.jar;firebase-components-17.0.0.dex.jar;firebase-datatransport-18.0.0.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.0.0.dex.jar;firebase-installations-interop-17.0.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-22.0.0.dex.jar;fmx.dex.jar;fragment-1.0.0.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;legacy-support-core-ui-1.0.0.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.0.0.dex.jar;lifecycle-livedata-2.0.0.dex.jar;lifecycle-livedata-core-2.0.0.dex.jar;lifecycle-runtime-2.0.0.dex.jar;lifecycle-service-2.0.0.dex.jar;lifecycle-viewmodel-2.0.0.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;play-services-ads-20.1.0.dex.jar;play-services-ads-base-20.1.0.dex.jar;play-services-ads-identifier-17.0.0.dex.jar;play-services-ads-lite-20.1.0.dex.jar;play-services-base-17.5.0.dex.jar;play-services-basement-17.6.0.dex.jar;play-services-cloud-messaging-16.0.0.dex.jar;play-services-drive-17.0.0.dex.jar;play-services-games-21.0.0.dex.jar;play-services-location-18.0.0.dex.jar;play-services-maps-17.0.1.dex.jar;play-services-measurement-base-18.0.0.dex.jar;play-services-measurement-sdk-api-18.0.0.dex.jar;play-services-places-placereport-17.0.0.dex.jar;play-services-stats-17.0.0.dex.jar;play-services-tasks-17.2.0.dex.jar;print-1.0.0.dex.jar;room-common-2.1.0.dex.jar;room-runtime-2.1.0.dex.jar;slidingpanelayout-1.0.0.dex.jar;sqlite-2.0.1.dex.jar;sqlite-framework-2.0.1.dex.jar;swiperefreshlayout-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.0.0.dex.jar;transport-runtime-3.0.0.dex.jar;user-messaging-platform-1.0.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.1.0.dex.jar - package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=;minSdkVersion=23;targetSdkVersion=35 Debug rtl;soaprtl;dbrtl;FireDAC;FireDACCommonDriver;FireDACCommon;RESTDWCore;$(DCC_UsePackage) @@ -135,12 +141,12 @@ $(BDS)\bin\Artwork\iOS\iPad\FM_NotificationIcon_40x40.png - CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false + CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing the Bluetooth interface Debug rtl;soaprtl;dbrtl;FireDAC;FireDACCommonDriver;FireDACCommon;$(DCC_UsePackage) - CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false + CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing the Bluetooth interface Debug rtl;soaprtl;dbrtl;FireDAC;FireDACCommonDriver;FireDACCommon;$(DCC_UsePackage);$(DCC_UsePackage) @@ -160,6 +166,13 @@ 1033 vcl;rtl;soaprtl;dbrtl;FireDAC;FireDACCommonDriver;FireDACCommon;RESTDWCore;$(DCC_UsePackage) + + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + 1033 + DEBUG;$(DCC_Define) true @@ -218,7 +231,7 @@ RESTDWSelfSigned.dpk - + true @@ -243,16 +256,6 @@ 0 - - - classes - 64 - - - classes - 64 - - res\xml @@ -263,12 +266,6 @@ 1 - - - library\lib\armeabi-v7a - 1 - - library\lib\armeabi @@ -321,6 +318,16 @@ 1 + + + res\drawable-anydpi-v21 + 1 + + + res\drawable-anydpi-v21 + 1 + + res\values @@ -341,6 +348,76 @@ 1 + + + res\values-v31 + 1 + + + res\values-v31 + 1 + + + + + res\values-v35 + 1 + + + res\values-v35 + 1 + + + + + res\drawable-anydpi-v26 + 1 + + + res\drawable-anydpi-v26 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-anydpi-v33 + 1 + + + res\drawable-anydpi-v33 + 1 + + res\values @@ -351,6 +428,16 @@ 1 + + + res\values-night-v21 + 1 + + + res\values-night-v21 + 1 + + res\drawable @@ -521,6 +608,56 @@ 1 + + + res\drawable-anydpi-v24 + 1 + + + res\drawable-anydpi-v24 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-night-anydpi-v21 + 1 + + + res\drawable-night-anydpi-v21 + 1 + + + + + res\drawable-anydpi-v31 + 1 + + + res\drawable-anydpi-v31 + 1 + + + + + res\drawable-night-anydpi-v31 + 1 + + + res\drawable-night-anydpi-v31 + 1 + + 1 @@ -698,6 +835,9 @@ 1 + + 1 + @@ -959,16 +1099,19 @@ + True True True True + False True True True True + False 12 diff --git a/CORE/Packages/Delphi/Wizards/RESTDWWizards.dproj b/CORE/Packages/Delphi/Wizards/RESTDWWizards.dproj index 78786239..cf923e31 100644 --- a/CORE/Packages/Delphi/Wizards/RESTDWWizards.dproj +++ b/CORE/Packages/Delphi/Wizards/RESTDWWizards.dproj @@ -7,8 +7,9 @@ 3 Package VCL - 19.5 - Win32 + 20.3 + Win64 + RESTDWWizards true @@ -33,6 +34,11 @@ Base true + + true + Base + true + true Base @@ -99,6 +105,13 @@ CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= 1033 + + Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + 1033 + RELEASE;$(DCC_Define) 0 @@ -168,8 +181,9 @@ False True True + False - + @@ -180,16 +194,6 @@ 0 - - - classes - 64 - - - classes - 64 - - res\xml @@ -200,12 +204,6 @@ 1 - - - library\lib\armeabi-v7a - 1 - - library\lib\armeabi @@ -258,6 +256,16 @@ 1 + + + res\drawable-anydpi-v21 + 1 + + + res\drawable-anydpi-v21 + 1 + + res\values @@ -278,6 +286,76 @@ 1 + + + res\values-v31 + 1 + + + res\values-v31 + 1 + + + + + res\values-v35 + 1 + + + res\values-v35 + 1 + + + + + res\drawable-anydpi-v26 + 1 + + + res\drawable-anydpi-v26 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-anydpi-v33 + 1 + + + res\drawable-anydpi-v33 + 1 + + res\values @@ -288,6 +366,16 @@ 1 + + + res\values-night-v21 + 1 + + + res\values-night-v21 + 1 + + res\drawable @@ -458,6 +546,56 @@ 1 + + + res\drawable-anydpi-v24 + 1 + + + res\drawable-anydpi-v24 + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-night-anydpi-v21 + 1 + + + res\drawable-night-anydpi-v21 + 1 + + + + + res\drawable-anydpi-v31 + 1 + + + res\drawable-anydpi-v31 + 1 + + + + + res\drawable-night-anydpi-v31 + 1 + + + res\drawable-night-anydpi-v31 + 1 + + 1 @@ -635,6 +773,9 @@ 1 + + 1 + @@ -896,6 +1037,7 @@ + 12 diff --git a/CORE/Source/Basic/uRESTDWDesignReg.pas b/CORE/Source/Basic/uRESTDWDesignReg.pas index d33a4e83..59c004b1 100644 --- a/CORE/Source/Basic/uRESTDWDesignReg.pas +++ b/CORE/Source/Basic/uRESTDWDesignReg.pas @@ -789,10 +789,12 @@ procedure TRESTDWContextRulesEditor.ExecuteVerb(Index: Integer); // RegFields(DefaultFieldClasses); RegField(TRESTDWNumericField); RegField(TStringFieldRESTDW); + RegField(TStreamField); // RegField(TRESTDWSQLTimeStampOffsetField); {$ELSE} RegisterFields([TStringFieldRESTDW]); RegisterFields([TRESTDWNumericField]); + RegisterFields([TStreamField]); {$ENDIF} {$IFDEF FPC} {$I RESTDataWareComponents_LAMW.lrs} diff --git a/CORE/Source/Basic/uRESTDWProtoTypes.pas b/CORE/Source/Basic/uRESTDWProtoTypes.pas index 2acf1966..7baf778c 100644 --- a/CORE/Source/Basic/uRESTDWProtoTypes.pas +++ b/CORE/Source/Basic/uRESTDWProtoTypes.pas @@ -153,6 +153,7 @@ interface {$IFDEF RESTDWLAZARUS} DWSmallint = Smallint; DWInteger = Longint; + DWLongint = Largeint; DWInt16 = Integer; DWInt64 = Int64; DWInt32 = Int32; @@ -174,6 +175,7 @@ interface DWInt16 = Integer; DWInt64 = Int64; DWInt32 = Longint; + DWLongint = Longint; DWFloat = Real; DWSingle = Single; DWDouble = Double; diff --git a/CORE/Source/Basic/uRESTDWStorageBin.pas b/CORE/Source/Basic/uRESTDWStorageBin.pas index 34fd60cb..b05985f7 100644 --- a/CORE/Source/Basic/uRESTDWStorageBin.pas +++ b/CORE/Source/Basic/uRESTDWStorageBin.pas @@ -332,9 +332,7 @@ interface vNoFields := (ADataSet.Fields.Count = 0); ADataSet.Close; If vNoFields Then - begin ADataSet.FieldDefs.Clear; - end; For I := 0 To vFieldsCount-1 Do Begin // field kind @@ -347,7 +345,7 @@ interface FFieldNames[I] := vFieldName; // field type AStream.Read(vFieldType, SizeOf(vFieldType)); - If vFieldType in [{$IFDEF FPC}45, {$ENDIF}dwftExtended] Then + If vFieldType in [Integer(ftFloat), {$IFDEF FPC}45, {$ENDIF}dwftExtended] Then FFieldTypes[I] := {$IFDEF FPC}Integer(ftFMTBcd){$ELSE}Integer(ftExtended){$ENDIF} Else FFieldTypes[I] := vFieldType; @@ -474,11 +472,11 @@ interface If (vDWFieldType In [dwftFixedWideChar, dwftWideString, dwftFixedChar, - dwftString, - dwftOraClob, - dwftWideMemo, - dwftFmtMemo, - dwftMemo]) Then + dwftString]) Then +// dwftOraClob, +// dwftWideMemo, +// dwftFmtMemo, +// dwftMemo]) Then Begin vLength := Dataset.GetCalcFieldLen(aField.DataType, aField.Size); {$IFDEF FPC} @@ -546,10 +544,10 @@ interface vActualRecord := Dataset.GetMemoryRecord(i); For b := 0 To vFieldCount Do Begin - vBoolean := False; + vBoolean := False; stream.Read(vBoolean, SizeOf(boolean)); SetLength(vVarBytes, 0); - aField := vDataset.FindField(FFieldNames[b]); + aField := vDataset.FindField(FFieldNames[b]); If aField <> Nil Then Begin aIndex := aField.FieldNo - 1; @@ -573,9 +571,12 @@ interface pData := Pointer(pActualRecord + Dataset.GetOffSets(aField)); End; End; - tratarNulos; - If Not vBoolean Then - Continue; + If vDWFieldType <> dwftBoolean Then + Begin + tratarNulos; + If Not vBoolean Then + Continue; + End; If (pData <> Nil) Or (aField = Nil) Then Begin // N Bytes - WideString @@ -624,7 +625,7 @@ interface vString := DecodeStrings(vString, Dataset.GetDatabaseCharSet); vString := GetStringEncode(vString, Dataset.GetDatabaseCharSet); If aField <> Nil Then - Move(Pointer(vString)^, pData^, Length(vString)); + Move(Pointer(vString)^, pData^, vInt64); {$ELSE} stream.Read(vString[InitStrPos], vInt64); If EncodeStrs Then @@ -640,19 +641,20 @@ interface // 1 - Byte - Inteiro dwftByte, dwftShortint :Begin - stream.Read(vByte, SizeOf(vByte)); - If aField <> Nil Then - Move(vByte, PData^, Sizeof(vByte)); + stream.Read(vByte, SizeOf(vByte)); + If aField <> Nil Then + Move(vByte, PData^, Sizeof(vByte)); End; // 1 - Byte - Boolean dwftBoolean :Begin setlength(vVarBytes, 0); - setlength(vVarBytes, 2); + setlength(vVarBytes, Sizeof(Boolean)); +// Move(vBoolean, vVarBytes[0], Sizeof(Boolean)); +// stream.Read(vBoolean, SizeOf(vBoolean)); Move(vBoolean, vVarBytes[0], Sizeof(Boolean)); - stream.Read(vBoolean, SizeOf(vBoolean)); - Move(vBoolean, vVarBytes[1], Sizeof(Boolean)); +// Move(vBoolean, vVarBytes[1], Sizeof(Boolean)); If aField <> Nil Then - Move(vVarBytes[0], PData^, Sizeof(vBoolean) + Sizeof(vBoolean)); + Move(vVarBytes[0], PData^, Sizeof(vBoolean)); End; // 2 - Bytes dwftSmallint, @@ -884,33 +886,34 @@ interface dwftWideMemo, dwftFmtMemo, dwftOraClob, - dwftMemo :Begin - stream.Read(vInt64, SizeOf(vInt64)); - vString := ''; - If vInt64 > 0 Then - Begin - SetLength(vString, vInt64); - {$IFDEF FPC} - stream.Read(Pointer(vString)^, vInt64); - If EncodeStrs Then - vString := DecodeStrings(vString, csUndefined); - vString := GetStringEncode(vString, csUndefined); - {$ELSE} - stream.Read(vString[InitStrPos], vInt64); - If EncodeStrs Then - vString := DecodeStrings(vString); - {$ENDIF} - vInt64 := Length(vString) + 1; - Try - SetLength(vBytes, vInt64); - Move(vString[InitStrPos], vBytes[0], vInt64); - If aField <> Nil Then - PRESTDWBytes(pData)^ := vBytes; - Finally - SetLength(vBytes, 0); - End; - End; - End; + dwftMemo, +// dwftMemo :Begin +// stream.Read(vInt64, SizeOf(vInt64)); +// vString := ''; +// If vInt64 > 0 Then +// Begin +// SetLength(vString, vInt64); +// {$IFDEF FPC} +// stream.Read(Pointer(vString)^, vInt64); +// If EncodeStrs Then +// vString := DecodeStrings(vString, csUndefined); +// vString := GetStringEncode(vString, csUndefined); +// {$ELSE} +// stream.Read(vString[InitStrPos], vInt64); +// If EncodeStrs Then +// vString := DecodeStrings(vString); +// {$ENDIF} +// vInt64 := Length(vString) + 1; +// Try +// SetLength(vBytes, vInt64); +// Move(vString[InitStrPos], vBytes[0], vInt64); +// If aField <> Nil Then +// PRESTDWBytes(pData)^ := vBytes; +// Finally +// SetLength(vBytes, 0); +// End; +// End; +// End; // N Bytes - Others Blobs dwftStream, dwftOraBlob, @@ -997,8 +1000,11 @@ interface vField := ADataset.Fields[i]; vField.Clear; AStream.Read(vBoolean, Sizeof(Byte)); - If Not vBoolean Then // is null - Continue; + If FFieldTypes[i] <> dwftBoolean Then + Begin + If Not vBoolean Then + Continue; + End; // N - Bytes If (FFieldTypes[i] In [dwftFixedChar, dwftWideString, @@ -1407,19 +1413,22 @@ interface If (aIndex >= 0) And (PActualRecord <> Nil) Then Begin vDataType := vDataSet.FieldDefs[aIndex].DataType; - {$IFNDEF FPC} - {$IF compilerversion < 21} - vBoolean := vDataSet.Fields[B].Size > 0; - {$ELSE} - vBoolean := vDataSet.Fields[B].IsNull; - {$IFEND} - {$ELSE} - vBoolean := vDataSet.Fields[B].IsNull; - {$ENDIF} - vBoolean := Not vBoolean; - Stream.Write(vBoolean, SizeOf(boolean)); - If Not vBoolean Then - Continue; + If vDataType <> ftBoolean Then + Begin + {$IFNDEF FPC} + {$IF compilerversion < 21} + vBoolean := vDataSet.Fields[B].Size > 0; + {$ELSE} + vBoolean := vDataSet.Fields[B].IsNull; + {$IFEND} + {$ELSE} + vBoolean := vDataSet.Fields[B].IsNull; + {$ENDIF} + vBoolean := Not vBoolean; + Stream.Write(vBoolean, SizeOf(boolean)); + If Not vBoolean Then + Continue; + End; If Dataset.DataTypeSuported(vDataType) Then Begin If Dataset.DataTypeIsBlobTypes(vDataType) Then @@ -1664,11 +1673,15 @@ interface vMemoryStream := nil; For i := 0 To ADataset.FieldCount - 1 Do Begin - vBoolean := ADataset.Fields[i].IsNull; - vBoolean := Not vBoolean; - AStream.Write(vBoolean, SizeOf(boolean)); - If Not vBoolean Then - Continue; + vBoolean := True; + If ADataset.Fields[i].DataType <> ftBoolean Then + Begin + vBoolean := ADataset.Fields[i].IsNull; + vBoolean := Not vBoolean; + AStream.Write(vBoolean, SizeOf(boolean)); + If Not vBoolean Then + Continue; + End; vDWFieldType := FieldTypeToDWFieldType(ADataset.Fields[i].DataType); // N - Bytes Case vDWFieldType Of diff --git a/CORE/Source/Consts/uRESTDWConsts.pas b/CORE/Source/Consts/uRESTDWConsts.pas index 0f9a1175..1082c795 100644 --- a/CORE/Source/Consts/uRESTDWConsts.pas +++ b/CORE/Source/Consts/uRESTDWConsts.pas @@ -60,8 +60,8 @@ // controle de versão RESTDWVersionINFO = 'v2.1.0-'; - RESTDWRelease = '3992'; - RESTDWCodeProject = 'Final Fantasy X - GitHub'; + RESTDWRelease = '3974'; + RESTDWCodeProject = 'Final Fantasy X - SourceForge'; RESTDWVersao = RESTDWVersionINFO + RESTDWRelease + '(' + RESTDWCodeProject + ')'; RESTDWDialogoTitulo = 'REST DataWare Components ' + RESTDWVersao; RESTDWSobreTitulo = 'REST DataWare '+ RESTDWVersao; diff --git a/CORE/Source/Database_Drivers/uRESTDWDriverBase.pas b/CORE/Source/Database_Drivers/uRESTDWDriverBase.pas index 87987b1e..e02a2e3d 100644 --- a/CORE/Source/Database_Drivers/uRESTDWDriverBase.pas +++ b/CORE/Source/Database_Drivers/uRESTDWDriverBase.pas @@ -428,6 +428,13 @@ TRDWDrvParam = class(TObject) { TRESTDWDrvStoreProc } +Function FixFieldName(FieldName : String) : String; +Begin + Result := FieldName; + If Pos('_', Result) > 0 Then + Result := Format('"%s"', [Result]); +End; + Function TRESTDWDrvStoreProc.getStoredProcName : String; Begin Try @@ -1757,182 +1764,200 @@ function TRESTDWDriverBase.ApplyUpdates(MassiveDataset: TMassiveDatasetBuffer; var Error: Boolean; var MessageError: String; var RowsAffected: Integer): TRESTDWJSONValue; -var - vTempQuery: TRESTDWDrvQuery; - vResultReflection: string; - vStateResource, vMassiveLine: boolean; - - function LoadMassive(var Query: TRESTDWDrvQuery): boolean; - var - A, B: integer; - begin - Result := False; - try - MassiveDataset.First; - if Assigned(FServerMethod) then begin - if Assigned(FServerMethod.OnMassiveBegin) then - FServerMethod.OnMassiveBegin(MassiveDataset); - end; - B := 1; - Result := True; - for A := 1 to MassiveDataset.RecordCount do begin - if not connInTransaction then begin - connStartTransaction; - if Assigned(FServerMethod) then begin - if Assigned(FServerMethod.OnMassiveAfterStartTransaction) then - FServerMethod.OnMassiveAfterStartTransaction(MassiveDataset); - end; - end; - Query.SQL.Clear; - if Assigned(FServerMethod) then begin - vMassiveLine := False; - if Assigned(FServerMethod.OnMassiveProcess) then begin - FServerMethod.OnMassiveProcess(MassiveDataset,vMassiveLine); - if vMassiveLine then begin - MassiveDataset.Next; - Continue; - end; - end; - end; - PrepareDataQuery(Query, MassiveDataset, Params, MassiveDataset.ReflectChanges, vResultReflection, Error, MessageError); - try - if (not (MassiveDataset.ReflectChanges)) or - ((MassiveDataset.ReflectChanges) and - (MassiveDataset.MassiveMode in [mmExec, mmDelete])) then - Query.ExecSQL; - except - On E: Exception do begin - Error := True; - Result := False; - MessageError := E.Message; - if connInTransaction then - connRollback; - Exit; - end; - end; - - if B >= CommitRecords then begin - try - if connInTransaction then begin - if Assigned(FServerMethod) then begin - if Assigned(FServerMethod.OnMassiveAfterBeforeCommit) then - FServerMethod.OnMassiveAfterBeforeCommit(MassiveDataset); - end; - connCommit; - if Assigned(FServerMethod) then begin - if Assigned(FServerMethod.OnMassiveAfterAfterCommit) then - FServerMethod.OnMassiveAfterAfterCommit(MassiveDataset); - end; - end; - except - On E: Exception do begin - Error := True; - Result := False; - MessageError := E.Message; - if connInTransaction then - connRollback; - Break; - end; - end; - B := 1; - end - else - Inc(B); - MassiveDataset.Next; - end; - try - if connInTransaction then begin - if Assigned(FServerMethod) then begin - if Assigned(FServerMethod.OnMassiveAfterBeforeCommit) then - FServerMethod.OnMassiveAfterBeforeCommit(MassiveDataset); - end; +Var + vTempQuery : TRESTDWDrvQuery; + vResultReflection : String; + vStateResource, + vMassiveLine : Boolean; + Function LoadMassive(var Query: TRESTDWDrvQuery): boolean; + Var + A, B: integer; + Begin + Result := False; + Try + MassiveDataset.First; + If Assigned(FServerMethod) then + Begin + If Assigned(FServerMethod.OnMassiveBegin) Then + FServerMethod.OnMassiveBegin(MassiveDataset); + End; + B := 1; + Result := True; + For A := 1 to MassiveDataset.RecordCount Do + Begin + If not connInTransaction Then + Begin + connStartTransaction; + If Assigned(FServerMethod) Then + Begin + If Assigned(FServerMethod.OnMassiveAfterStartTransaction) Then + FServerMethod.OnMassiveAfterStartTransaction(MassiveDataset); + End; + End; + Query.SQL.Clear; + If Assigned(FServerMethod) Then + Begin + vMassiveLine := False; + If Assigned(FServerMethod.OnMassiveProcess) Then + Begin + FServerMethod.OnMassiveProcess(MassiveDataset,vMassiveLine); + If vMassiveLine Then + Begin + MassiveDataset.Next; + Continue; + End; + End; + End; + PrepareDataQuery(Query, MassiveDataset, Params, MassiveDataset.ReflectChanges, vResultReflection, Error, MessageError); + Try + If (Not(MassiveDataset.ReflectChanges)) Or + ((MassiveDataset.ReflectChanges) And + (MassiveDataset.MassiveMode In [mmExec, mmDelete])) Then + Query.ExecSQL; + Except + On E: Exception do + Begin + Error := True; + Result := False; + MessageError := E.Message; + If connInTransaction Then + connRollback; + Exit; + End; + End; + If B >= CommitRecords Then + Begin + Try + If connInTransaction Then + Begin + If Assigned(FServerMethod) Then + Begin + If Assigned(FServerMethod.OnMassiveAfterBeforeCommit) Then + FServerMethod.OnMassiveAfterBeforeCommit(MassiveDataset); + End; connCommit; - if Assigned(FServerMethod) then begin - if Assigned(FServerMethod.OnMassiveAfterAfterCommit) then - FServerMethod.OnMassiveAfterAfterCommit(MassiveDataset); - end; - end; - except - On E: Exception do begin + If Assigned(FServerMethod) Then + Begin + If Assigned(FServerMethod.OnMassiveAfterAfterCommit) Then + FServerMethod.OnMassiveAfterAfterCommit(MassiveDataset); + End; + End; + Except + On E: Exception Do + Begin Error := True; Result := False; MessageError := E.Message; - if connInTransaction then - connRollback; - end; - end; - finally - if Assigned(FServerMethod) then begin - if Assigned(FServerMethod.OnMassiveEnd) then - FServerMethod.OnMassiveEnd(MassiveDataset); - end; - Query.SQL.Clear; - end; - end; -begin - {$IFNDEF RESTDWLAZARUS}inherited;{$ENDIF} - try - Result := nil; - Error := False; - vTempQuery := getQuery; - - vStateResource := isConnected; - if not vStateResource then - Connect; - - vTempQuery.SQL.Clear; - vResultReflection := ''; - if LoadMassive(vTempQuery) then begin - if (SQL <> '') and (vResultReflection = '') then begin - try - vTempQuery.SQL.Clear; - vTempQuery.SQL.Add(SQL); - vTempQuery.ImportParams(Params); - vTempQuery.Open; - - if Result = nil then - Result := TRESTDWJSONValue.Create; - Result.Encoding := Encoding; - Result.Encoded := EncodeStringsJSON; - Result.Utf8SpecialChars := True; - Result.LoadFromDataset('RESULTDATA', TDataSet(vTempQuery.Owner),EncodeStringsJSON); - Error := False; - if not vStateResource then - Disconect; - except - On E: Exception do begin - try - Error := True; - MessageError := E.Message; - if Result = nil then - Result := TRESTDWJSONValue.Create; - Result.Encoded := True; - Result.SetValue(GetPairJSONStr('NOK', MessageError)); - if connInTransaction then - connRollback; - except + If connInTransaction Then + connRollback; + Break; + End; + End; + B := 1; + End + Else + Inc(B); + MassiveDataset.Next; + End; + Try + If connInTransaction Then + Begin + If Assigned(FServerMethod) Then + Begin + If Assigned(FServerMethod.OnMassiveAfterBeforeCommit) Then + FServerMethod.OnMassiveAfterBeforeCommit(MassiveDataset); + End; + connCommit; + If Assigned(FServerMethod) Then + Begin + If Assigned(FServerMethod.OnMassiveAfterAfterCommit) Then + FServerMethod.OnMassiveAfterAfterCommit(MassiveDataset); + End; + End; + Except + On E: Exception Do + Begin + Error := True; + Result := False; + MessageError := E.Message; + If connInTransaction Then + connRollback; + End; + End; + Finally + If Assigned(FServerMethod) Then + Begin + If Assigned(FServerMethod.OnMassiveEnd) Then + FServerMethod.OnMassiveEnd(MassiveDataset); + End; + Query.SQL.Clear; + End; + End; +Begin + {$IFNDEF RESTDWLAZARUS}Inherited;{$ENDIF} + Try + Result := nil; + Error := False; + vTempQuery := getQuery; + vStateResource := isConnected; + If Not vStateResource Then + Connect; + vTempQuery.SQL.Clear; + vResultReflection := ''; + If LoadMassive(vTempQuery) Then + Begin + If (SQL <> '') And (vResultReflection = '') Then + Begin + Try + vTempQuery.SQL.Clear; + vTempQuery.SQL.Add(SQL); + vTempQuery.ImportParams(Params); + vTempQuery.Open; + If Result = Nil Then + Result := TRESTDWJSONValue.Create; + Result.Encoding := Encoding; + Result.Encoded := EncodeStringsJSON; + Result.Utf8SpecialChars := True; + Result.LoadFromDataset('RESULTDATA', TDataSet(vTempQuery.Owner),EncodeStringsJSON); + Error := False; + If Not vStateResource Then + Disconect; + Except + On E: Exception Do + Begin + Try + Error := True; + MessageError := E.Message; + If Result = Nil Then + Result := TRESTDWJSONValue.Create; + Result.Encoded := True; + Result.SetValue(GetPairJSONStr('NOK', MessageError)); + If connInTransaction Then + connRollback; + Except - end; - Disconect; - end; - end; - end - else if (vResultReflection <> '') then begin - if Result = nil then - Result := TRESTDWJSONValue.Create; - Result.Encoding := Encoding; - Result.Encoded := EncodeStringsJSON; - Result.SetValue('[' + vResultReflection + ']'); - Error := False; - end; - end; - finally - FreeAndNil(BufferBase); - RowsAffected := vTempQuery.RowsAffected; - vTempQuery.Close; - FreeAndNil(vTempQuery); - end; -end; + End; + Disconect; + End; + End; + End + Else If (vResultReflection <> '') Then + Begin + If Result = Nil Then + Result := TRESTDWJSONValue.Create; + Result.Encoding := Encoding; + Result.Encoded := EncodeStringsJSON; + Result.SetValue('[' + vResultReflection + ']'); + Error := False; + End; + End; + Finally + FreeAndNil(BufferBase); + RowsAffected := vTempQuery.RowsAffected; + vTempQuery.Close; + FreeAndNil(vTempQuery); + End; +End; function TRESTDWDriverBase.ApplyUpdatesTB(Massive : String; Params : TRESTDWParams; var Error : Boolean; var MessageError : String; var RowsAffected : Integer) : TRESTDWJSONValue; var @@ -3986,8 +4011,7 @@ procedure TRESTDWDriverBase.PrepareDataQuery(var Query: TRESTDWDrvQuery; vLineSQL := Format('INSERT INTO %s ',[MassiveDataset.TableName + ' (%s) VALUES (%s)']); for I := 0 to MassiveDataset.Fields.Count - 1 do begin if ((((MassiveDataset.Fields.Items[I].AutoGenerateValue) and - (MassiveDataset.AtualRec.MassiveMode = mmInsert) and - (MassiveDataset.Fields.Items[I].ReadOnly)) or + (MassiveDataset.AtualRec.MassiveMode = mmInsert)) or (MassiveDataset.Fields.Items[I].ReadOnly)) and (not (MassiveDataset.ReflectChanges))) or ((MassiveDataset.ReflectChanges) and @@ -3996,21 +4020,21 @@ procedure TRESTDWDriverBase.PrepareDataQuery(var Query: TRESTDWDrvQuery; (Lowercase(MassiveDataset.Fields.Items[I].FieldName) = Lowercase(RESTDWFieldBookmark)))) then Continue; if vFields = '' then begin - vFields := MassiveDataset.Fields.Items[I].FieldName; + vFields := FixFieldName(MassiveDataset.Fields.Items[I].FieldName); if not MassiveDataset.ReflectChanges then vParamsSQL := ':' + MassiveDataset.Fields.Items[I].FieldName; end else begin - vFields := vFields + ', ' + MassiveDataset.Fields.Items[I].FieldName; + vFields := vFields + ', ' + FixFieldName(MassiveDataset.Fields.Items[I].FieldName); if not MassiveDataset.ReflectChanges then vParamsSQL := vParamsSQL + ', :' + MassiveDataset.Fields.Items[I].FieldName; end; if MassiveDataset.ReflectChanges then begin if MassiveDataset.Fields.Items[I].KeyField then if vParamsSQL = '' then - vParamsSQL := MassiveDataset.Fields.Items[I].FieldName + ' is null ' + vParamsSQL := FixFieldName(MassiveDataset.Fields.Items[I].FieldName) + ' is null ' else - vParamsSQL := vParamsSQL + ' and ' + MassiveDataset.Fields.Items[I].FieldName + ' is null '; + vParamsSQL := vParamsSQL + ' and ' + FixFieldName(MassiveDataset.Fields.Items[I].FieldName) + ' is null '; end; end; @@ -4035,9 +4059,9 @@ procedure TRESTDWDriverBase.PrepareDataQuery(var Query: TRESTDWDrvQuery; for I := 0 to MassiveDataset.AtualRec.UpdateFieldChangesCount - 1 do begin if Lowercase(MassiveDataset.AtualRec.UpdateFieldChanges[I]) <> Lowercase(RESTDWFieldBookmark) then begin if vFields = '' then - vFields := MassiveDataset.AtualRec.UpdateFieldChanges[I] + ' = :' + MassiveDataset.AtualRec.UpdateFieldChanges[I] + vFields := FixFieldName(MassiveDataset.AtualRec.UpdateFieldChanges[I]) + ' = :' + MassiveDataset.AtualRec.UpdateFieldChanges[I] else - vFields := vFields + ', ' + MassiveDataset.AtualRec.UpdateFieldChanges[I] + ' = :' + MassiveDataset.AtualRec.UpdateFieldChanges[I]; + vFields := vFields + ', ' + FixFieldName(MassiveDataset.AtualRec.UpdateFieldChanges[I]) + ' = :' + MassiveDataset.AtualRec.UpdateFieldChanges[I]; end; end; end @@ -4065,9 +4089,9 @@ procedure TRESTDWDriverBase.PrepareDataQuery(var Query: TRESTDWDrvQuery; try for I := 0 to bPrimaryKeys.Count - 1 do begin if I = 0 then - vParamsSQL := 'WHERE ' + bPrimaryKeys[I] + ' = :DWKEY_' + bPrimaryKeys[I] + vParamsSQL := 'WHERE ' + FixFieldName(bPrimaryKeys[I]) + ' = :DWKEY_' + bPrimaryKeys[I] else - vParamsSQL := vParamsSQL + ' AND ' + bPrimaryKeys[I] + ' = :DWKEY_' + bPrimaryKeys[I]; + vParamsSQL := vParamsSQL + ' AND ' + FixFieldName(bPrimaryKeys[I]) + ' = :DWKEY_' + bPrimaryKeys[I]; end; finally FreeAndNil(bPrimaryKeys); @@ -4080,9 +4104,9 @@ procedure TRESTDWDriverBase.PrepareDataQuery(var Query: TRESTDWDrvQuery; try for I := 0 to bPrimaryKeys.Count - 1 do begin if I = 0 then - vParamsSQL := 'WHERE ' + bPrimaryKeys[I] + ' = :' + bPrimaryKeys[I] + vParamsSQL := 'WHERE ' + FixFieldName(bPrimaryKeys[I]) + ' = :' + bPrimaryKeys[I] else - vParamsSQL := vParamsSQL + ' AND ' + bPrimaryKeys[I] + ' = :' + bPrimaryKeys[I]; + vParamsSQL := vParamsSQL + ' AND ' + FixFieldName(bPrimaryKeys[I]) + ' = :' + bPrimaryKeys[I]; end; finally FreeAndNil(bPrimaryKeys); diff --git a/CORE/Source/Plugins/Memdataset/uRESTDWMemoryDataset.pas b/CORE/Source/Plugins/Memdataset/uRESTDWMemoryDataset.pas index 2411ce06..5bef2ff0 100644 --- a/CORE/Source/Plugins/Memdataset/uRESTDWMemoryDataset.pas +++ b/CORE/Source/Plugins/Memdataset/uRESTDWMemoryDataset.pas @@ -162,17 +162,6 @@ End; { - TStreamField = Class(TBlobField) - Private - FStream : TStream; - Function GetAsStream : TStream; - Public - Constructor Create(AOwner : TComponent); Override; - Destructor Destroy; Override; - Procedure Put; - Property Value : TStream Read GetAsStream; - End; - TdwcolorOptions = Set Of (dwcoAllowedSharp, dwcoShowWebSharp, dwcoSysColors); TColorField = class(TIntegerField) Private @@ -548,7 +537,11 @@ TDoubleLinkedBufIndex = class(TRESTDWIndex) Procedure ClearChanges; Function GetFieldData (FieldNo : Integer; Var Buffer : TValueBuffer): Boolean; overload;{$IFNDEF FPC}override;{$ENDIF} - + {$IFDEF FPC} + Function GetFieldData (Field : TField; + Buffer : Pointer; + NativeFormat : Boolean): Boolean; Overload; Override; + {$ENDIF} Procedure DoBeforeApply (ADataset : TDataset; RowsPending : Integer); Procedure DoAfterApply (ADataset : TDataset; @@ -853,6 +846,24 @@ TDoubleLinkedBufIndex = class(TRESTDWIndex) Property OnNewRecord; Property OnPostError; End; + TBlobStream = class(TMemoryStream) + private + FFieldIndex: Integer; + FRecNo: Integer; + FDataSet: TRESTDWMemtable; + public + destructor Destroy; Override; + end; + TStreamField = Class(TBlobField) + Private + FStream : TStream; + Function GetAsStream : TStream; + Public + Constructor Create(AOwner : TComponent); Override; + Destructor Destroy; Override; + Procedure Put; + Property Value : TStream Read GetAsStream; + End; TRESTDWMTMemBlobStream = Class(TStream) Private FField : TBlobField; @@ -989,9 +1000,12 @@ TDoubleLinkedBufIndex = class(TRESTDWIndex) vPrecision : Integer; Procedure SetAsExtended(Const AValue : Extended); Protected - Function GetAsString : String; Override; + Function GetAsString : String; Override; Procedure SetAsString (Const AValue : String); Override; - Function GetAsFloat : Double; Override; + Procedure SetAsFloat (AValue: Double); Override; + Function GetAsFloat : Double; Override; + Procedure SetVarValue (Const AValue : Variant); Override; + Function GetAsVariant : Variant; Override; Public Constructor Create(AOwner: TComponent); override; Published @@ -1000,29 +1014,30 @@ TDoubleLinkedBufIndex = class(TRESTDWIndex) End; {$ENDIF} {$IFNDEF FPC} - TRESTDWSQLTimeStampOffsetField = Class(TSQLTimeStampField) - Protected - {$IF CompilerVersion < 25} - Procedure GetText (Var Text : String; - DisplayText : Boolean); Override; - {$IFEND} - {$IFDEF FPC} - Procedure SetAsString(const Value: string); override; - {$ELSE} + TRESTDWSQLTimeStampOffsetField = Class(TSQLTimeStampField) + Protected + {$IF CompilerVersion < 25} + Procedure GetText (Var Text : String; + DisplayText : Boolean); Override; + {$IFEND} + {$IFDEF FPC} + Procedure SetAsString(const Value: string); override; + {$ELSE} {$IF CompilerVersion < 25} - Procedure SetAsString(const Value: string); override; + Procedure SetAsString(const Value: string); override; {$ELSE} - Procedure SetAsString(Const AValue : String); Override; + Procedure SetAsString(Const AValue : String); Override; {$IFEND} - {$ENDIF} - Public - Constructor Create(AOwner: TComponent); override; - End; + {$ENDIF} + Public + Constructor Create(AOwner: TComponent); override; + End; {$ENDIF} Type TStringFieldRESTDW = Class(TStringField) Protected - Function CopyToNull(aValue : String) : String; + Function CopyToNull(aValue : String) : String;Overload; + Function CopyToNull(aValue : TRESTDWBytes) : TRESTDWBytes;Overload; Function GetAsString : String; Override; {$IFNDEF FPC} {$IFNDEF NEXTGEN} @@ -1032,6 +1047,7 @@ TDoubleLinkedBufIndex = class(TRESTDWIndex) Function GetValue(var aValue: String): Boolean; {$ENDIF !NEXTGEN} {$ELSE} + Function GetAsAnsiString : AnsiString; override; Function GetValue(var aValue: String): Boolean; {$ENDIF} Function GetAsVariant : Variant; Override; @@ -1087,8 +1103,8 @@ TDoubleLinkedBufIndex = class(TRESTDWIndex) {$IFNDEF FPC}TArrayField,{ ftArray }{$ELSE}Nil,{$ENDIF} {$IFNDEF FPC}TReferenceField,{ ftReference }{$ELSE}Nil,{$ENDIF} {$IFNDEF FPC}TDataSetField,{ ftDataSet }{$ELSE}Nil,{$ENDIF} - TBlobField, { ftOraBlob } - TMemoField, { ftOraClob } + TStreamField, //TBlobField, { ftOraBlob } + TStreamField, //TMemoField, { ftOraClob } TVariantField, { ftVariant } {$IFNDEF FPC}TInterfaceField,{ ftInterface }{$ELSE}Nil,{$ENDIF} {$IFNDEF FPC}TIDispatchField,{ ftIDispatch }{$ELSE}Nil,{$ENDIF} @@ -1099,7 +1115,7 @@ TDoubleLinkedBufIndex = class(TRESTDWIndex) {$IFNDEF FPC} {$IFDEF DELPHI2010UP}, TWideStringField, { ftFixedWideChar } - TWideMemoField, { ftWideMemo } + TStreamField, //TWideMemoField, { ftWideMemo } TSQLTimeStampField, { ftOraTimeStamp } TStringFieldRESTDW { ftOraInterval } {$ENDIF} @@ -1114,10 +1130,10 @@ TDoubleLinkedBufIndex = class(TRESTDWIndex) TRESTDWNumericField, nil, { ftConnection } nil, { ftParams } - TBlobField { ftStream } + TStreamField //TBlobField { ftStream } {$ENDIF} {$ELSE}, - TBlobField { ftStream } + TStreamField //TBlobField { ftStream } {$ENDIF} {$IFDEF DELPHIXE2UP}, TSQLTimeStampOffsetField, { ftTimeStampOffset } @@ -1227,12 +1243,10 @@ TMemBookmarkInfo = record Result := Size; vDWFieldType := FieldTypeToDWFieldType(FieldType); //Gledston - Alterei a partir deste ponto Case vDWFieldType of - {$IFNDEF FPC} dwftString : Begin // Inc(Result, Size); //2 Bytes de Boolean Exit; End; - {$ENDIF} dwftSmallint : Result := SizeOf(Smallint); dwftInteger : Result := SizeOf(Integer); dwftWord : Result := SizeOf(Word); @@ -1442,12 +1456,6 @@ TMemBookmarkInfo = record // Result := _RealSupportManager._VarFromReal(GetAsExtended); End; -Function TRESTDWNumericField.GetAsVariant : Variant; -Begin - Result := GetAsExtended; -// Result := _RealSupportManager._VarFromReal(GetAsExtended); -End; - Procedure TRESTDWNumericField.SetAsExtended(Const AValue : Extended); Var pData : TRESTDWMTValueBuffer; @@ -1546,22 +1554,29 @@ TMemBookmarkInfo = record End; End; -Procedure TRESTDWNumericField.SetAsFloat (AValue: Double); +{$ELSE} +Function TRESTDWNumericField.GetAsVariant : Variant; Begin - SetAsExtended(AValue); + Result := Extended(Value);//_RealSupportManager._VarFromReal(Value); +End; +{$IFEND} +{$ENDIF} + +Function TRESTDWNumericField.GetAsVariant : Variant; +Begin + Result := {$IFDEF FPC}GetAsFloat{$ELSE}GetAsExtended{$ENDIF}; End; Procedure TRESTDWNumericField.SetVarValue(Const AValue : Variant); Begin SetAsExtended(AValue); End; -{$ELSE} -Function TRESTDWNumericField.GetAsVariant : Variant; + +Procedure TRESTDWNumericField.SetAsFloat (AValue: Double); Begin - Result := Extended(Value);//_RealSupportManager._VarFromReal(Value); + SetAsExtended(AValue); End; -{$IFEND} -{$ENDIF} + Constructor TRESTDWNumericField.Create(AOwner: TComponent); Begin Inherited; @@ -1574,21 +1589,19 @@ TMemBookmarkInfo = record vPrecision := 8; End; -{$IFNDEF FPC} Function TStringfieldRESTDW.GetAsAnsiString : AnsiString; Var Data : TValueBuffer; Begin {$IFNDEF FPC} SetLength(Data, Size); - {$ENDIF} - If GetData({$IFDEF FPC}Pointer(@{$ENDIF}Data{$IFDEF FPC}){$ENDIF}, True) then + If GetData(Data, True) then Result := BytesToString(TRESTDWBytes(Data)); - {$IFNDEF FPC} SetLength(Data, 0); + {$ELSE} + Result := GetAsString; {$ENDIF} End; -{$ENDIF} Function TStringfieldRESTDW.GetAsVariant : Variant; Begin @@ -1614,6 +1627,23 @@ TMemBookmarkInfo = record End; End; +Function TStringfieldRESTDW.CopyToNull(aValue : TRESTDWBytes) : TRESTDWBytes; +Var + I : Integer; +Begin + SetLength(Result, 0); + For I := 0 To Length(aValue) - 1 Do + Begin + If aValue[I] <> 0 Then + Begin + SetLength(Result, Length(Result) +1); + Result[I] := aValue[I]; + End + Else + Break; + End; +End; + Function TStringfieldRESTDW.CopyToNull(aValue : String) : String; Var I : Integer; @@ -1627,22 +1657,28 @@ TMemBookmarkInfo = record End; Function TStringfieldRESTDW.GetAsString : String; -{$IFNDEF FPC} Var - Data : TValueBuffer; -{$ENDIF} + aData, + bData : TRESTDWBytes; Begin - {$IFNDEF FPC} - SetLength(Data, Size); - If GetData(Data, True) then - Result := CopyToNull(BytesToString(TRESTDWBytes(Data))); - SetLength(Data, 0); - {$ELSE} - Result := GetAsAnsiString; - {$ENDIF} + Try + SetLength(aData, Size); + If TRESTDWMemtable(Dataset).InternalGetFieldData(Self, TRESTDWMTValueBuffer(aData), Size) then + Begin + bData := CopyToNull(aData); + Result := BytesToString(bData); + SetLength(bData, 0); + End; + SetLength(aData, 0); + Finally + End; End; Procedure TStringfieldRESTDW.SetAsAnsiString(const AValue: AnsiString); +Var + pData : TRESTDWBytes; + X : String; + I : Integer; Begin {$IFNDEF FPC} {$IF Defined(HAS_FMX)} @@ -1655,7 +1691,14 @@ TMemBookmarkInfo = record SetData(@AValue, True); {$IFEND} {$ELSE} - Inherited SetAsAnsiString(AValue); + Inherited SetAsString(AValue); +{ + SetLength(pData, Size); + x := aValue; + I := Length(X); + Move(Pointer(@x)^, pData[0], I); + TRESTDWMemtable(Dataset).InternalSetFieldData(Self, @pData, TRESTDWMTValueBuffer(Pointer(@pData)^)); +} {$ENDIF} End; @@ -1808,27 +1851,29 @@ TMemBookmarkInfo = record Function TRESTDWMTMemoryRecord.GetIndex: Integer; Begin - // If FMemoryData <> nil then - // Result := FMemoryData.FRecords.IndexOf(Self) - // Else +// If FMemoryData <> Nil then +// Result := FMemoryData.FRecords.IndexOf(Self) +// Else Result := FIndex; End; Procedure TRESTDWMTMemoryRecord.SetMemoryData(Value: TRESTDWMemTable; UpdateParent: Boolean); var - I: Integer; - DataSize: Integer; + I, DataSize: Integer; Begin If FMemoryData <> Value then Begin -// If Value <> Nil then -// FMemoryData := Value; If FMemoryData <> nil then Begin If FMemoryData.BlobFieldCount > 0 Then - Finalize(FBlobs[0], FMemoryData.BlobFieldCount); + Begin +// {$IFDEF FPC} + SetLength(FBlobs, 0); //Finalize(FBlobs, FMemoryData.BlobFieldCount); +// {$ELSE} +// Finalize(FBlobs); +// {$ENDIF} + End; FMemoryData.FRecords.Remove(Self); - SetLength(FBlobs, 0); {$IFDEF FPC} ReallocMem(FData, 0); {$ELSE} @@ -1907,7 +1952,7 @@ constructor TRESTDWMemTable.Create(AOwner: TComponent); FFetch := False; End; -destructor TRESTDWMemTable.Destroy; +Destructor TRESTDWMemTable.Destroy; var I : Integer; PFValues : TPVariant; @@ -2278,13 +2323,7 @@ function TRESTDWMemTable.FindFieldData(Buffer: Pointer; Field: TField): Pointer; {$ENDIF} End Else - Begin - {$IFDEF FPC} - Result := Pointer(PRESTDWMTMemBuffer(Buffer + FOffsets[Index])); - {$ELSE} - Result := Pointer(PRESTDWMTMemBuffer(Buffer) + FOffsets[Index]); - {$ENDIF} - End; + Result := Pointer(PRESTDWMTMemBuffer(Buffer) + FOffsets[Index]); End; End; @@ -2690,6 +2729,9 @@ function TRESTDWMemTable.GetRecordSize: Word; RecBuf := PRESTDWMTMemBuffer(TempBuffer);//PRESTDWMTMemBuffer(ActiveBuffer);//PRESTDWMTMemBuffer(CalcBuffer); dsFilter: RecBuf := PRESTDWMTMemBuffer(TempBuffer); + {$IFDEF FPC} + dsBlockRead : RecBuf := PRESTDWMTMemBuffer(ActiveBuffer); + {$ENDIF} Else RecBuf := nil; End; @@ -2795,7 +2837,7 @@ function TRESTDWMemTable.GetRecordSize: Word; {$IF CompilerVersion > 21} If Not (Field.datatype in [ftByte, ftShortint]) then Begin - Result := Not(Result); + Result := False; If Not(Result) then Begin cLen := SizeOf(Boolean); @@ -3081,19 +3123,23 @@ function TRESTDWMemTable.GetRecordSize: Word; SetLength(TRESTDWBytes(Buffer), cLen); If Not (Field.datatype in [ftBoolean]) then Result := ((Not(aNullData)) and Not(VarIsNull(Data^))); - Result := ((Not(aNullData)) and Not(VarIsNull(Data^))); If (Field.datatype In [ftAutoInc, ftLargeint, ftInteger, ftSmallint, ftFloat, ftFMTBCD, ftBCD, ftCurrency]) Then Begin vDataType := FieldTypeToDWFieldType(Field.DataType); - If Length(TRESTDWBytes(Buffer)) = 0 Then - SetLength(TRESTDWBytes(Buffer), cLen); If vDataType = dwftBCD Then Begin Move(aDataBytes[1], Pointer(@vLongDouble)^, SizeOf(vLongDouble)); cLen := SizeOf(vLongDouble); Move(Pointer(@vLongDouble)^, Pointer(Buffer)^, cLen); End + Else If vDataType = 45 Then + Begin + If Length(TRESTDWBytes(Buffer)) = 0 Then + SetLength(TRESTDWBytes(Pointer(@Buffer)^), SizeOf(DwLongDouble)); + Move(aDataBytes[1], vLongDouble, SizeOf(vLongDouble)); + Move(vLongDouble, Pointer(Buffer)^, cLen-1); + End Else Move(aDataBytes[1], Pointer(Buffer)^, cLen-1); End @@ -3104,6 +3150,11 @@ function TRESTDWMemTable.GetRecordSize: Word; SetLength(TRESTDWBytes(Buffer), cLen); cLen := SizeOf(TDateTimeRec); Move(aDataBytes[1], Pointer(@vDouble)^, SizeOf(DWDouble)); + vDataType := FieldTypeToDWFieldType(Field.DataType); + //Em Lazarus é assim + Move(Pointer(@vDouble)^, Pointer(Buffer)^, cLen); + { + //Em Delphi eh diferente Case Field.datatype Of ftTime : Begin vDateTimeRec.Time := DateTimeToTimeStamp(vDouble).Time; @@ -3124,16 +3175,15 @@ function TRESTDWMemTable.GetRecordSize: Word; Move(Pointer(@vTimeStamp)^, Pointer(Buffer)^, cLen); End; End; + } End -{ - Else If Field.datatype = ftExtended Then + Else If vDataType = dwftExtended Then Begin If Length(TRESTDWBytes(Buffer)) = 0 Then SetLength(TRESTDWBytes(Pointer(@Buffer)^), SizeOf(DwLongDouble)); Move(aDataBytes[1], vLongDouble, SizeOf(vLongDouble)); Move(vLongDouble, Pointer(Buffer)^, cLen-1); End -} Else Begin If Length(TRESTDWBytes(Buffer)) = 0 Then @@ -3148,7 +3198,12 @@ function TRESTDWMemTable.GetRecordSize: Word; End; End Else - Result := False; + Begin + If (Length(TRESTDWBytes(Buffer)) = 0) And + (cLen > 0) Then + SetLength(TRESTDWBytes(Buffer), cLen); + Result := False; + End; End; End Else @@ -3301,6 +3356,7 @@ function TRESTDWMemTable.GetRecordSize: Word; If I >= 0 Then Begin Case GetFieldDef(I) of + dwftStream : Result := TStreamField; dwftExtended : Result := TRESTDWNumericField; dwftString : Result := TStringFieldRESTDW; {$IFNDEF FPC} @@ -3326,6 +3382,7 @@ function TRESTDWMemTable.GetRecordSize: Word; Buffer : Pointer {$ENDIF}): Boolean; Var + vResult : Boolean; aDataSize : Integer; aPointer : Pointer; Begin @@ -3337,24 +3394,29 @@ function TRESTDWMemTable.GetRecordSize: Word; SetLength(TRESTDWBytes(Buffer), aDataSize); {$ENDIF} aPointer := @Buffer; - Result := InternalGetFieldData(Field, TRESTDWMTValueBuffer(aPointer^)); + vResult := False; + Try + vResult := InternalGetFieldData(Field, TRESTDWMTValueBuffer(aPointer^)); + Finally + Result := vResult; + End; End; procedure TRESTDWMemTable.InternalSetFieldData(Field : TField; Buffer : Pointer; Const ValidateBuffer : TRESTDWMTValueBuffer); Var - PActualRecord : PRESTDWMTMemBuffer; - aState : TDataSetState; - Data : {$IFDEF FPC}PAnsiChar{$ELSE}PByte{$ENDIF}; - aBytes : TRESTDWBytes; - pBytes : PRESTDWBytes; - VarData : Variant; + PActualRecord : PRESTDWMTMemBuffer; + aState : TDataSetState; + Data : {$IFDEF FPC}PAnsiChar{$ELSE}PByte{$ENDIF}; + aBytes : TRESTDWBytes; + pBytes : PRESTDWBytes; + VarData : Variant; aResult, vBoolean, - IsData : Boolean; + IsData : Boolean; aIndex, - cLen : Integer; + cLen : Integer; vDateTimeInt : DWInteger; vDateFloat : DWFloat; vDateLongDouble : DWLongDouble; @@ -3446,19 +3508,13 @@ procedure TRESTDWMemTable.InternalSetFieldData(Field : TField; dwftFixedWideChar, dwftFixedChar, dwftString : Begin -// SetLength(String(Pointer(@Data)^), cLen); {$IFDEF FPC} FillChar(Data^, cLen, #0); {$ELSE} FillChar(Data^, cLen, 0); {$ENDIF} - // cLen := Length(String(buffer^)); -// If Length(String(Pointer(@Buffer)^)) > 0 Then -// Move(buffer^, data^, cLen) If Length(TRESTDWBytes(ValidateBuffer)) > 0 Then Move(TRESTDWBytes(ValidateBuffer)[0], data^, cLen); -// Move(Pointer(@ValidateBuffer)^, data^, cLen); -// PChar(data)^ := PChar(buffer)^; End; dwftWord, dwftAutoInc, @@ -3617,7 +3673,7 @@ function TRESTDWMemTable.GetBlob(aRecNo, Index: Integer): PMemBlobData; If Length(fblobs) > Index Then Result := @fblobs[Index]; End - Else + Else If Length(fblobs) > Index Then Result := @fblobs[Index]; End; @@ -3638,26 +3694,26 @@ function TRESTDWMemTable.GetBlob(aRecNo, Index: Integer): PMemBlobData; {$IFEND} {$ELSE} If Length(TRESTDWBytes(Buffer)) > 0 Then - InternalSetFieldData(Field, {$IFDEF RTL240_UP}PByte(@Buffer[0]){$ELSE}Buffer{$ENDIF RTL240_UP}, Buffer) + InternalSetFieldData(Field, Buffer, TRESTDWMTValueBuffer(Pointer(@Buffer)^)) Else - InternalSetFieldData(Field, {$IFDEF RTL240_UP}PByte(@Buffer){$ELSE}Buffer{$ENDIF RTL240_UP}, Buffer); + InternalSetFieldData(Field, Buffer, Buffer); {$ENDIF} End; + {$IFNDEF NEXTGEN} {$IFDEF RTL240_UP} - Procedure TRESTDWMemTable.SetFieldData(Field: TField; Buffer: Pointer); var ValidateBuffer: TRESTDWMTValueBuffer; Begin - If (Buffer <> nil) and (Field.FieldNo > 0) and (Field.DataSize > 0) then + If (Buffer <> nil) and (Field.FieldNo > 0) and (Field.DataSize > 0) then Begin - SetLength(ValidateBuffer, Field.DataSize); - Move(Buffer^, ValidateBuffer[0], Field.DataSize); + SetLength(ValidateBuffer, Field.DataSize); + Move(Buffer^, ValidateBuffer[0], Length(TValueBuffer(Buffer))); //;Field.DataSize); End - Else - ValidateBuffer := nil; - InternalSetFieldData(Field, Buffer, ValidateBuffer); + Else + ValidateBuffer := nil; + InternalSetFieldData(Field, Buffer, ValidateBuffer); End; {$ENDIF RTL240_UP} {$ENDIF ~NEXTGEN} @@ -3752,8 +3808,9 @@ function TRESTDWMemTable.GetBlobData(Field: TField; Buffer: PRESTDWMTMemBuffer Result := FBlobs[Field.Offset]; End; -procedure TRESTDWMemTable.SetBlobData(Field: TField; - Buffer: PRESTDWMTMemBuffer; Value: TMemBlobData); +procedure TRESTDWMemTable.SetBlobData(Field : TField; + Buffer : PRESTDWMTMemBuffer; + Value : TMemBlobData); Begin If Buffer = PRESTDWMTMemBuffer(ActiveBuffer) then Begin @@ -3792,16 +3849,18 @@ function TRESTDWMemTable.CreateBlobStream(Field: TField; Mode: TBlobStreamMode): Result := TRESTDWMTMemBlobStream.Create(Field as TBlobField, Mode); End; -function TRESTDWMemTable.BookmarkValid(aBookmark: TBookmark): Boolean; +Function TRESTDWMemTable.BookmarkValid(aBookmark: TBookmark): Boolean; Begin - Result := (aBookmark <> nil) and FActive and - (FindRecordID({$IFDEF FPC}NativeInt(@aBookmark[0]){$ELSE}TRESTDWMTBookmarkData - ({$IFDEF RTL200_UP}Pointer(@aBookmark[0] - ){$ELSE}aBookmark{$ENDIF RTL200_UP}^){$ENDIF}) <> nil); + Result := (aBookmark <> Nil) And + (FActive) And + (FindRecordID({$IFDEF FPC}NativeInt(@aBookmark[0]) + {$ELSE}TRESTDWMTBookmarkData({$IFDEF RTL200_UP}Pointer(@aBookmark[0]) + {$ELSE}aBookmark + {$ENDIF RTL200_UP}^) + {$ENDIF}) <> Nil); End; -function TRESTDWMemTable.CompareBookmarks(aBookmark1, aBookmark2: TBookmark - ): Integer; +Function TRESTDWMemTable.CompareBookmarks(aBookmark1, aBookmark2: TBookmark): Integer; Begin If (aBookmark1 = nil) and (aBookmark2 = nil) then Result := 0 @@ -5736,9 +5795,11 @@ procedure TRESTDWMemTable.AssignMemoryRecord(Rec : TRESTDWMTMemoryRecord; I : Integer; Begin Move(Buffer^, Rec.Data^, FRecordSize); - For I := 0 to BlobFieldCount - 1 do + For I := 0 to BlobFieldCount - 1 Do + Begin If Assigned(FBlobs[I]) Then Rec.FBlobs[I] := FBlobs[I]; + End; End; procedure TRESTDWMemTable.SetMemoryRecordData(Buffer : PRESTDWMTMemBuffer; @@ -6017,6 +6078,11 @@ procedure TRESTDWMemTable.InternalOpen; Field := TStringFieldRESTDW.Create(Self); Field.Size := FieldDefs[I].Size; End + Else If FieldDefs[I].DataType in [{$IFNDEF FPC}ftStream, {$ENDIF}ftBlob, ftMemo, ftWideMemo] Then + Begin + Field := TStreamField.Create(Self); +// Field.Size := FieldDefs[I].Size; + End Else Begin {$IFNDEF FPC} @@ -7166,11 +7232,20 @@ constructor TRESTDWIndex.Create(const ADataset: TRESTDWMemtable); FDataset := ADataset; End; +{$IFDEF FPC} +Function TRESTDWMemTable.GetFieldData(Field : TField; + Buffer : Pointer; + NativeFormat : Boolean): Boolean; +Begin + Result := InternalGetFieldData(Field, TRESTDWMTValueBuffer(Buffer)); +End; +{$ENDIF} + Function TRESTDWMemTable.GetFieldData(FieldNo : Integer; Var Buffer : TValueBuffer): Boolean; Begin {$IFDEF FPC} - Inherited GetFieldData(Fields[FieldNo], Pointer(@Buffer)); + Result := InternalGetFieldData(Fields[FieldNo], TRESTDWMTValueBuffer(Buffer)); //Inherited GetFieldData(Fields[FieldNo], Pointer(@Buffer)); {$ELSE} Inherited GetFieldData(FieldNo, Buffer); {$ENDIF} @@ -7769,6 +7844,84 @@ destructor TRESTDWMTMemBlobStream.Destroy; End; End; +Destructor TBlobStream.Destroy; +begin +// If Assigned(FDataSet) Then +// FDataSet.SetBlobStream(Self); + Inherited Destroy; +end; + +Constructor TStreamField.Create(AOwner: TComponent); +Begin + Inherited Create(AOwner); + FStream := TBlobStream.Create; + TBlobStream(FStream).FDataSet := TRESTDWMemtable(AOwner); +End; + +Destructor TStreamField.Destroy; +Begin + TBlobStream(FStream).FDataSet := Nil; + FStream.Free; + Inherited Destroy; +End; + +Procedure TStreamField.Put; +Var + Field : TField; +Begin + If Not DataSet.IsEmpty Then + Begin + With (DataSet as TRESTDWMemtable), TBlobStream(FStream) do + Begin + Field := DataSet.FindField(FieldName); + FFieldIndex := Field.Offset; + FRecNo := RecNo; +// SetBlobStream(FStream); + End; + End; +End; + +Function TStreamField.GetAsStream: TStream; +Var + aBytes : TRESTDWBytes; + Field : TField; + {$IFDEF FPC} + vStream : TStream; + {$ENDIF} +begin + If Not DataSet.IsEmpty then + Begin + Result := FStream; + With (DataSet as TRESTDWMemTable), TBlobStream(FStream) do + Begin + Clear; + Field := DataSet.FindField(FieldName); + FFieldIndex := Field.Offset; + FRecNo := RecNo; + {$IFDEF FPC} + vStream := DataSet.CreateBlobStream(Field, bmRead); + If Assigned(vStream) Then + Begin + vStream.Position := 0; + SetLength(aBytes, vStream.Size); + vStream.Read(aBytes, Length(aBytes)); + vStream.Free; + End; + {$ELSE} + DataSet.GetBlobFieldData(Field.Offset, TBlobByteData(aBytes)); + {$ENDIF} + If Not Assigned(Result) Then + Result := TBlobStream.Create; + TBlobStream(Result).Clear; + If Length(aBytes) > 0 Then + TBlobStream(Result).Write(aBytes, Length(aBytes)); + End; + Result.Position := 0; + End + Else + Result := nil; +end; + { TRESTDWStorageBase } constructor TRESTDWStorageBase.Create(AOwner: TComponent); @@ -7828,9 +7981,10 @@ constructor TRESTDWStorageBase.Create(AOwner: TComponent); Begin If Assigned(TRESTDWMTMemoryRecord(TList(Self).Items[Index]^)) Then Begin - vItem := @TRESTDWMTMemoryRecord(TList(Self).Items[Index]^); + vItem := TList(Self).Items[Index]; vItem^.Free; Dispose(vItem); + vItem := Nil; End; End; Except diff --git a/CORE/Source/utils/uRESTDWMassiveBuffer.pas b/CORE/Source/utils/uRESTDWMassiveBuffer.pas index db78f121..6847600f 100644 --- a/CORE/Source/utils/uRESTDWMassiveBuffer.pas +++ b/CORE/Source/utils/uRESTDWMassiveBuffer.pas @@ -98,6 +98,7 @@ interface Property Items[Index : Integer] : TMassiveValue Read GetRec Write PutRec; Default; End; + PMassiveField = ^TMassiveField; TMassiveField = Class(TObject) Private vMassiveFields : TList; @@ -116,7 +117,8 @@ interface Function GetOldValue : Variant; Procedure SetValue(Value : Variant); Function GetModified : Boolean; - Procedure SetFieldType(Value : TObjectValue); + Procedure SetFieldType (Value : TObjectValue); + Procedure SetAutoGenerateValue(Value : Boolean); Protected Public Constructor Create(MassiveFields : TList; FieldIndex : Integer); @@ -125,7 +127,7 @@ interface Procedure LoadFromStream(Stream : TMemoryStream); Procedure SaveToStream (var Stream : TMemoryStream); Property Required : Boolean Read vRequired Write vRequired; - Property AutoGenerateValue : Boolean Read vAutoGenerateValue Write vAutoGenerateValue; + Property AutoGenerateValue : Boolean Read vAutoGenerateValue Write SetAutoGenerateValue; Property KeyField : Boolean Read vKeyField Write vKeyField; Property ReadOnly : Boolean Read vReadOnly Write vReadOnly; Property FieldType : TObjectValue Read vFieldType Write SetFieldType; @@ -137,7 +139,6 @@ interface Property Modified : Boolean Read GetModified; End; - PMassiveField = ^TMassiveField; TMassiveFields = Class(TList) Private vMassiveDataset : TMassiveDataset; @@ -151,7 +152,8 @@ interface Procedure Delete(Index : Integer); Overload; Procedure Delete(FieldName : String); Overload; Function Add (Item : TMassiveField) : Integer; Overload; - Function FieldByName(FieldName : String) : TMassiveField; + Function FieldByName (FieldName : String) : TMassiveField; Overload; + Function FieldByNameP(FieldName : String) : PMassiveField; Overload; Property Items[Index : Integer] : TMassiveField Read GetRec Write PutRec; Default; End; @@ -552,6 +554,11 @@ implementation End; End; +Procedure TMassiveField.SetAutoGenerateValue(Value : Boolean); +Begin + vAutoGenerateValue := Value; +End; + Procedure TMassiveField.SaveToStream(var Stream: TMemoryStream); Var vRecNo : Integer; @@ -724,7 +731,7 @@ implementation Inherited; End; -Function TMassiveFields.FieldByName(FieldName : String): TMassiveField; +Function TMassiveFields.FieldByName(FieldName : String) : TMassiveField; Var I : Integer; vFieldName, @@ -764,6 +771,46 @@ implementation End; End; +Function TMassiveFields.FieldByNameP(FieldName : String) : PMassiveField; +Var + I : Integer; + vFieldName, + vFieldNameB : String; + vResult : Boolean; + Function StrCompField(A, B : String) : Boolean; + Var + I, X : Integer; + Begin + Result := Length(A) > 0; + X := 0; + For I := 1 To Length(A) Do + Begin + Result := I <= Length(B); + If Result Then + Begin + Result := A[I] = B[X]; + If Not Result Then + Break; + End + Else + Break; + End; + End; +Begin + Result := Nil; + vFieldNameB := UpperCase(Trim(FieldName)); + For I := 0 To Self.Count -1 Do + Begin + vFieldName := UpperCase(Trim(Items[I].vFieldName)); + vResult := vFieldName = vFieldNameB; + If vResult Then + Begin + Result := TList(Self).Items[I]; + Break; + End; + End; +End; + Function TMassiveFields.GetRec(Index : Integer) : TMassiveField; Begin Result := Nil; @@ -1710,8 +1757,9 @@ implementation Procedure TMassiveDatasetBuffer.MassiveCheck(Dataset : TRESTDWClientSQLBase); Var - I : Integer; - MassiveField : TMassiveField; + I : Integer; + MassiveField : PMassiveField; + vAutoGenerateValue : Boolean; Begin vMasterCompTag := ''; vMyCompTag := Dataset.Componenttag; @@ -1740,26 +1788,28 @@ implementation (vReflectChanges And ((Dataset.Fields[I].ReadOnly) Or (Not(Dataset.Fields[I].ProviderFlags = [])))) Then Begin - MassiveField := vMassiveFields.FieldByName(Dataset.Fields[I].FieldName); - If MassiveField = Nil Then + MassiveField := vMassiveFields.FieldByNameP(Dataset.Fields[I].FieldName); + If MassiveField^ = Nil Then Begin - MassiveField := TMassiveField.Create(vMassiveFields, vMassiveFields.Count); - vMassiveFields.Add(MassiveField); + New(MassiveField); + MassiveField^ := TMassiveField.Create(vMassiveFields, vMassiveFields.Count); + vMassiveFields.Add(MassiveField^); End; - MassiveField.vReadOnly := Dataset.Fields[I].ReadOnly; - MassiveField.vRequired := Dataset.Fields[I].Required; - MassiveField.vKeyField := pfInKey in Dataset.Fields[I].ProviderFlags; - MassiveField.vFieldName := Dataset.Fields[I].FieldName; - MassiveField.vFieldType := FieldTypeToObjectValue(Dataset.Fields[I].DataType); - MassiveField.vSize := Dataset.Fields[I].DataSize; + MassiveField^.vReadOnly := Dataset.Fields[I].ReadOnly; + MassiveField^.vRequired := Dataset.Fields[I].Required; + MassiveField^.vKeyField := pfInKey in Dataset.Fields[I].ProviderFlags; + MassiveField^.vFieldName := Dataset.Fields[I].FieldName; + MassiveField^.vFieldType := FieldTypeToObjectValue(Dataset.Fields[I].DataType); + MassiveField^.vSize := Dataset.Fields[I].DataSize; {$IFDEF DELPHIXEUP} - MassiveField.vAutoGenerateValue := ((Dataset.Fields[I].AutoGenerateValue = arAutoInc) Or - (Lowercase(Dataset.Fields[I].FieldName) = Lowercase(vSequenceField))); - If Not (MassiveField.vAutoGenerateValue) Then - MassiveField.vAutoGenerateValue := ((Dataset.Fields[I].FieldKind = fkInternalCalc) Or + vAutoGenerateValue := ((Dataset.Fields[I].AutoGenerateValue = arAutoInc) Or (Lowercase(Dataset.Fields[I].FieldName) = Lowercase(vSequenceField))); + MassiveField^.AutoGenerateValue := vAutoGenerateValue; + If Not (MassiveField^.AutoGenerateValue) Then + MassiveField^.AutoGenerateValue := ((Dataset.Fields[I].FieldKind = fkInternalCalc) Or + (Lowercase(Dataset.Fields[I].FieldName) = Lowercase(vSequenceField))); {$ELSE} - MassiveField.vAutoGenerateValue := ((Dataset.Fields[I].FieldKind = fkInternalCalc) Or + MassiveField^.AutoGenerateValue := ((Dataset.Fields[I].FieldKind = fkInternalCalc) Or (Lowercase(Dataset.Fields[I].FieldName) = Lowercase(vSequenceField))); {$ENDIF} End @@ -1787,18 +1837,19 @@ implementation If vMassiveFields.Count > 0 Then Begin vMassiveLine.vMassiveMode := mmBrowse; - MassiveField := vMassiveFields.FieldByName(RESTDWFieldBookmark); + MassiveField := vMassiveFields.FieldByNameP(RESTDWFieldBookmark); If MassiveField = Nil Then Begin - MassiveField := TMassiveField.Create(vMassiveFields, vMassiveFields.Count); + New(MassiveField); + MassiveField^ := TMassiveField.Create(vMassiveFields, vMassiveFields.Count); vMassiveFields.Add(MassiveField); End; - MassiveField.vRequired := False; - MassiveField.vKeyField := False; - MassiveField.vFieldName := RESTDWFieldBookmark; - MassiveField.vFieldType := ovString; - MassiveField.vSize := 60; - MassiveField.vAutoGenerateValue := True; + MassiveField^.vRequired := False; + MassiveField^.vKeyField := False; + MassiveField^.vFieldName := RESTDWFieldBookmark; + MassiveField^.vFieldType := ovString; + MassiveField^.vSize := 60; + MassiveField^.vAutoGenerateValue := True; End; End; If Dataset Is TRESTDWClientSQL Then