Commit d35938b
committed
refactor(model): Simplify the code to get version ranges
The check against `IVY_VERSION_RANGE_INDICATORS` (which did not actually
contain only *Ivy* indicators) was only needed because the Semver4j
library by default parses single versions into ranges (like "2" becomes
">= 2.0.0, < 3.0.0"), which made it unusable for checking for version
ranges by simply testing whether range parsing fails.
However, that behavior came from the `XRangeProcessor` being applied by
default, which is a syntax that ORT never officially supported for
package curations / configurations. Instead, ORT only ever supported Ivy
version ranges officially.
So simplify the code by explicitly only using `IvyProcessor` and
working on `String`s internally.
Signed-off-by: Sebastian Schuberth <[email protected]>1 parent 93c310a commit d35938b
File tree
2 files changed
+76
-21
lines changed- model/src
- main/kotlin/utils
- test/kotlin/utils
2 files changed
+76
-21
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
| 29 | + | |
29 | 30 | | |
30 | 31 | | |
31 | 32 | | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | 33 | | |
38 | 34 | | |
39 | 35 | | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
| 36 | + | |
50 | 37 | | |
51 | 38 | | |
52 | 39 | | |
| |||
62 | 49 | | |
63 | 50 | | |
64 | 51 | | |
65 | | - | |
| 52 | + | |
66 | 53 | | |
67 | 54 | | |
68 | 55 | | |
| |||
74 | 61 | | |
75 | 62 | | |
76 | 63 | | |
77 | | - | |
78 | | - | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
79 | 71 | | |
80 | | - | |
81 | | - | |
82 | | - | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
83 | 76 | | |
| 77 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
0 commit comments