|
1 | | -import com.github.jengelman.gradle.plugins.shadow.transformers.PreserveFirstFoundResourceTransformer |
2 | 1 | import org.apache.tools.ant.taskdefs.condition.Os |
3 | 2 |
|
4 | 3 | plugins { |
@@ -77,10 +76,10 @@ tasks.register('jre') { |
77 | 76 | ignoreExitValue = true |
78 | 77 | commandLine = [ |
79 | 78 | jlink.toString(), '-v', |
80 | | - *(inputs.properties['options'] as List), |
81 | | - '--module-path', jmods.toString(), |
82 | | - '--add-modules', (inputs.properties['modules'] as List).join(','), |
83 | | - '--output', jreOutputDir.get().toString() |
| 79 | + *(inputs.properties['options'] as List), |
| 80 | + '--module-path', jmods.toString(), |
| 81 | + '--add-modules', (inputs.properties['modules'] as List).join(','), |
| 82 | + '--output', jreOutputDir.get().toString() |
84 | 83 | ] |
85 | 84 | } |
86 | 85 |
|
@@ -131,24 +130,16 @@ application { |
131 | 130 | shadowJar { |
132 | 131 | duplicatesStrategy = DuplicatesStrategy.INCLUDE |
133 | 132 | mergeServiceFiles() |
134 | | - |
135 | | - transform(PreserveFirstFoundResourceTransformer) { |
136 | | - resources.addAll( |
137 | | - 'META-INF/LICENSE', |
138 | | - 'META-INF/LICENSE.txt', |
139 | | - 'META-INF/NOTICE', |
140 | | - 'META-INF/NOTICE.txt', |
141 | | - 'license/LICENSE', |
142 | | - 'license/LICENSE.dom-documentation.txt', |
143 | | - 'license/LICENSE.dom-software.txt', |
144 | | - 'license/NOTICE', |
145 | | - 'license/README.dom.txt' |
146 | | - ) |
147 | | - } |
148 | | - |
149 | 133 | failOnDuplicateEntries = true |
150 | 134 |
|
151 | | - dependencies { |
152 | | - exclude('dist_webp_binaries/') |
153 | | - } |
| 135 | + exclude('dist_webp_binaries/', |
| 136 | + 'META-INF/LICENSE', |
| 137 | + 'META-INF/LICENSE.txt', |
| 138 | + 'META-INF/NOTICE', |
| 139 | + 'META-INF/NOTICE.txt', |
| 140 | + 'license/LICENSE', |
| 141 | + 'license/LICENSE.dom-documentation.txt', |
| 142 | + 'license/LICENSE.dom-software.txt', |
| 143 | + 'license/NOTICE', |
| 144 | + 'license/README.dom.txt') |
154 | 145 | } |
0 commit comments