Skip to content

Commit b2cca2e

Browse files
Merge pull request #56 from cleberjamaral/master
Adding missing yarn.lock file
2 parents d9ee6f9 + 76ecfef commit b2cca2e

File tree

5 files changed

+7256
-9794
lines changed

5 files changed

+7256
-9794
lines changed

build.gradle

+5-7
Original file line numberDiff line numberDiff line change
@@ -232,22 +232,21 @@ node {
232232
*/
233233
// Version of node to use.
234234
version = '10.14.1'
235-
// Version of npm to use.
235+
// Version of yarn to use.
236236
yarnVersion = '1.15.2'
237237
// If true, it will download node using above parameters.
238238
// If false, it will try to use globally installed node.
239239
download = true
240240
}
241241

242242
String testsExecutedMarkerName = "${projectDir}/.tests.executed"
243-
task testYarn(type: YarnTask) {
243+
task testYarn(type: YarnTask, dependsOn: 'yarn') {
244244
dependsOn assemble
245245
// force Jest test runner to execute tests once and finish the process instead of starting watch mode
246246
environment CI: 'true'
247247
args = ['run', 'test']
248248
inputs.files fileTree('src/js')
249-
inputs.file 'package.json'
250-
inputs.file 'package-lock.json'
249+
inputs.file 'yarn.lock'
251250
// allows easy triggering re-tests
252251
doLast {
253252
new File(testsExecutedMarkerName).text = 'delete this file to force re-execution JavaScript tests'
@@ -256,14 +255,13 @@ task testYarn(type: YarnTask) {
256255
}
257256
check.dependsOn testYarn
258257

259-
task buildYarn(type: YarnTask) {
258+
task buildYarn(type: YarnTask, dependsOn: 'yarn') {
260259
dependsOn assemble
261260
// force Jest test runner to execute tests once and finish the process instead of starting watch mode
262261
environment CI: 'true'
263262
args = ['run', 'build']
264263
inputs.files fileTree('src/js')
265-
inputs.file 'package.json'
266-
inputs.file 'package-lock.json'
264+
inputs.file 'yarn.lock'
267265
}
268266
build.dependsOn buildYarn
269267

0 commit comments

Comments
 (0)