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

Commit 67e5ce1

Browse files
dcendentsdcendents
committed
Merge commit '9cda3a3cb3e1baea5375d7268b2eebbbe6cec4c2' into develop
# Conflicts: # build.gradle
2 parents 229ae97 + 9cda3a3 commit 67e5ce1

File tree

15 files changed

+171
-112
lines changed

15 files changed

+171
-112
lines changed

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ repositories {
1616
}
1717

1818
ext {
19-
gradleVersions = '4.1,4.2,4.2.1'
19+
gradleVersions = '4.1,4.2,4.2.1,4.3'
2020
androidGradleBuildVersion = '3.0.0-beta3'
2121
androidCompileSdkVersion = 'android-26'
2222
androidBuildToolsVersion = '26.0.1'
@@ -230,7 +230,7 @@ jacocoTestReport.dependsOn test
230230
check.dependsOn jacocoTestReport
231231

232232
task wrapper(type: Wrapper) {
233-
gradleVersion = '4.2.1'
233+
gradleVersion = '4.3'
234234
distributionUrl = "https://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
235235
}
236236

‎gradle/wrapper/gradle-wrapper.jar‎

15 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip

‎src/test/core/src/testFixtures/groovy/org/gradle/api/tasks/AbstractCopyTaskContractTest.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ abstract class AbstractCopyTaskContractTest extends AbstractConventionTaskTest {
5555
task.from fromSrcDir
5656
task.into intoBuildDir
5757
task.eachFile closureInvocation.closure
58-
task.execute()
58+
execute(task)
5959

6060
assert closureInvocation.wasCalled(1)
6161
assert closureInvocation.files.containsAll(fromPropertiesFile)
@@ -72,7 +72,7 @@ abstract class AbstractCopyTaskContractTest extends AbstractConventionTaskTest {
7272

7373
task.from(project.fileTree(dir: fromSrcDir).matching { include 'conf/file.properties' }) { eachFile closureInvocation.closure }
7474
task.into intoBuildDir
75-
task.execute()
75+
execute(task)
7676

7777
assert closureInvocation.wasCalled(1)
7878
assert closureInvocation.files.contains(fromPropertiesFile)
@@ -100,7 +100,7 @@ abstract class AbstractCopyTaskContractTest extends AbstractConventionTaskTest {
100100
private final Closure closure
101101
private final List<String> files = []
102102

103-
public EachFileClosureInvocation() {
103+
EachFileClosureInvocation() {
104104
closure = {
105105
++calls
106106
files << it.file

‎src/test/core/src/testFixtures/groovy/org/gradle/api/tasks/AbstractSpockTaskTest.groovy‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -42,28 +42,28 @@ import java.util.concurrent.atomic.AtomicBoolean
4242

4343
import static org.junit.Assert.assertFalse
4444

45-
public abstract class AbstractSpockTaskTest extends AbstractProjectBuilderSpec {
45+
abstract class AbstractSpockTaskTest extends AbstractProjectBuilderSpec {
4646
public static final String TEST_TASK_NAME = "taskname"
4747

4848
def taskClassInfoStore = new DefaultTaskClassInfoStore(new DefaultTaskClassValidatorExtractor())
4949
private final ITaskFactory taskFactory = new AnnotationProcessingTaskFactory(taskClassInfoStore, new TaskFactory(new AsmBackedClassGenerator()))
5050

51-
public abstract AbstractTask getTask();
51+
abstract AbstractTask getTask()
5252

53-
public <T extends AbstractTask> T createTask(Class<T> type) {
54-
return createTask(type, project, TEST_TASK_NAME);
53+
def <T extends AbstractTask> T createTask(Class<T> type) {
54+
return createTask(type, project, TEST_TASK_NAME)
5555
}
5656

57-
public Task createTask(Project project, String name) {
58-
return createTask(getTask().getClass(), project, name);
57+
Task createTask(Project project, String name) {
58+
return createTask(getTask().getClass(), project, name)
5959
}
6060

61-
public <T extends AbstractTask> T createTask(Class<T> type, Project project, String name) {
61+
def <T extends AbstractTask> T createTask(Class<T> type, Project project, String name) {
6262
Task task = taskFactory.createChild(project, DirectInstantiator.INSTANCE).createTask(
6363
GUtil.map(Task.TASK_TYPE, type,
6464
Task.TASK_NAME, name))
6565
assert type.isAssignableFrom(task.getClass())
66-
return type.cast(task);
66+
return type.cast(task)
6767
}
6868

6969
def testTask() {
@@ -80,44 +80,44 @@ public abstract class AbstractSpockTaskTest extends AbstractProjectBuilderSpec {
8080
}
8181

8282
def testPath() {
83-
ProjectInternal childProject = TestUtil.createChildProject(project, "child");
84-
childProject.getProjectDir().mkdirs();
85-
ProjectInternal childchildProject = TestUtil.createChildProject(childProject, "childchild");
86-
childchildProject.getProjectDir().mkdirs();
83+
ProjectInternal childProject = TestUtil.createChildProject(project, "child")
84+
childProject.getProjectDir().mkdirs()
85+
ProjectInternal childchildProject = TestUtil.createChildProject(childProject, "childchild")
86+
childchildProject.getProjectDir().mkdirs()
8787

8888
when:
89-
Task task = createTask(project, TEST_TASK_NAME);
89+
Task task = createTask(project, TEST_TASK_NAME)
9090

9191
then:
9292
Project.PATH_SEPARATOR + TEST_TASK_NAME == task.getPath()
9393

9494
when:
95-
task = createTask(childProject, TEST_TASK_NAME);
95+
task = createTask(childProject, TEST_TASK_NAME)
9696

9797
then:
9898
Project.PATH_SEPARATOR + "child" + Project.PATH_SEPARATOR + TEST_TASK_NAME == task.getPath()
9999

100100
when:
101-
task = createTask(childchildProject, TEST_TASK_NAME);
101+
task = createTask(childchildProject, TEST_TASK_NAME)
102102

103103
then:
104104
Project.PATH_SEPARATOR + "child" + Project.PATH_SEPARATOR + "childchild" + Project.PATH_SEPARATOR + TEST_TASK_NAME == task.getPath()
105105
}
106106

107107
def testDependsOn() {
108-
Task dependsOnTask = createTask(project, "somename");
109-
Task task = createTask(project, TEST_TASK_NAME);
110-
project.getTasks().create("path1");
111-
project.getTasks().create("path2");
108+
Task dependsOnTask = createTask(project, "somename")
109+
Task task = createTask(project, TEST_TASK_NAME)
110+
project.getTasks().create("path1")
111+
project.getTasks().create("path2")
112112

113113
when:
114-
task.dependsOn(Project.PATH_SEPARATOR + "path1");
114+
task.dependsOn(Project.PATH_SEPARATOR + "path1")
115115

116116
then:
117117
TaskDependencyMatchers.dependsOn("path1").matches(task)
118118

119119
when:
120-
task.dependsOn("path2", dependsOnTask);
120+
task.dependsOn("path2", dependsOnTask)
121121

122122
then:
123123
TaskDependencyMatchers.dependsOn("path1", "path2", "somename").matches(task)
@@ -129,10 +129,10 @@ public abstract class AbstractSpockTaskTest extends AbstractProjectBuilderSpec {
129129

130130
def testDeleteAllActions() {
131131
when:
132-
Action action1 = Actions.doNothing();
133-
Action action2 = Actions.doNothing();
134-
getTask().doLast(action1);
135-
getTask().doLast(action2);
132+
Action action1 = Actions.doNothing()
133+
Action action2 = Actions.doNothing()
134+
getTask().doLast(action1)
135+
getTask().doLast(action2)
136136

137137
then:
138138
getTask().is( getTask().deleteAllActions())
@@ -141,10 +141,10 @@ public abstract class AbstractSpockTaskTest extends AbstractProjectBuilderSpec {
141141

142142
def testSetActions() {
143143
when:
144-
Action action1 = Actions.doNothing();
144+
Action action1 = Actions.doNothing()
145145
getTask().actions = [action1]
146146

147-
Action action2 = Actions.doNothing();
147+
Action action2 = Actions.doNothing()
148148
getTask().actions = [action2]
149149

150150
then:
@@ -162,7 +162,7 @@ public abstract class AbstractSpockTaskTest extends AbstractProjectBuilderSpec {
162162
def testExecuteDelegatesToTaskExecuter() {
163163
final AbstractTask task = getTask()
164164
TaskExecuter executer = Mock()
165-
task.setExecuter(executer);
165+
task.setExecuter(executer)
166166

167167
when:
168168
task.execute()
@@ -174,46 +174,46 @@ public abstract class AbstractSpockTaskTest extends AbstractProjectBuilderSpec {
174174

175175
def setGetDescription() {
176176
when:
177-
String testDescription = "testDescription";
178-
getTask().setDescription(testDescription);
177+
String testDescription = "testDescription"
178+
getTask().setDescription(testDescription)
179179

180180
then:
181181
testDescription == getTask().getDescription()
182182
}
183183

184184
def canSpecifyOnlyIfPredicateUsingClosure() {
185-
AbstractTask task = getTask();
185+
AbstractTask task = getTask()
186186

187187
expect:
188188
task.getOnlyIf().isSatisfiedBy(task)
189189

190190
when:
191-
task.onlyIf(TestUtil.toClosure("{ task -> false }"));
191+
task.onlyIf(TestUtil.toClosure("{ task -> false }"))
192192

193193
then:
194-
assertFalse(task.getOnlyIf().isSatisfiedBy(task));
194+
assertFalse(task.getOnlyIf().isSatisfiedBy(task))
195195
}
196196

197197
def canSpecifyOnlyIfPredicateUsingSpec() {
198198
final Spec<Task> spec = Mock()
199-
final AbstractTask task = getTask();
199+
final AbstractTask task = getTask()
200200

201201
expect:
202202
task.getOnlyIf().isSatisfiedBy(task)
203203

204204
when:
205-
task.onlyIf(spec);
205+
task.onlyIf(spec)
206206

207207
then:
208208
spec.isSatisfiedBy(task) >> false
209-
assertFalse(task.getOnlyIf().isSatisfiedBy(task));
209+
assertFalse(task.getOnlyIf().isSatisfiedBy(task))
210210
}
211211

212212
def onlyIfPredicateIsTrueWhenTaskIsEnabledAndAllPredicatesAreTrue() {
213-
final AtomicBoolean condition1 = new AtomicBoolean(true);
214-
final AtomicBoolean condition2 = new AtomicBoolean(true);
213+
final AtomicBoolean condition1 = new AtomicBoolean(true)
214+
final AtomicBoolean condition2 = new AtomicBoolean(true)
215215

216-
AbstractTask task = getTask();
216+
AbstractTask task = getTask()
217217
task.onlyIf {
218218
condition1.get()
219219
}
@@ -225,58 +225,58 @@ public abstract class AbstractSpockTaskTest extends AbstractProjectBuilderSpec {
225225
task.getOnlyIf().isSatisfiedBy(task)
226226

227227
when:
228-
task.setEnabled(false);
228+
task.setEnabled(false)
229229

230230
then:
231-
assertFalse(task.getOnlyIf().isSatisfiedBy(task));
231+
assertFalse(task.getOnlyIf().isSatisfiedBy(task))
232232

233233
when:
234-
task.setEnabled(true);
235-
condition1.set(false);
234+
task.setEnabled(true)
235+
condition1.set(false)
236236

237237
then:
238-
assertFalse(task.getOnlyIf().isSatisfiedBy(task));
238+
assertFalse(task.getOnlyIf().isSatisfiedBy(task))
239239

240240
when:
241-
condition1.set(true);
242-
condition2.set(false);
241+
condition1.set(true)
242+
condition2.set(false)
243243

244244
then:
245-
assertFalse(task.getOnlyIf().isSatisfiedBy(task));
245+
assertFalse(task.getOnlyIf().isSatisfiedBy(task))
246246

247247
when:
248-
condition2.set(true);
248+
condition2.set(true)
249249

250250
then:
251251
task.getOnlyIf().isSatisfiedBy(task)
252252
}
253253

254254
def canReplaceOnlyIfSpec() {
255-
final AtomicBoolean condition1 = new AtomicBoolean(true);
256-
AbstractTask task = getTask();
255+
final AtomicBoolean condition1 = new AtomicBoolean(true)
256+
AbstractTask task = getTask()
257257
task.onlyIf(Mock(Spec))
258258
task.setOnlyIf {
259-
return condition1.get();
259+
return condition1.get()
260260
}
261261

262262
expect:
263263
task.getOnlyIf().isSatisfiedBy(task)
264264

265265
when:
266-
task.setEnabled(false);
266+
task.setEnabled(false)
267267

268268
then:
269-
assertFalse(task.getOnlyIf().isSatisfiedBy(task));
269+
assertFalse(task.getOnlyIf().isSatisfiedBy(task))
270270

271271
when:
272-
task.setEnabled(true);
273-
condition1.set(false);
272+
task.setEnabled(true)
273+
condition1.set(false)
274274

275275
then:
276-
assertFalse(task.getOnlyIf().isSatisfiedBy(task));
276+
assertFalse(task.getOnlyIf().isSatisfiedBy(task))
277277

278278
when:
279-
condition1.set(true);
279+
condition1.set(true)
280280

281281
then:
282282
task.getOnlyIf().isSatisfiedBy(task)

0 commit comments

Comments
 (0)