Skip to content

Commit 1313750

Browse files
author
Alexander Furer
committed
annotate properties with @Input/@Internal/@optional as preparation for gradle 7.x support.
1 parent da142d8 commit 1313750

File tree

4 files changed

+41
-0
lines changed

4 files changed

+41
-0
lines changed

‎src/com/inet/gradle/setup/abstracts/AbstractSetupTask.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
import java.util.ArrayList;
1919

2020
import com.inet.gradle.setup.SetupBuilder;
21+
import org.gradle.api.tasks.Input;
22+
import org.gradle.api.tasks.Internal;
2123

2224
/**
2325
* Base task for all setup builder tasks.
@@ -48,6 +50,7 @@ public AbstractSetupTask( String extension ) {
4850
*
4951
* @return the instance of the SetupBuilder
5052
*/
53+
@Internal
5154
public SetupBuilder getSetupBuilder() {
5255
return (SetupBuilder)super.getAbstractSetupBuilder();
5356
}
@@ -57,6 +60,7 @@ public SetupBuilder getSetupBuilder() {
5760
*
5861
* @return the preinst specified in the gradle script
5962
*/
63+
@Input
6064
public ArrayList<String> getPreinst() {
6165
return preinst;
6266
}
@@ -75,6 +79,7 @@ public void setPreinst( String preinst ) {
7579
*
7680
* @return the postinst specified in the gradle script
7781
*/
82+
@Input
7883
public ArrayList<String> getPostinst() {
7984
return postinst;
8085
}
@@ -93,6 +98,7 @@ public void setPostinst( String postinst ) {
9398
*
9499
* @return the prerm specified in the gradle script
95100
*/
101+
@Input
96102
public ArrayList<String> getPrerm() {
97103
return prerm;
98104
}
@@ -111,6 +117,7 @@ public void setPrerm( String prerm ) {
111117
*
112118
* @return the postrm specified in the gradle script
113119
*/
120+
@Input
114121
public ArrayList<String> getPostrm() {
115122
return postrm;
116123
}

‎src/com/inet/gradle/setup/abstracts/AbstractTask.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@
4242
import org.gradle.api.internal.file.copy.DefaultCopySpec;
4343
import org.gradle.api.internal.file.copy.FileCopyDetailsInternal;
4444
import org.gradle.api.internal.project.ProjectInternal;
45+
import org.gradle.api.tasks.Input;
4546
import org.gradle.api.tasks.InputFiles;
47+
import org.gradle.api.tasks.Internal;
48+
import org.gradle.api.tasks.Optional;
4649
import org.gradle.api.tasks.OutputFile;
4750
import org.gradle.api.tasks.TaskAction;
4851
import org.gradle.api.tasks.WorkResult;
@@ -220,11 +223,13 @@ protected FileLookup getFileLookup() {
220223
* Return the setupBuilder using the specified type
221224
* @return setupBuilder
222225
*/
226+
@Internal
223227
protected AbstractSetupBuilder getAbstractSetupBuilder() {
224228
return setupBuilder;
225229
}
226230

227231
@Override
232+
@Internal
228233
public CopySpecInternal getRootSpec() {
229234
return rootSpec;
230235
}
@@ -272,6 +277,8 @@ public File getSetupFile() {
272277
*
273278
* @return the extension
274279
*/
280+
@Input
281+
@Optional
275282
public String getExtension() {
276283
return extension;
277284
}
@@ -290,6 +297,8 @@ public void setExtension( String extension ) {
290297
*
291298
* @return The classifier. May be null.
292299
*/
300+
@Input
301+
@Optional
293302
public String getClassifier() {
294303
return classifier;
295304
}
@@ -307,6 +316,7 @@ public void setClassifier(String classifier) {
307316
* {@inheritDoc}
308317
*/
309318
@Override
319+
@Input
310320
public String getDescription() {
311321
String desc = super.getDescription();
312322
if( desc != null && !desc.isEmpty() ) {
@@ -319,6 +329,7 @@ public String getDescription() {
319329
* Get the version of the task. If not set the version of the setup is returned
320330
* @return the version
321331
*/
332+
@Input
322333
public String getVersion() {
323334
if ( version != null ) {
324335
return version;

‎src/com/inet/gradle/setup/abstracts/SetupSources.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.gradle.api.internal.file.copy.CopySpecSource;
3333
import org.gradle.api.specs.Spec;
3434
import org.gradle.api.tasks.InputFiles;
35+
import org.gradle.api.tasks.Internal;
3536

3637
//// if gradleVersion >= 3.0
3738
import org.gradle.api.Transformer;
@@ -125,31 +126,37 @@ default CopySpec from( Object... arg0 ) {
125126
}
126127

127128
@Override
129+
@Internal
128130
default Integer getDirMode() {
129131
return getRootSpec().getDirMode();
130132
}
131133

132134
@Override
135+
@Internal
133136
default DuplicatesStrategy getDuplicatesStrategy() {
134137
return getRootSpec().getDuplicatesStrategy();
135138
}
136139

137140
@Override
141+
@Internal
138142
default Set<String> getExcludes() {
139143
return getRootSpec().getExcludes();
140144
}
141145

142146
@Override
147+
@Internal
143148
default Integer getFileMode() {
144149
return getRootSpec().getFileMode();
145150
}
146151

147152
@Override
153+
@Internal
148154
default boolean getIncludeEmptyDirs() {
149155
return getRootSpec().getIncludeEmptyDirs();
150156
}
151157

152158
@Override
159+
@Internal
153160
default Set<String> getIncludes() {
154161
return getRootSpec().getIncludes();
155162
}
@@ -185,6 +192,7 @@ default CopySpec into( Object arg0 ) {
185192
}
186193

187194
@Override
195+
@Internal
188196
default boolean isCaseSensitive() {
189197
return getRootSpec().isCaseSensitive();
190198
}
@@ -245,6 +253,7 @@ default CopySpec with( CopySpec... arg0 ) {
245253
}
246254

247255
@Override
256+
@Internal
248257
default String getFilteringCharset() {
249258
return getRootSpec().getFilteringCharset();
250259
}

‎src/com/inet/gradle/setup/msi/Msi.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import com.inet.gradle.setup.util.ResourceUtils;
3838

3939
import groovy.lang.Closure;
40+
import org.gradle.api.tasks.Optional;
4041

4142
/**
4243
* The msi Gradle task. It build a msi setup for Windows.
@@ -121,6 +122,7 @@ protected void processFiles( CopyActionProcessingStreamAction action ) {
121122
*
122123
* @return true, if only 32 bit
123124
*/
125+
@Input
124126
boolean isOnly32Bit() {
125127
return only32bit;
126128
}
@@ -163,6 +165,7 @@ public void setArch( String arch ) {
163165
*
164166
* @return true, if 64 bit.
165167
*/
168+
@Input
166169
boolean is64Bit() {
167170
switch( getArch() ) {
168171
case "x64":
@@ -178,6 +181,7 @@ boolean is64Bit() {
178181
* @return the file
179182
*/
180183
@InputFile
184+
@Optional
181185
public File getBannerBmp() {
182186
if( bannerBmp != null ) {
183187
return getProject().file( bannerBmp );
@@ -200,6 +204,7 @@ public void setBannerBmp( Object bannerBmp ) {
200204
* @return the BMP
201205
*/
202206
@InputFile
207+
@Optional
203208
public File getDialogBmp() {
204209
if( dialogBmp != null ) {
205210
return getProject().file( dialogBmp );
@@ -231,6 +236,8 @@ public void signTool( Action<? super SignTool> action ) {
231236
*
232237
* @return the settings or null
233238
*/
239+
@Input
240+
@Optional
234241
public SignTool getSignTool() {
235242
return signTool;
236243
}
@@ -241,6 +248,7 @@ public SignTool getSignTool() {
241248
* @return the template
242249
* @throws MalformedURLException if any error occur
243250
*/
251+
@Input
244252
public URL getWxsTemplateURL() throws MalformedURLException {
245253
if( wxsTemplate != null ) {
246254
return getProject().file( wxsTemplate ).toURI().toURL();
@@ -255,6 +263,7 @@ public URL getWxsTemplateURL() throws MalformedURLException {
255263
* @throws MalformedURLException if any error occur
256264
*/
257265
@InputFile
266+
@Optional
258267
public File getWxsTemplate() throws MalformedURLException {
259268
if( wxsTemplate != null ) {
260269
return getProject().file( wxsTemplate );
@@ -366,6 +375,7 @@ public void launch4j( Action<Launch4j> action ) {
366375
*
367376
* @return the registered launcher
368377
*/
378+
@Input
369379
public List<Launch4j> getLaunch4js() {
370380
return launch4j;
371381
}
@@ -396,6 +406,7 @@ public void setMultiInstanceCount( int instanceCount ) {
396406
* @return the URL
397407
* @throws MalformedURLException if any error occur
398408
*/
409+
@Input
399410
public URL getMultiInstanceScript() throws MalformedURLException {
400411
if( multiInstanceScript != null ) {
401412
return getProject().file( multiInstanceScript ).toURI().toURL();
@@ -484,6 +495,7 @@ public void preGUI( Object script ) {
484495
* Returns if the runAfter is optional
485496
* @return the runAfterIsOptional
486497
*/
498+
@Input
487499
public boolean isRunAfterOptional() {
488500
return runAfterIsOptional;
489501
}
@@ -510,6 +522,7 @@ public void i18n( Object localization ) {
510522
* return the file for optional language resource locations
511523
* @return the localized resources
512524
*/
525+
@Input
513526
public List<MsiLocalizedResource> getI18n() {
514527
return i18n;
515528
}
@@ -549,6 +562,7 @@ public List<File> getExternals() {
549562
* Returns if the skipValidation is requested
550563
* @return the skipValidation
551564
*/
565+
@Input
552566
public boolean isSkipValidation() {
553567
return skipValidation;
554568
}

0 commit comments

Comments
 (0)