Skip to content

Commit 02f22e6

Browse files
authored
Replace MBT with apm (#12)
1 parent 0d67204 commit 02f22e6

File tree

7 files changed

+19
-32
lines changed

7 files changed

+19
-32
lines changed

CONTRIBUTING.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Contributing to Marc Bernard Tools
1+
# Contributing to apm
22

3-
Marc Bernard Tools welcomes your suggestions and contributions! Before opening your first issue or pull request, please review our [Code of Conduct](https://github.com/Marc-Bernard-Tools/.github/blob/main/CODE_OF_CONDUCT.md) to understand how our community interacts in an inclusive and respectful manner.
3+
apm welcomes your suggestions and contributions! Before opening your first issue or pull request, please review our [Code of Conduct](CODE_OF_CONDUCT.md) to understand how our community interacts in an inclusive and respectful manner.
44

55
## General Advice
66

@@ -12,7 +12,7 @@ Marc Bernard Tools welcomes your suggestions and contributions! Before opening y
1212

1313
* Commit often, whenever something is working, and is a step in the right direction do a commit or PR. This way other contributors can see the changes, and it will minimize the risk of merge conflicts.
1414

15-
* If you don't have the time or knowledge to fix the problem yourself, you can still make it move along faster by providing an accurate description or a repo which reproduces the issue.
15+
* If you don't have the time or knowledge to fix the problem yourself, you can still make it move along faster by providing an accurate description or a repo that reproduces the issue.
1616

1717
## Bug Reports
1818

@@ -32,7 +32,7 @@ A good bug report should not leave others needing to chase you up for more infor
3232

3333
### Compatibility
3434

35-
Marc Bernard Tools are targeted for SAP Basis 7.31 and higher, so the code should only contain expressions and statements that works on 7.31. abaplint will automatically check every pull request for language syntax that is not available on these releases.
35+
apm is targeted for SAP Basis 7.40 and higher, so the code should only contain expressions and statements that work on 7.40. abaplint will automatically check every pull request for language syntax that is not available on these releases.
3636

3737
### Linting
3838

@@ -48,10 +48,10 @@ Variables are prefixed using the standard setting in [abapOpenChecks](http://doc
4848

4949
### Internationalization (I18N)
5050

51-
Currently, Marc Bernard Tools support only English language. Neither objects nor text literals are translated. Therefore, all objects shall be set to English as the original language. Text literals in the code shall be maintained in English.
51+
Currently, apm supports only the English language. Neither objects nor text literals are translated. Therefore, all objects shall be set to English as the original language. Text literals in the code shall be maintained in English.
5252

5353
## Contribution Licensing
5454

5555
Most of our code is distributed under the terms of the [license](LICENSE), and when you contribute code that you wrote to our repositories, you agree that you are contributing under those same terms. In addition, by submitting your contributions you are indicating that you have the right to submit those contributions under those terms.
5656

57-
If you wish to contribute code or documentation *authored by others*, or using the terms of any other license, please indicate that clearly in your pull request so that the project team can discuss the situation with you.
57+
If you wish to contribute code or documentation *authored by others* or use the terms of any other license, please indicate that clearly in your pull request so that the project team can discuss the situation with you.

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright 2022 apm.to Inc. <https://apm.to>
3+
Copyright 2024 apm.to Inc. <https://apm.to>
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

LICENSES/MIT.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2022 Marc Bernard <https://marcbernardtools.com/>
4-
53
Permission is hereby granted, free of charge, to any person obtaining a copy
64
of this software and associated documentation files (the "Software"), to deal
75
in the Software without restriction, including without limitation the rights

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@ Made with ❤ in Canada
4646

4747
Copyright 2025 apm.to Inc. <https://apm.to>
4848

49-
Follow [@marcf.be](https://bsky.app/profile/marcf.be) on Blueksy and [@marcfbe](https://linkedin.com/in/marcfbe) or LinkedIn
49+
Follow [@marcf.be](https://bsky.app/profile/marcf.be) on Bluesky and [@marcfbe](https://linkedin.com/in/marcfbe) or LinkedIn
5050

package.abap.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "diff3",
3-
"version": "1.0.0",
3+
"version": "1.1.1",
44
"description": "Highlight the difference two or three string-tables (diff3)",
55
"type": "module",
66
"keywords": [

src/zcl_diff3.clas.abap

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,16 @@ CLASS zcl_diff3 DEFINITION
66
************************************************************************
77
* ABAP Diff3
88
*
9-
* https://github.com/Marc-Bernard-Tools/ABAP-Diff3
10-
*
119
* This is a port of JavaScript (https://github.com/bhousel/node-diff3, MIT license)
1210
* https://github.com/bhousel/node-diff3/blob/main/index.mjs as of 2021-09-24
1311
*
14-
* Copyright 2022 Marc Bernard <https://marcbernardtools.com/>
12+
* Copyright 2024 apm.to Inc. <https://apm.to>
1513
* SPDX-License-Identifier: MIT
1614
************************************************************************
1715

1816
PUBLIC SECTION.
1917

20-
CONSTANTS c_version TYPE string VALUE '1.1.0' ##NEEDED.
18+
CONSTANTS c_version TYPE string VALUE '1.1.1' ##NEEDED.
2119

2220
INTERFACES zif_diff3.
2321

src/zif_diff3.intf.abap

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,16 @@ INTERFACE zif_diff3 PUBLIC.
44
************************************************************************
55
* ABAP Diff3 Interface
66
*
7-
* https://github.com/Marc-Bernard-Tools/ABAP-Diff3
8-
*
97
* This is a port of JavaScript (https://github.com/bhousel/node-diff3, MIT license)
108
* https://github.com/bhousel/node-diff3/blob/main/index.d.ts as of 2021-05-04
119
*
12-
* Copyright 2022 Marc Bernard <https://marcbernardtools.com/>
10+
* Copyright 2024 apm.to Inc. <https://apm.to>
1311
* SPDX-License-Identifier: MIT
1412
************************************************************************
1513

1614
TYPES ty_number TYPE i.
1715

18-
TYPES:
19-
ty_numbers TYPE STANDARD TABLE OF ty_number WITH EMPTY KEY.
16+
TYPES ty_numbers TYPE STANDARD TABLE OF ty_number WITH EMPTY KEY.
2017

2118
TYPES:
2219
BEGIN OF ty_number_number,
@@ -30,8 +27,7 @@ INTERFACE zif_diff3 PUBLIC.
3027
buffer1index TYPE ty_number,
3128
buffer2index TYPE ty_number,
3229
chain TYPE i, " ref to ilcsresult-key
33-
END OF ty_lcs_result.
34-
TYPES:
30+
END OF ty_lcs_result,
3531
ty_lcs_result_t TYPE SORTED TABLE OF ty_lcs_result WITH UNIQUE KEY key.
3632

3733
TYPES:
@@ -41,8 +37,7 @@ INTERFACE zif_diff3 PUBLIC.
4137
buffer1 TYPE string_table,
4238
buffer2 TYPE string_table,
4339
END OF diff,
44-
END OF ty_comm_result.
45-
TYPES:
40+
END OF ty_comm_result,
4641
ty_comm_result_t TYPE STANDARD TABLE OF ty_comm_result WITH DEFAULT KEY.
4742

4843
TYPES:
@@ -51,8 +46,7 @@ INTERFACE zif_diff3 PUBLIC.
5146
buffer1content TYPE string_table,
5247
buffer2 TYPE ty_number_number,
5348
buffer2content TYPE string_table,
54-
END OF ty_diff_indices_result.
55-
TYPES:
49+
END OF ty_diff_indices_result,
5650
ty_diff_indices_result_t TYPE STANDARD TABLE OF ty_diff_indices_result WITH DEFAULT KEY.
5751

5852
TYPES:
@@ -66,8 +60,7 @@ INTERFACE zif_diff3 PUBLIC.
6660
BEGIN OF ty_patch_result,
6761
buffer1 TYPE ty_chunk,
6862
buffer2 TYPE ty_chunk,
69-
END OF ty_patch_result.
70-
TYPES:
63+
END OF ty_patch_result,
7164
ty_patch_result_t TYPE STANDARD TABLE OF ty_patch_result WITH DEFAULT KEY.
7265

7366
TYPES:
@@ -95,8 +88,7 @@ INTERFACE zif_diff3 PUBLIC.
9588
stable TYPE abap_bool,
9689
stable_region TYPE ty_stable_region,
9790
unstable_region TYPE ty_unstable_region,
98-
END OF ty_region.
99-
TYPES:
91+
END OF ty_region,
10092
ty_region_t TYPE STANDARD TABLE OF ty_region WITH DEFAULT KEY.
10193

10294
TYPES:
@@ -110,8 +102,7 @@ INTERFACE zif_diff3 PUBLIC.
110102
b TYPE string_table,
111103
b_index TYPE ty_number,
112104
END OF conflict,
113-
END OF ty_merge_region.
114-
TYPES:
105+
END OF ty_merge_region,
115106
ty_merge_region_t TYPE STANDARD TABLE OF ty_merge_region WITH DEFAULT KEY.
116107

117108
TYPES:

0 commit comments

Comments
 (0)