Commit 1ed22ce
committed
fix duplicated fields from superclass
in case of duplicated properties, e.g. from a base class it was
generating duplicate property definitions, e.g.:
```
extension JavaClass<PrivateKey> {
@JavaStaticField(isFinal: true)
public var serialVersionUID: Int64
@JavaStaticField(isFinal: true)
public var serialVersionUID: Int64
}
```
(see e.g. https://docs.oracle.com/javase/8/docs/api/java/security/PrivateKey.html)
which then fails the swift build.
Analog to methods, this now skips the property in case it wasn't directly from
the class itself.1 parent 0685f55 commit 1ed22ce
File tree
2 files changed
+48
-6
lines changed- Sources/SwiftJavaToolLib
- Tests/SwiftJavaToolLibTests/WrapJavaTests
2 files changed
+48
-6
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
270 | 270 | | |
271 | 271 | | |
272 | 272 | | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
273 | 280 | | |
274 | 281 | | |
275 | 282 | | |
| |||
283 | 290 | | |
284 | 291 | | |
285 | 292 | | |
286 | | - | |
287 | | - | |
288 | | - | |
289 | | - | |
290 | | - | |
291 | | - | |
292 | 293 | | |
293 | 294 | | |
294 | 295 | | |
| |||
Lines changed: 41 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
88 | 88 | | |
89 | 89 | | |
90 | 90 | | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
91 | 132 | | |
0 commit comments