trackler 2.1.0.29 → 2.1.0.30

data/tracks/ecmascript/exercises/say/package.json

@@ -11,6 +11,7 @@
   "devDependencies": {
     "babel-jest": "^20.0.1",
     "babel-preset-env": "^1.4.0",
+    "babel-plugin-transform-builtin-extend": "^1.1.2",
     "eslint": "^3.19.0",
     "jest": "^20.0.1"
   },
@@ -22,6 +23,11 @@
   "babel": {
     "presets": [
       "env"
+    ],
+    "plugins": [
+      ["babel-plugin-transform-builtin-extend", {
+        "globals": ["Error"]
+      }]
     ]
   },
   "scripts": {

data/tracks/ecmascript/exercises/scrabble-score/package.json

@@ -11,6 +11,7 @@
   "devDependencies": {
     "babel-jest": "^20.0.1",
     "babel-preset-env": "^1.4.0",
+    "babel-plugin-transform-builtin-extend": "^1.1.2",
     "eslint": "^3.19.0",
     "jest": "^20.0.1"
   },
@@ -22,6 +23,11 @@
   "babel": {
     "presets": [
       "env"
+    ],
+    "plugins": [
+      ["babel-plugin-transform-builtin-extend", {
+        "globals": ["Error"]
+      }]
     ]
   },
   "scripts": {

data/tracks/ecmascript/exercises/secret-handshake/package.json

@@ -11,6 +11,7 @@
   "devDependencies": {
     "babel-jest": "^20.0.1",
     "babel-preset-env": "^1.4.0",
+    "babel-plugin-transform-builtin-extend": "^1.1.2",
     "eslint": "^3.19.0",
     "jest": "^20.0.1"
   },
@@ -22,6 +23,11 @@
   "babel": {
     "presets": [
       "env"
+    ],
+    "plugins": [
+      ["babel-plugin-transform-builtin-extend", {
+        "globals": ["Error"]
+      }]
     ]
   },
   "scripts": {

data/tracks/ecmascript/exercises/series/package.json

@@ -11,6 +11,7 @@
   "devDependencies": {
     "babel-jest": "^20.0.1",
     "babel-preset-env": "^1.4.0",
+    "babel-plugin-transform-builtin-extend": "^1.1.2",
     "eslint": "^3.19.0",
     "jest": "^20.0.1"
   },
@@ -22,6 +23,11 @@
   "babel": {
     "presets": [
       "env"
+    ],
+    "plugins": [
+      ["babel-plugin-transform-builtin-extend", {
+        "globals": ["Error"]
+      }]
     ]
   },
   "scripts": {

data/tracks/ecmascript/exercises/sieve/package.json

@@ -11,6 +11,7 @@
   "devDependencies": {
     "babel-jest": "^20.0.1",
     "babel-preset-env": "^1.4.0",
+    "babel-plugin-transform-builtin-extend": "^1.1.2",
     "eslint": "^3.19.0",
     "jest": "^20.0.1"
   },
@@ -22,6 +23,11 @@
   "babel": {
     "presets": [
       "env"
+    ],
+    "plugins": [
+      ["babel-plugin-transform-builtin-extend", {
+        "globals": ["Error"]
+      }]
     ]
   },
   "scripts": {

data/tracks/ecmascript/exercises/simple-cipher/package.json

@@ -11,6 +11,7 @@
   "devDependencies": {
     "babel-jest": "^20.0.1",
     "babel-preset-env": "^1.4.0",
+    "babel-plugin-transform-builtin-extend": "^1.1.2",
     "eslint": "^3.19.0",
     "jest": "^20.0.1"
   },
@@ -22,6 +23,11 @@
   "babel": {
     "presets": [
       "env"
+    ],
+    "plugins": [
+      ["babel-plugin-transform-builtin-extend", {
+        "globals": ["Error"]
+      }]
     ]
   },
   "scripts": {

data/tracks/ecmascript/exercises/space-age/package.json

@@ -11,6 +11,7 @@
   "devDependencies": {
     "babel-jest": "^20.0.1",
     "babel-preset-env": "^1.4.0",
+    "babel-plugin-transform-builtin-extend": "^1.1.2",
     "eslint": "^3.19.0",
     "jest": "^20.0.1"
   },
@@ -22,6 +23,11 @@
   "babel": {
     "presets": [
       "env"
+    ],
+    "plugins": [
+      ["babel-plugin-transform-builtin-extend", {
+        "globals": ["Error"]
+      }]
     ]
   },
   "scripts": {

data/tracks/ecmascript/exercises/strain/package.json

@@ -11,6 +11,7 @@
   "devDependencies": {
     "babel-jest": "^20.0.1",
     "babel-preset-env": "^1.4.0",
+    "babel-plugin-transform-builtin-extend": "^1.1.2",
     "eslint": "^3.19.0",
     "jest": "^20.0.1"
   },
@@ -22,6 +23,11 @@
   "babel": {
     "presets": [
       "env"
+    ],
+    "plugins": [
+      ["babel-plugin-transform-builtin-extend", {
+        "globals": ["Error"]
+      }]
     ]
   },
   "scripts": {

data/tracks/ecmascript/exercises/sum-of-multiples/package.json

@@ -11,6 +11,7 @@
   "devDependencies": {
     "babel-jest": "^20.0.1",
     "babel-preset-env": "^1.4.0",
+    "babel-plugin-transform-builtin-extend": "^1.1.2",
     "eslint": "^3.19.0",
     "jest": "^20.0.1"
   },
@@ -22,6 +23,11 @@
   "babel": {
     "presets": [
       "env"
+    ],
+    "plugins": [
+      ["babel-plugin-transform-builtin-extend", {
+        "globals": ["Error"]
+      }]
     ]
   },
   "scripts": {

data/tracks/ecmascript/exercises/triangle/package.json

@@ -11,6 +11,7 @@
   "devDependencies": {
     "babel-jest": "^20.0.1",
     "babel-preset-env": "^1.4.0",
+    "babel-plugin-transform-builtin-extend": "^1.1.2",
     "eslint": "^3.19.0",
     "jest": "^20.0.1"
   },
@@ -22,6 +23,11 @@
   "babel": {
     "presets": [
       "env"
+    ],
+    "plugins": [
+      ["babel-plugin-transform-builtin-extend", {
+        "globals": ["Error"]
+      }]
     ]
   },
   "scripts": {

data/tracks/ecmascript/exercises/trinary/package.json

@@ -11,6 +11,7 @@
   "devDependencies": {
     "babel-jest": "^20.0.1",
     "babel-preset-env": "^1.4.0",
+    "babel-plugin-transform-builtin-extend": "^1.1.2",
     "eslint": "^3.19.0",
     "jest": "^20.0.1"
   },
@@ -22,6 +23,11 @@
   "babel": {
     "presets": [
       "env"
+    ],
+    "plugins": [
+      ["babel-plugin-transform-builtin-extend", {
+        "globals": ["Error"]
+      }]
     ]
   },
   "scripts": {

data/tracks/ecmascript/exercises/two-bucket/package.json

@@ -11,6 +11,7 @@
   "devDependencies": {
     "babel-jest": "^20.0.1",
     "babel-preset-env": "^1.4.0",
+    "babel-plugin-transform-builtin-extend": "^1.1.2",
     "eslint": "^3.19.0",
     "jest": "^20.0.1"
   },
@@ -22,6 +23,11 @@
   "babel": {
     "presets": [
       "env"
+    ],
+    "plugins": [
+      ["babel-plugin-transform-builtin-extend", {
+        "globals": ["Error"]
+      }]
     ]
   },
   "scripts": {

data/tracks/ecmascript/exercises/word-count/package.json

@@ -11,6 +11,7 @@
   "devDependencies": {
     "babel-jest": "^20.0.1",
     "babel-preset-env": "^1.4.0",
+    "babel-plugin-transform-builtin-extend": "^1.1.2",
     "eslint": "^3.19.0",
     "jest": "^20.0.1"
   },
@@ -22,6 +23,11 @@
   "babel": {
     "presets": [
       "env"
+    ],
+    "plugins": [
+      ["babel-plugin-transform-builtin-extend", {
+        "globals": ["Error"]
+      }]
     ]
   },
   "scripts": {

data/tracks/ecmascript/exercises/wordy/package.json

@@ -11,6 +11,7 @@
   "devDependencies": {
     "babel-jest": "^20.0.1",
     "babel-preset-env": "^1.4.0",
+    "babel-plugin-transform-builtin-extend": "^1.1.2",
     "eslint": "^3.19.0",
     "jest": "^20.0.1"
   },
@@ -22,6 +23,11 @@
   "babel": {
     "presets": [
       "env"
+    ],
+    "plugins": [
+      ["babel-plugin-transform-builtin-extend", {
+        "globals": ["Error"]
+      }]
     ]
   },
   "scripts": {

data/tracks/ecmascript/package.json

@@ -11,6 +11,7 @@
   "devDependencies": {
     "babel-jest": "^20.0.1",
     "babel-preset-env": "^1.4.0",
+    "babel-plugin-transform-builtin-extend": "^1.1.2",
     "eslint": "^3.19.0",
     "jest": "^20.0.1"
   },
@@ -22,6 +23,11 @@
   "babel": {
     "presets": [
       "env"
+    ],
+    "plugins": [
+      ["babel-plugin-transform-builtin-extend", {
+        "globals": ["Error"]
+      }]
     ]
   },
   "scripts": {

data/tracks/ecmascript/yarn.lock

@@ -354,6 +354,13 @@ babel-plugin-transform-async-to-generator@^6.22.0:
     babel-plugin-syntax-async-functions "^6.8.0"
     babel-runtime "^6.22.0"
 
+babel-plugin-transform-builtin-extend@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-builtin-extend/-/babel-plugin-transform-builtin-extend-1.1.2.tgz#5e96fecf58b8fa1ed74efcad88475b2af3c9116e"
+  dependencies:
+    babel-runtime "^6.2.0"
+    babel-template "^6.3.0"
+
 babel-plugin-transform-es2015-arrow-functions@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
@@ -595,14 +602,14 @@ babel-register@^6.24.1:
     mkdirp "^0.5.1"
     source-map-support "^0.4.2"
 
-babel-runtime@^6.18.0, babel-runtime@^6.22.0:
+babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b"
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
-babel-template@^6.16.0, babel-template@^6.24.1:
+babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.3.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.24.1.tgz#04ae514f1f93b3a2537f2a0f60a5a45fb8308333"
   dependencies:

data/tracks/go/README.md

@@ -31,10 +31,9 @@ find low hanging typo problems. [#570](https://github.com/exercism/xgo/pull/570)
 
 ## Contributing Guide
 
-Please be familiar with the [contributing guide](https://github.com/exercism/x-common/blob/master/CONTRIBUTING.md)
-in the x-common repository.  This describes how all the language tracks are put together, as well as details about
-the common metadata, and high-level information about contributing to existing problems and adding new problems.
-In particular, please read the [Pull Request Guidelines](https://github.com/exercism/x-common/blob/master/CONTRIBUTING.md#pull-request-guidelines) before opening a pull request.
+Please be familiar with the [contributing guide](https://github.com/exercism/docs/tree/master/contributing-to-language-tracks)
+in the docs repository.  This describes some great ways to get involved.
+In particular, please read the [Pull Request Guidelines](https://github.com/exercism/docs/blob/master/contributing-to-language-tracks/pull-request-guidelines.md) before opening a pull request.
 
 ## xgo style
 

data/tracks/haskell/README.md

@@ -33,7 +33,7 @@ In any case, don't be afraid or shy! We promise to be friendly and as helpful as
 possible.
 
 ### How to contribute
-As a first step we recommend you read the [contributing guide](https://github.com/exercism/x-common/blob/master/CONTRIBUTING.md).
+As a first step we recommend you read the [contributing documentation](https://github.com/exercism/docs/tree/master/contributing-to-language-tracks).
 
 #### Reporting or fixing bugs
 Typical examples for a bug: A typo, a missing test case, an unclear or ambiguous

data/tracks/java/.gitignore

@@ -8,5 +8,4 @@ build/
 *.iml
 bin/configlet
 bin/configlet.exe
-gradle/
 /exercises/.nb-gradle/

data/tracks/java/.travis.yml

@@ -13,7 +13,7 @@ notifications:
 
 # http://docs.travis-ci.com/user/migrating-from-legacy
 sudo: false
-cache: bundler
+
 addons:
   apt:
     packages:
@@ -24,9 +24,23 @@ before_install:
   - rvm use 2.2.5
   - bin/build-jq.sh  # we want jq 1.5 features; not avail through pkg repo.
 
+# https://docs.travis-ci.com/user/customizing-the-build#Skipping-the-Installation-Step
+install: true  # if we don't skip install, ./gradlew assemble is invoked, but this task is not available.
+
 before_script:
   - export PATH=$TRAVIS_BUILD_DIR/bin:$PATH  # ensure our tools are prefered over included ones.
 
 script:
   - bin/unit-tests.sh
   - bin/journey-test.sh
+
+# configure caching (https://docs.travis-ci.com/user/languages/java/#Caching)
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+# format from https://docs.travis-ci.com/user/caching/#Enabling-multiple-caching-features
+cache:
+  bundler: true
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/

data/tracks/java/bin/journey-test.sh

@@ -59,7 +59,7 @@ clean() {
     rm -rf "${build_path}"
   fi
   cd exercises
-  gradle clean
+  "$EXECPATH"/gradlew clean
   cd ..
   echo "<<< clean()"
 }
@@ -227,12 +227,12 @@ solve_all_exercises() {
 
     pushd ${exercism_exercises_dir}/java/${exercise}
     # Check that tests compile before we strip @Ignore annotations
-    gradle compileTestJava
+    "$EXECPATH"/gradlew compileTestJava
     # Ensure we run all the tests (as delivered, all but the first is @Ignore'd)
     for testfile in `find . -name "*Test.java"`; do
       sed 's/@Ignore\(.*\)//' ${testfile} > "${tempfile}" && mv "${tempfile}" "${testfile}"
     done
-    gradle test
+    "$EXECPATH"/gradlew test
     popd
 
     current_exercise_number=$((current_exercise_number + 1))
@@ -256,7 +256,6 @@ main() {
   local xapi_port=9292
 
   # fail fast if required binaries are not installed.
-  assert_installed "gradle"
   assert_installed "jq"
 
   clean "${build_dir}"

data/tracks/java/bin/unit-tests.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-gradle --version
+./gradlew --version
 
 echo ""
 echo ">>> Running configlet..."
@@ -10,6 +10,6 @@ bin/configlet .
 pushd exercises
 echo ""
 echo ">>> Running tests..."
-TERM=dumb gradle check compileStarterSourceJava --continue
+TERM=dumb ../gradlew check compileStarterSourceJava --continue
 popd