Skip to content

Commit 194a1bb

Browse files
rhatherallrhatherall
committed
Merge branch 'release/1.2.2'
2 parents c852ee1 + 311e85e commit 194a1bb

29 files changed

+1910
-49
lines changed

‎CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
# Changelog
22

3-
## [1.2.1](https://github.com/appercept/Delphi-WebMocks/tree/1.2.1) (2020-07-24)
3+
## [1.2.2](https://github.com/appercept/Delphi-WebMocks/tree/1.2.2) (2020-07-25)
4+
5+
[Full Changelog](https://github.com/appercept/Delphi-WebMocks/compare/1.2.1...1.2.2)
6+
7+
**Fixed bugs:**
8+
9+
- Delphinus installation needs packages [\#29](https://github.com/appercept/Delphi-WebMocks/issues/29)
10+
11+
## [1.2.1](https://github.com/appercept/Delphi-WebMocks/tree/1.2.1) (2020-07-23)
412

513
[Full Changelog](https://github.com/appercept/Delphi-WebMocks/compare/1.2.0...1.2.1)
614

‎Delphinus.Info.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"name": "WebMocks",
44
"licenses": [{ "type": "Apache 2.0", "file": "LICENSE" }],
55
"platforms": "Win32;Win64",
6-
"package_compiler_min": 29,
6+
"package_compiler_min": 33,
77
"package_compiler_max": 34,
8-
"compiler_min": 29,
8+
"compiler_min": 33,
99
"compiler_max": 34,
1010
"dependencies": []
1111
}

‎Delphinus.Install.json

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,22 @@
11
{
22
"browsing_pathes": [
3-
{ "pathes": ".", "platforms": "Win32;Win64" }
3+
{ "pathes": "Source", "platforms": "Win32;Win64" }
44
],
55
"search_pathes": [
6-
{ "pathes": ".", "platforms": "Win32;Win64" }
6+
{ "pathes": "Source", "platforms": "Win32;Win64" }
77
],
88
"source_folders": [
9-
{ "folder": ".", "recursive": false, "filter": "*.pas" }
9+
{ "folder": "Source", "recursive": false, "filter": "*.pas" },
10+
{ "folder": "Packages", "recursive": true }
11+
],
12+
"projects": [
13+
{
14+
"project": "Packages\\Delphi10Rio\\WebMocks.dproj",
15+
"compiler": 33
16+
},
17+
{
18+
"project": "Packages\\Delphi10Sydney\\WebMocks.dproj",
19+
"compiler": 34
20+
}
1021
]
1122
}

‎Packages/Delphi10Rio/WebMocks.dpk

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
package WebMocks;
2+
3+
{$R *.res}
4+
{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
5+
{$ALIGN 8}
6+
{$ASSERTIONS ON}
7+
{$BOOLEVAL OFF}
8+
{$DEBUGINFO OFF}
9+
{$EXTENDEDSYNTAX ON}
10+
{$IMPORTEDDATA ON}
11+
{$IOCHECKS ON}
12+
{$LOCALSYMBOLS ON}
13+
{$LONGSTRINGS ON}
14+
{$OPENSTRINGS ON}
15+
{$OPTIMIZATION OFF}
16+
{$OVERFLOWCHECKS OFF}
17+
{$RANGECHECKS OFF}
18+
{$REFERENCEINFO ON}
19+
{$SAFEDIVIDE OFF}
20+
{$STACKFRAMES ON}
21+
{$TYPEDADDRESS OFF}
22+
{$VARSTRINGCHECKS ON}
23+
{$WRITEABLECONST OFF}
24+
{$MINENUMSIZE 1}
25+
{$IMAGEBASE $400000}
26+
{$DEFINE DEBUG}
27+
{$ENDIF IMPLICITBUILDING}
28+
{$DESCRIPTION 'WebMocks for Delphi'}
29+
{$LIBSUFFIX '.Delphi10Rio'}
30+
{$RUNONLY}
31+
{$IMPLICITBUILD OFF}
32+
33+
requires
34+
rtl,
35+
IndySystem,
36+
IndyProtocols,
37+
IndyCore;
38+
39+
contains
40+
Delphi.WebMock.Assertion in '..\..\Source\Delphi.WebMock.Assertion.pas',
41+
Delphi.WebMock.Dynamic.RequestStub in '..\..\Source\Delphi.WebMock.Dynamic.RequestStub.pas',
42+
Delphi.WebMock.HTTP.Messages in '..\..\Source\Delphi.WebMock.HTTP.Messages.pas',
43+
Delphi.WebMock.HTTP.Request in '..\..\Source\Delphi.WebMock.HTTP.Request.pas',
44+
Delphi.WebMock.HTTP.RequestMatcher in '..\..\Source\Delphi.WebMock.HTTP.RequestMatcher.pas',
45+
Delphi.WebMock in '..\..\Source\Delphi.WebMock.pas',
46+
Delphi.WebMock.RequestStub in '..\..\Source\Delphi.WebMock.RequestStub.pas',
47+
Delphi.WebMock.Response in '..\..\Source\Delphi.WebMock.Response.pas',
48+
Delphi.WebMock.ResponseBodySource in '..\..\Source\Delphi.WebMock.ResponseBodySource.pas',
49+
Delphi.WebMock.ResponseContentFile in '..\..\Source\Delphi.WebMock.ResponseContentFile.pas',
50+
Delphi.WebMock.ResponseContentString in '..\..\Source\Delphi.WebMock.ResponseContentString.pas',
51+
Delphi.WebMock.ResponseStatus in '..\..\Source\Delphi.WebMock.ResponseStatus.pas',
52+
Delphi.WebMock.Static.RequestStub in '..\..\Source\Delphi.WebMock.Static.RequestStub.pas',
53+
Delphi.WebMock.StringAnyMatcher in '..\..\Source\Delphi.WebMock.StringAnyMatcher.pas',
54+
Delphi.WebMock.StringMatcher in '..\..\Source\Delphi.WebMock.StringMatcher.pas',
55+
Delphi.WebMock.StringRegExMatcher in '..\..\Source\Delphi.WebMock.StringRegExMatcher.pas',
56+
Delphi.WebMock.StringWildcardMatcher in '..\..\Source\Delphi.WebMock.StringWildcardMatcher.pas';
57+
58+
end.

‎Packages/Delphi10Rio/WebMocks.dproj

Lines changed: 967 additions & 0 deletions
Large diffs are not rendered by default.

‎Packages/Delphi10Rio/WebMocks.res

640 Bytes
Binary file not shown.

‎Packages/Delphi10Sydney/WebMocks.dpk

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
package WebMocks;
2+
3+
{$R *.res}
4+
{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
5+
{$ALIGN 8}
6+
{$ASSERTIONS ON}
7+
{$BOOLEVAL OFF}
8+
{$DEBUGINFO OFF}
9+
{$EXTENDEDSYNTAX ON}
10+
{$IMPORTEDDATA ON}
11+
{$IOCHECKS ON}
12+
{$LOCALSYMBOLS ON}
13+
{$LONGSTRINGS ON}
14+
{$OPENSTRINGS ON}
15+
{$OPTIMIZATION OFF}
16+
{$OVERFLOWCHECKS OFF}
17+
{$RANGECHECKS OFF}
18+
{$REFERENCEINFO ON}
19+
{$SAFEDIVIDE OFF}
20+
{$STACKFRAMES ON}
21+
{$TYPEDADDRESS OFF}
22+
{$VARSTRINGCHECKS ON}
23+
{$WRITEABLECONST OFF}
24+
{$MINENUMSIZE 1}
25+
{$IMAGEBASE $400000}
26+
{$DEFINE DEBUG}
27+
{$ENDIF IMPLICITBUILDING}
28+
{$DESCRIPTION 'WebMocks for Delphi'}
29+
{$LIBSUFFIX '.Delphi10Sydney'}
30+
{$RUNONLY}
31+
{$IMPLICITBUILD OFF}
32+
33+
requires
34+
rtl,
35+
IndySystem,
36+
IndyProtocols,
37+
IndyCore;
38+
39+
contains
40+
Delphi.WebMock.Assertion in '..\..\Source\Delphi.WebMock.Assertion.pas',
41+
Delphi.WebMock.Dynamic.RequestStub in '..\..\Source\Delphi.WebMock.Dynamic.RequestStub.pas',
42+
Delphi.WebMock.HTTP.Messages in '..\..\Source\Delphi.WebMock.HTTP.Messages.pas',
43+
Delphi.WebMock.HTTP.Request in '..\..\Source\Delphi.WebMock.HTTP.Request.pas',
44+
Delphi.WebMock.HTTP.RequestMatcher in '..\..\Source\Delphi.WebMock.HTTP.RequestMatcher.pas',
45+
Delphi.WebMock in '..\..\Source\Delphi.WebMock.pas',
46+
Delphi.WebMock.RequestStub in '..\..\Source\Delphi.WebMock.RequestStub.pas',
47+
Delphi.WebMock.Response in '..\..\Source\Delphi.WebMock.Response.pas',
48+
Delphi.WebMock.ResponseBodySource in '..\..\Source\Delphi.WebMock.ResponseBodySource.pas',
49+
Delphi.WebMock.ResponseContentFile in '..\..\Source\Delphi.WebMock.ResponseContentFile.pas',
50+
Delphi.WebMock.ResponseContentString in '..\..\Source\Delphi.WebMock.ResponseContentString.pas',
51+
Delphi.WebMock.ResponseStatus in '..\..\Source\Delphi.WebMock.ResponseStatus.pas',
52+
Delphi.WebMock.Static.RequestStub in '..\..\Source\Delphi.WebMock.Static.RequestStub.pas',
53+
Delphi.WebMock.StringAnyMatcher in '..\..\Source\Delphi.WebMock.StringAnyMatcher.pas',
54+
Delphi.WebMock.StringMatcher in '..\..\Source\Delphi.WebMock.StringMatcher.pas',
55+
Delphi.WebMock.StringRegExMatcher in '..\..\Source\Delphi.WebMock.StringRegExMatcher.pas',
56+
Delphi.WebMock.StringWildcardMatcher in '..\..\Source\Delphi.WebMock.StringWildcardMatcher.pas';
57+
58+
end.

0 commit comments

Comments
 (0)