Skip to content
This repository was archived by the owner on Apr 2, 2021. It is now read-only.

Commit 97fa348

Browse files
johndevsjohndevs
committed
Convert PropertyState to Property (#503)
1 parent b2182b7 commit 97fa348

16 files changed

+153
-154
lines changed

‎src/main/groovy/com/devsoap/plugin/extensions/AddonExtension.groovy

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package com.devsoap.plugin.extensions
1717

1818
import org.gradle.api.Project
19-
import org.gradle.api.provider.PropertyState
19+
import org.gradle.api.provider.Property
2020
import org.gradle.api.provider.Provider
2121

2222
/**
@@ -29,16 +29,16 @@ class AddonExtension {
2929

3030
static final String NAME = 'vaadinAddon'
3131

32-
private final PropertyState<String> author
33-
private final PropertyState<String> license
34-
private final PropertyState<String> title
35-
private final PropertyState<List<String>> styles
32+
private final Property<String> author
33+
private final Property<String> license
34+
private final Property<String> title
35+
private final Property<List<String>> styles
3636

3737
AddonExtension(Project project) {
38-
author = project.property(String)
39-
license = project.property(String)
40-
title = project.property(String)
41-
styles = project.property(List)
38+
author = project.objects.property(String)
39+
license = project.objects.property(String)
40+
title = project.objects.property(String)
41+
styles = project.objects.property(List)
4242

4343
author.set('')
4444
license.set('')

‎src/main/groovy/com/devsoap/plugin/extensions/SpringBootExtension.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package com.devsoap.plugin.extensions
1717

1818
import org.gradle.api.Project
19-
import org.gradle.api.provider.PropertyState
19+
import org.gradle.api.provider.Property
2020

2121
import javax.validation.constraints.NotNull
2222

@@ -30,10 +30,10 @@ class SpringBootExtension {
3030

3131
static final NAME = "vaadinSpringBoot"
3232

33-
private final PropertyState<String> starterVersion
33+
private final Property<String> starterVersion
3434

3535
SpringBootExtension(Project project) {
36-
starterVersion = project.property(String)
36+
starterVersion = project.objects.property(String)
3737
starterVersion.set('3.+')
3838
}
3939

‎src/main/groovy/com/devsoap/plugin/extensions/TestBenchExtension.groovy

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package com.devsoap.plugin.extensions
1717

1818
import org.gradle.api.Project
19-
import org.gradle.api.provider.PropertyState
19+
import org.gradle.api.provider.Property
2020

2121
/**
2222
* Configuration options for Vaadin Testbench
@@ -28,14 +28,14 @@ class TestBenchExtension {
2828

2929
static final String NAME = 'vaadinTestbench'
3030

31-
private final PropertyState<Boolean> enabled
32-
private final PropertyState<String> version
33-
private final PropertyState<Boolean> runApplication
31+
private final Property<Boolean> enabled
32+
private final Property<String> version
33+
private final Property<Boolean> runApplication
3434

3535
TestBenchExtension(Project project) {
36-
enabled = project.property(Boolean)
37-
version = project.property(String)
38-
runApplication = project.property(Boolean)
36+
enabled = project.objects.property(Boolean)
37+
version = project.objects.property(String)
38+
runApplication = project.objects.property(Boolean)
3939

4040
enabled.set(false)
4141
version.set('5.0.+')

‎src/main/groovy/com/devsoap/plugin/extensions/TestBenchHubExtension.groovy

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package com.devsoap.plugin.extensions
1717

1818
import org.gradle.api.Project
19-
import org.gradle.api.provider.PropertyState
19+
import org.gradle.api.provider.Property
2020
import org.gradle.api.provider.Provider
2121

2222
/**
@@ -29,14 +29,14 @@ class TestBenchHubExtension {
2929

3030
static final String NAME = 'vaadinTestbenchHub'
3131

32-
private final PropertyState<Boolean> enabled
33-
private final PropertyState<String> host
34-
private final PropertyState<Integer> port
32+
private final Property<Boolean> enabled
33+
private final Property<String> host
34+
private final Property<Integer> port
3535

3636
TestBenchHubExtension(Project project) {
37-
enabled = project.property(Boolean)
38-
host = project.property(String)
39-
port = project.property(Integer)
37+
enabled = project.objects.property(Boolean)
38+
host = project.objects.property(String)
39+
port = project.objects.property(Integer)
4040

4141
enabled.set(false)
4242
host.set('localhost')

‎src/main/groovy/com/devsoap/plugin/extensions/TestBenchNodeExtension.groovy

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package com.devsoap.plugin.extensions
1717

1818
import org.gradle.api.Project
19-
import org.gradle.api.provider.PropertyState
19+
import org.gradle.api.provider.Property
2020
import org.gradle.api.provider.Provider
2121

2222
/**
@@ -29,19 +29,19 @@ class TestBenchNodeExtension {
2929

3030
static final String NAME = 'vaadinTestbenchNode'
3131

32-
private final PropertyState<Boolean> enabled
33-
private final PropertyState<String> host
34-
private final PropertyState<Integer> port
35-
private final PropertyState<String> hub
36-
private final PropertyState<List<Map>> browsers
32+
private final Property<Boolean> enabled
33+
private final Property<String> host
34+
private final Property<Integer> port
35+
private final Property<String> hub
36+
private final Property<List<Map>> browsers
3737

3838
TestBenchNodeExtension(Project project) {
3939

40-
enabled = project.property(Boolean)
41-
host = project.property(String)
42-
port = project.property(Integer)
43-
hub = project.property(String)
44-
browsers = project.property(List)
40+
enabled = project.objects.property(Boolean)
41+
host = project.objects.property(String)
42+
port = project.objects.property(Integer)
43+
hub = project.objects.property(String)
44+
browsers = project.objects.property(List)
4545

4646
enabled.set(false)
4747
host.set('localhost')

‎src/main/groovy/com/devsoap/plugin/extensions/VaadinPluginExtension.groovy

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ import com.devsoap.plugin.Util
1919
import org.apache.tools.ant.taskdefs.condition.Os
2020
import org.gradle.api.Project
2121
import org.gradle.api.file.SourceDirectorySet
22-
import org.gradle.api.plugins.ExtraPropertiesExtension
23-
import org.gradle.api.provider.PropertyState
22+
import org.gradle.api.provider.Property
2423
import org.gradle.api.provider.Provider
2524

2625
/**
@@ -35,28 +34,28 @@ class VaadinPluginExtension {
3534

3635
private static final String VAADIN_VERSION_PROPERTY = 'vaadinVersion'
3736

38-
private final PropertyState<String> version
39-
private final PropertyState<Boolean> manageDependencies
40-
private final PropertyState<Boolean> manageRepositories
41-
private final PropertyState<SourceDirectorySet> mainSourceSet
42-
private final PropertyState<SourceDirectorySet> mainTestSourceSet
43-
private final PropertyState<Boolean> push
44-
private final PropertyState<Boolean> logToConsole
45-
private final PropertyState<Boolean> useClassPathJar
37+
private final Property<String> version
38+
private final Property<Boolean> manageDependencies
39+
private final Property<Boolean> manageRepositories
40+
private final Property<SourceDirectorySet> mainSourceSet
41+
private final Property<SourceDirectorySet> mainTestSourceSet
42+
private final Property<Boolean> push
43+
private final Property<Boolean> logToConsole
44+
private final Property<Boolean> useClassPathJar
4645

4746
private final Project project
4847

4948
VaadinPluginExtension(Project project) {
5049
this.project = project
5150

52-
version = project.property(String)
53-
manageDependencies = project.property(Boolean)
54-
manageRepositories = project.property(Boolean)
55-
mainSourceSet = project.property(SourceDirectorySet)
56-
mainTestSourceSet = project.property(SourceDirectorySet)
57-
push = project.property(Boolean)
58-
logToConsole = project.property(Boolean)
59-
useClassPathJar = project.property(Boolean)
51+
version = project.objects.property(String)
52+
manageDependencies = project.objects.property(Boolean)
53+
manageRepositories = project.objects.property(Boolean)
54+
mainSourceSet = project.objects.property(SourceDirectorySet)
55+
mainTestSourceSet = project.objects.property(SourceDirectorySet)
56+
push = project.objects.property(Boolean)
57+
logToConsole = project.objects.property(Boolean)
58+
useClassPathJar = project.objects.property(Boolean)
6059

6160
version.set(null)
6261
manageDependencies.set(true)

‎src/main/groovy/com/devsoap/plugin/extensions/WidgetsetCDNExtension.groovy

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package com.devsoap.plugin.extensions
1717

1818
import groovyx.net.http.AuthConfig
1919
import org.gradle.api.Project
20-
import org.gradle.api.provider.PropertyState
20+
import org.gradle.api.provider.Property
2121
import org.gradle.api.provider.Provider
2222

2323
/**
@@ -30,18 +30,18 @@ class WidgetsetCDNExtension {
3030

3131
static final String NAME = 'widgetsetCDNConfig'
3232

33-
private final PropertyState<Boolean> proxyEnabled
34-
private final PropertyState<Integer> proxyPort
35-
private final PropertyState<String> proxyScheme
36-
private final PropertyState<String> proxyHost
37-
private final PropertyState<AuthConfig> proxyAuth
33+
private final Property<Boolean> proxyEnabled
34+
private final Property<Integer> proxyPort
35+
private final Property<String> proxyScheme
36+
private final Property<String> proxyHost
37+
private final Property<AuthConfig> proxyAuth
3838

3939
WidgetsetCDNExtension(Project project){
40-
proxyEnabled = project.property(Boolean)
41-
proxyPort = project.property(Integer)
42-
proxyScheme = project.property(String)
43-
proxyHost = project.property(String)
44-
proxyAuth = project.property(AuthConfig)
40+
proxyEnabled = project.objects.property(Boolean)
41+
proxyPort = project.objects.property(Integer)
42+
proxyScheme = project.objects.property(String)
43+
proxyHost = project.objects.property(String)
44+
proxyAuth = project.objects.property(AuthConfig)
4545

4646
proxyEnabled.set(false)
4747
proxyPort.set(Integer.parseInt(System.getProperty('http.proxyPort') ?: '-1'))

‎src/main/groovy/com/devsoap/plugin/tasks/BuildClassPathJar.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package com.devsoap.plugin.tasks
1818
import com.devsoap.plugin.GradleVaadinPlugin
1919
import com.devsoap.plugin.Util
2020
import org.gradle.api.file.FileCollection
21-
import org.gradle.api.provider.PropertyState
21+
import org.gradle.api.provider.Property
2222
import org.gradle.api.provider.Provider
2323
import org.gradle.api.tasks.bundling.Jar
2424

@@ -32,7 +32,7 @@ class BuildClassPathJar extends Jar {
3232

3333
public static final String NAME = 'vaadinClassPathJar'
3434

35-
private final PropertyState<Boolean> useClassPathJar = project.property(Boolean)
35+
private final Property<Boolean> useClassPathJar = project.objects.property(Boolean)
3636

3737
BuildClassPathJar() {
3838
description = 'Creates a Jar with the project classpath'

‎src/main/groovy/com/devsoap/plugin/tasks/CompileThemeTask.groovy

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import org.gradle.api.artifacts.Configuration
2222
import org.gradle.api.artifacts.Dependency
2323
import org.gradle.api.artifacts.ProjectDependency
2424
import org.gradle.api.file.FileTree
25-
import org.gradle.api.provider.PropertyState
25+
import org.gradle.api.provider.Property
2626
import org.gradle.api.provider.Provider
2727
import org.gradle.api.tasks.CacheableTask
2828
import org.gradle.api.tasks.Input
@@ -64,11 +64,11 @@ class CompileThemeTask extends DefaultTask {
6464

6565
private static final String STYLES_SCSS = 'styles.scss'
6666

67-
private final PropertyState<String> themesDirectory = project.property(String)
68-
private final PropertyState<String> compiler = project.property(String)
69-
private final PropertyState<Boolean> compress = project.property(Boolean)
70-
private final PropertyState<Boolean> useClasspathJar = project.property(Boolean)
71-
private final PropertyState<List<String>> jvmArgs = project.property(List)
67+
private final Property<String> themesDirectory = project.objects.property(String)
68+
private final Property<String> compiler = project.objects.property(String)
69+
private final Property<Boolean> compress = project.objects.property(Boolean)
70+
private final Property<Boolean> useClasspathJar = project.objects.property(Boolean)
71+
private final Property<List<String>> jvmArgs = project.objects.property(List)
7272

7373
/**
7474
* Creates a new theme compilation task

‎src/main/groovy/com/devsoap/plugin/tasks/CompileWidgetsetTask.groovy

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import org.apache.commons.codec.digest.DigestUtils
2828
import org.gradle.api.DefaultTask
2929
import org.gradle.api.GradleException
3030
import org.gradle.api.file.FileCollection
31-
import org.gradle.api.provider.PropertyState
31+
import org.gradle.api.provider.Property
3232
import org.gradle.api.provider.Provider
3333
import org.gradle.api.tasks.CacheableTask
3434
import org.gradle.api.tasks.TaskAction
@@ -50,32 +50,32 @@ class CompileWidgetsetTask extends DefaultTask {
5050

5151
private static final WIDGETSET_CDN_URL = 'https://wsc.vaadin.com/'
5252

53-
private final PropertyState<String> style = project.property(String)
54-
private final PropertyState<Integer> optimize = project.property(Integer)
55-
private final PropertyState<Boolean> logEnabled = project.property(Boolean)
56-
private final PropertyState<String> logLevel = project.property(String)
57-
private final PropertyState<Integer> localWorkers = project.property(Integer)
58-
private final PropertyState<Boolean> draftCompile = project.property(Boolean)
59-
private final PropertyState<Boolean> strict = project.property(Boolean)
60-
private final PropertyState<String> userAgent = project.property(String)
61-
private final PropertyState<List<String>> jvmArgs = project.property(List)
62-
private final PropertyState<List<String>> extraArgs = project.property(List)
63-
private final PropertyState<List<String>> sourcePaths = project.property(List)
64-
private final PropertyState<Boolean> collapsePermutations = project.property(Boolean)
65-
private final PropertyState<List<String>> extraInherits = project.property(List)
66-
private final PropertyState<Boolean> gwtSdkFirstInClasspath = project.property(Boolean)
67-
private final PropertyState<String> outputDirectory = project.property(String)
68-
private final PropertyState<Boolean> widgetsetCDN = project.property(Boolean)
69-
private final PropertyState<Boolean> profiler = project.property(Boolean)
70-
private final PropertyState<Boolean> manageWidgetset = project.property(Boolean)
71-
private final PropertyState<String> widgetset = project.property(String)
72-
private final PropertyState<String> widgetsetGenerator = project.property(String)
73-
74-
private final PropertyState<Boolean> proxyEnabled = project.property(Boolean)
75-
private final PropertyState<Integer> proxyPort = project.property(Integer)
76-
private final PropertyState<String> proxyScheme = project.property(String)
77-
private final PropertyState<String> proxyHost = project.property(String)
78-
private final PropertyState<AuthConfig> proxyAuth = project.property(AuthConfig)
53+
private final Property<String> style = project.objects.property(String)
54+
private final Property<Integer> optimize = project.objects.property(Integer)
55+
private final Property<Boolean> logEnabled = project.objects.property(Boolean)
56+
private final Property<String> logLevel = project.objects.property(String)
57+
private final Property<Integer> localWorkers = project.objects.property(Integer)
58+
private final Property<Boolean> draftCompile = project.objects.property(Boolean)
59+
private final Property<Boolean> strict = project.objects.property(Boolean)
60+
private final Property<String> userAgent = project.objects.property(String)
61+
private final Property<List<String>> jvmArgs = project.objects.property(List)
62+
private final Property<List<String>> extraArgs = project.objects.property(List)
63+
private final Property<List<String>> sourcePaths = project.objects.property(List)
64+
private final Property<Boolean> collapsePermutations = project.objects.property(Boolean)
65+
private final Property<List<String>> extraInherits = project.objects.property(List)
66+
private final Property<Boolean> gwtSdkFirstInClasspath = project.objects.property(Boolean)
67+
private final Property<String> outputDirectory = project.objects.property(String)
68+
private final Property<Boolean> widgetsetCDN = project.objects.property(Boolean)
69+
private final Property<Boolean> profiler = project.objects.property(Boolean)
70+
private final Property<Boolean> manageWidgetset = project.objects.property(Boolean)
71+
private final Property<String> widgetset = project.objects.property(String)
72+
private final Property<String> widgetsetGenerator = project.objects.property(String)
73+
74+
private final Property<Boolean> proxyEnabled = project.objects.property(Boolean)
75+
private final Property<Integer> proxyPort = project.objects.property(Integer)
76+
private final Property<String> proxyScheme = project.objects.property(String)
77+
private final Property<String> proxyHost = project.objects.property(String)
78+
private final Property<AuthConfig> proxyAuth = project.objects.property(AuthConfig)
7979

8080
private Closure<Map> queryWidgetsetRequest = { version, style ->
8181
Set addons = Util.findAddonsInProject(project)

0 commit comments

Comments
 (0)