Merge branch 'release/1.2.0'

appercept · Jul 23, 2020 · 5d754b0 · 5d754b0
2 parents 15c6d3f + a3c16ec
commit 5d754b0
Show file tree

Hide file tree

Showing 6 changed files with 114 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## [1.2.0](https://github.com/appercept/Delphi-WebMocks/tree/1.2.0) (2020-07-24)
+
+[Full Changelog](https://github.com/appercept/Delphi-WebMocks/compare/1.1.0...1.2.0)
+
+**Implemented enhancements:**
+
+- Add Delphinus support [\#26](https://github.com/appercept/Delphi-WebMocks/pull/26) ([rhatherall](https://github.com/rhatherall))
+
+**Fixed bugs:**
+
+- Project is not showing in Delphinus [\#27](https://github.com/appercept/Delphi-WebMocks/issues/27)
+
+**Closed issues:**
+
+- Delphinus support would be good [\#25](https://github.com/appercept/Delphi-WebMocks/issues/25)
+- Delphi 10.4 Sydney has been released [\#24](https://github.com/appercept/Delphi-WebMocks/issues/24)
+
 ## [1.1.0](https://github.com/appercept/Delphi-WebMocks/tree/1.1.0) (2020-02-16)
 
 [Full Changelog](https://github.com/appercept/Delphi-WebMocks/compare/1.0.1...1.1.0)

diff --git a/Delphinus.Info.json b/Delphinus.Info.json
@@ -0,0 +1,11 @@
+{
+  "id": "{DFCA358E-5EF2-44CF-BE16-72B3634DC147}",
+  "name": "WebMocks",
+  "licenses": [{ "type": "Apache 2.0", "file": "LICENSE" }],
+  "platforms": "Win32;Win64",
+  "package_compiler_min": 29,
+  "package_compiler_max": 34,
+  "compiler_min": 29,
+  "compiler_max": 34,
+  "dependencies": []
+}
diff --git a/Delphinus.Install.json b/Delphinus.Install.json
@@ -0,0 +1,8 @@
+{
+  "search_pathes": [
+    { "pathes": ".", "platforms": "Win32;Win64" }
+  ],
+  "source_folders": [
+    { "folder": ".", "recursive": false, "filter": "*.pas" }
+  ]
+}
diff --git a/README.md b/README.md
@@ -7,17 +7,29 @@ Library for stubbing and setting expectations on HTTP requests in Delphi with
 * [DUnitX](https://github.com/VSoftTechnologies/DUnitX)
 * [Indy](https://www.indyproject.org)
 
-\* Delphi-WebMocks was developed in Delphi 10.3 (Rio) and has been reported
-working on 10.1 (Berlin). I'd be interested to hear from anyone working on other
-versions. As Delphi-WebMocks makes use of the `System.Net` library introduced
-with XE8 it will not be compatible with earlier versions.
+\* Delphi-WebMocks was developed in Delphi 10.3 (Rio) and 10.4 (Sydney) and has
+been reported working on 10.1 (Berlin). I'd be interested to hear from anyone
+working on other versions. As Delphi-WebMocks makes use of the `System.Net
+library introduced with XE8 it will not be compatible with earlier versions.
 
 ## Optional Dependencies
 * [TestInsight](https://bitbucket.org/sglienke/testinsight/wiki/Home) is
   required to run the Delphi-WebMocks test suite, so, if you're considering
   contributing and need to run the test suite, install it. If you do TDD in
   Delphi I would recommend installing and using it in your own projects.
 
+## Installation: Delphinus-Support
+WebMocks should now be listed in
+[Delphinus](https://github.com/Memnarch/Delphinus) package manager.
+
+## Installation: Manual
+WebMocks is a source only library. You do not need to compile any packages.
+Steps:
+1. Download and extract the latest version
+   [1.2.0](https://github.com/appercept/Delphi-WebMocks/archive/1.2.0.zip).
+2. Add the extracted folder to Delphi's "Library path" under "Tools >
+   Options... > Language > Delphi > Library".
+
 ## Setup
 In your test unit file a couple of simple steps are required.
 1. Add `Delphi.WebMock` to your interface `uses`.

diff --git a/Tests/Delphi.WebMocks.Tests.dproj b/Tests/Delphi.WebMocks.Tests.dproj
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{04081825-8AE9-4D09-A947-7FE0B62D328A}</ProjectGuid>
-        <ProjectVersion>18.8</ProjectVersion>
+        <ProjectVersion>19.0</ProjectVersion>
         <FrameworkType>None</FrameworkType>
         <MainSource>Delphi.WebMocks.Tests.dpr</MainSource>
         <Base>True</Base>
@@ -13,11 +13,6 @@
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
     </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Base)'=='true') or '$(Base_iOSDevice32)'!=''">
-        <Base_iOSDevice32>true</Base_iOSDevice32>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''">
         <Base_iOSDevice64>true</Base_iOSDevice64>
         <CfgParent>Base</CfgParent>
@@ -69,9 +64,6 @@
         <SanitizedProjectName>Delphi_WebMocks_Tests</SanitizedProjectName>
         <DCC_Define>TESTINSIGHT;$(DCC_Define)</DCC_Define>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_iOSDevice32)'!=''">
-        <DCC_UsePackage>DBXSqliteDriver;RESTComponents;fmxase;DBXInterBaseDriver;emsclientfiredac;tethering;DataSnapFireDAC;bindcompfmx;fmx;FireDACIBDriver;FireDACDBXDriver;dbexpress;IndyCore;dsnap;emsclient;DataSnapCommon;FireDACCommon;RESTBackendComponents;soapserver;bindengine;CloudService;FireDACCommonDriver;DataSnapClient;inet;IndyIPCommon;bindcompdbx;IndyIPServer;IndySystem;fmxFireDAC;FireDAC;FireDACSqliteDriver;soaprtl;DbxCommonDriver;xmlrtl;soapmidas;DataSnapNativeClient;FireDACDSDriver;rtl;DbxClientDriver;CustomIPTransport;bindcomp;IndyIPClient;dbxcds;dsnapxml;DataSnapProviderClient;dbrtl;IndyProtocols;$(DCC_UsePackage)</DCC_UsePackage>
-    </PropertyGroup>
     <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''">
         <DCC_UsePackage>DBXSqliteDriver;RESTComponents;fmxase;DBXInterBaseDriver;emsclientfiredac;tethering;DataSnapFireDAC;bindcompfmx;fmx;FireDACIBDriver;FireDACDBXDriver;dbexpress;IndyCore;dsnap;emsclient;DataSnapCommon;FireDACCommon;RESTBackendComponents;soapserver;bindengine;CloudService;FireDACCommonDriver;DataSnapClient;inet;IndyIPCommon;bindcompdbx;IndyIPServer;IndySystem;fmxFireDAC;FireDAC;FireDACSqliteDriver;soaprtl;DbxCommonDriver;xmlrtl;soapmidas;DataSnapNativeClient;FireDACDSDriver;rtl;DbxClientDriver;CustomIPTransport;bindcomp;IndyIPClient;dbxcds;dsnapxml;DataSnapProviderClient;dbrtl;IndyProtocols;$(DCC_UsePackage)</DCC_UsePackage>
     </PropertyGroup>
@@ -700,6 +692,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="iPad_Launch2x">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="iPad_Launch768">
                     <Platform Name="iOSDevice32">
                         <Operation>1</Operation>
@@ -722,6 +724,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="iPad_LaunchDark2x">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="iPhone_Launch1125">
                     <Platform Name="iOSDevice32">
                         <Operation>1</Operation>
@@ -821,6 +833,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="iPhone_Launch2x">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="iPhone_Launch320">
                     <Platform Name="iOSDevice32">
                         <Operation>1</Operation>
@@ -832,6 +854,16 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="iPhone_Launch3x">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="iPhone_Launch640">
                     <Platform Name="iOSDevice32">
                         <Operation>1</Operation>
@@ -876,6 +908,26 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="iPhone_LaunchDark2x">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_LaunchDark3x">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="ProjectAndroidManifest">
                     <Platform Name="Android">
                         <Operation>1</Operation>
@@ -897,6 +949,7 @@
                 <DeployClass Name="ProjectiOSDeviceResourceRules"/>
                 <DeployClass Name="ProjectiOSEntitlements"/>
                 <DeployClass Name="ProjectiOSInfoPList"/>
+                <DeployClass Name="ProjectiOSLaunchScreen"/>
                 <DeployClass Name="ProjectiOSResource">
                     <Platform Name="iOSDevice32">
                         <Operation>1</Operation>
@@ -998,7 +1051,6 @@
                 <ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
             </Deployment>
             <Platforms>
-                <Platform value="iOSDevice32">False</Platform>
                 <Platform value="iOSDevice64">False</Platform>
                 <Platform value="iOSSimulator">False</Platform>
                 <Platform value="Win32">True</Platform>

diff --git a/Tests/Delphi.WebMocks.Tests.res b/Tests/Delphi.WebMocks.Tests.res