Scala mainline/master

• 

  Andrew Brett 06 Oct 2015 e7339b42f4f1efd920e90bb22d3037f88fed17a4

  Enable 64-bit zip mode, since otherwise the shadow jar is too large
  [SCALA-16]

  • Scala/build.gradle (version e7339b42f4f1efd920e90bb22d3037f88fed17a4) (diffs)
• 

  Andrew Brett 06 Oct 2015 9023cfd3cf420438ae795cee6ce41e750071e14d

  Merge branch 'dev' into feature/SCALA-16-apache-spark
• 

  Andrew Brett 06 Oct 2015 8649d2d9c0c9bbcae3ec6337eb98c6a1f33eac93 m

  Merge pull request #51 in SCALA/mainline from feature/SCALA-11-minor-changes to dev
  * commit '24c6d8da2c1dd90c8c47c63509489711f1bc8062':
    Added shapeless TypeCase examples
    Changes to improve intellij interaction
    Added akka typed example
    Fixed tab vs. space indentation
• 

  Andrew Brett 06 Oct 2015 24c6d8da2c1dd90c8c47c63509489711f1bc8062 m

  Added shapeless TypeCase examples
  [SCALA-11]

  • Scala/src/main/scala/org/bretts/scala/lib/shapeless/TypeCases.scala (version 24c6d8da2c1dd90c8c47c63509489711f1bc8062) (diffs)
• 

  Andrew Brett 06 Oct 2015 f15c7f864555f472ff37fff7e344c16b627c8764 m

  Changes to improve intellij interaction
  [SCALA-11]

  • build.gradle (version f15c7f864555f472ff37fff7e344c16b627c8764) (diffs)
• 

  Andrew Brett 06 Oct 2015 072982f132244e30920f1cc961757ff60ffa40f6 m

  Added akka typed example
  [SCALA-11]

  • Scala/build.gradle (version 072982f132244e30920f1cc961757ff60ffa40f6) (diffs)
  • Scala/src/main/scala/org/bretts/scala/actors/akka/OldTypedActors.scala (version 072982f132244e30920f1cc961757ff60ffa40f6) (diffs)
  • Scala/src/main/scala/org/bretts/scala/actors/akka/Typed.scala (version 072982f132244e30920f1cc961757ff60ffa40f6) (diffs)
• 

  Andrew Brett 06 Oct 2015 6c9b1943a8df80a9fbb270cd3eda45ddb28239a4 m

  Fixed tab vs. space indentation
  [SCALA-11]

  • Scala/build.gradle (version 6c9b1943a8df80a9fbb270cd3eda45ddb28239a4) (diffs)
  • build.gradle (version 6c9b1943a8df80a9fbb270cd3eda45ddb28239a4) (diffs)
• 

  Andrew Brett 06 Oct 2015 f61622bb0bc6aa5ce43cc2d5bd3c195f8a86e3a2 m

  Merge branch 'dev' into feature/SCALA-11-minor-changes
• 

  Andrew Brett 06 Oct 2015 0ba1c1ba6f1967d469fbc4d475e07ff4cc546e39 m

  Merge pull request #50 in SCALA/mainline from feature/SCALA-11-minor-changes to dev
  * commit '5460f2c9d3c0aac0abd6c7b265e182fe9f4d5ebf':
    Updated readme to reflect new gradle version
    Improved Map examples
• 

  Andrew Brett 06 Oct 2015 78559cd52dbc4a9b9070c1931001415ffb5fbdb7 m

  Merge pull request #49 in SCALA/mainline from feature/SCALA-15-exercises to dev
  * commit '1257493a5ee94b676679165fe385750d420e9f91':
    Added MSIB example
• 

  Andrew Brett 06 Oct 2015 930ce1e372e45f3eaaaa849548cb6e9660354973 m

  Merge pull request #48 in SCALA/mainline from feature/SCALA-12-upgrade-to-latest-dependencies to dev
  * commit '5c6e35f7cb8bf617a2041c976f62bde9c26ad1b2':
    Update to akka 2.4.0
• 

  Andrew Brett 02 Oct 2015 9d6d43e9da97de39e7551b3fb309bf5b06e318a6 m

  Merge branch 'dev' into feature/SCALA-11-minor-changes
• 

  Andrew Brett 02 Oct 2015 5c6e35f7cb8bf617a2041c976f62bde9c26ad1b2 m

  Update to akka 2.4.0
  [SCALA-12]

  • Scala/build.gradle (version 5c6e35f7cb8bf617a2041c976f62bde9c26ad1b2) (diffs)
• 

  Andrew Brett 08 Sep 2015 1257493a5ee94b676679165fe385750d420e9f91 m

  Merge branch 'dev' into feature/SCALA-15-exercises
• 

  Andrew Brett 08 Sep 2015 2d7ba02455938bfc26e6590be193b5305e20511e m

  Merge pull request #47 in SCALA/mainline from feature/SCALA-14-stricter-scala-checks to dev
  * commit 'cd2df6ee767d78e7d8dde6aa80471148ad1c8117':
    Detect extra warnings from scalac
• 

  Andrew Brett 08 Sep 2015 46e9134b84b81fb3ea0bcd772b35617ccd445bc8 m

  Merge branch 'dev' into feature/SCALA-15-exercises
• 

  Andrew Brett 03 Sep 2015 5460f2c9d3c0aac0abd6c7b265e182fe9f4d5ebf m

  Updated readme to reflect new gradle version
  [SCALA-11]

  • README.md (version 5460f2c9d3c0aac0abd6c7b265e182fe9f4d5ebf) (diffs)
• 

  Andrew Brett 03 Sep 2015 8b42fe5bcd54be1a23845165168ace96ac3be787 m

  Improved Map examples
  [SCALA-11]

  • Scala/src/main/scala/org/bretts/scala/collections/Maps.scala (version 8b42fe5bcd54be1a23845165168ace96ac3be787) (diffs)
• 

  Andrew Brett 03 Sep 2015 cd2df6ee767d78e7d8dde6aa80471148ad1c8117 m

  Detect extra warnings from scalac
  [SCALA-14]

  • Scala Macros/src/main/scala/org/bretts/scala/macros/Printf.scala (version cd2df6ee767d78e7d8dde6aa80471148ad1c8117) (diffs)
  • Scala/src/main/scala/org/bretts/scala/actors/akka/AkkaActors.scala (version cd2df6ee767d78e7d8dde6aa80471148ad1c8117) (diffs)
  • Scala/src/main/scala/org/bretts/scala/actors/akka/Pi.scala (version cd2df6ee767d78e7d8dde6aa80471148ad1c8117) (diffs)
  • Scala/src/main/scala/org/bretts/scala/actors/akka/Typed.scala (version cd2df6ee767d78e7d8dde6aa80471148ad1c8117) (diffs)
  • Scala/src/main/scala/org/bretts/scala/actors/akka/package.scala (version cd2df6ee767d78e7d8dde6aa80471148ad1c8117) (diffs)
  • Scala/src/main/scala/org/bretts/scala/actors/akka/remote/MasterNode.scala (version cd2df6ee767d78e7d8dde6aa80471148ad1c8117) (diffs)
  • Scala/src/main/scala/org/bretts/scala/functions/ByNameVsUnitFunction.scala (version cd2df6ee767d78e7d8dde6aa80471148ad1c8117) (diffs)
  • Scala/src/main/scala/org/bretts/scala/generics/Variance.scala (version cd2df6ee767d78e7d8dde6aa80471148ad1c8117) (diffs)
  • Scala/src/main/scala/org/bretts/scala/lib/akka/streams/AkkaStreams.scala (version cd2df6ee767d78e7d8dde6aa80471148ad1c8117) (diffs)
  • Scala/src/main/scala/org/bretts/scala/lib/akka/streams/Callbacks.scala (version cd2df6ee767d78e7d8dde6aa80471148ad1c8117) (diffs)
  • Scala/src/main/scala/org/bretts/scala/lib/shapeless/PolymorphicFunctions.scala (version cd2df6ee767d78e7d8dde6aa80471148ad1c8117) (diffs)
  • Scala/src/test/scala/org/bretts/scala/designpatterns/MagnetsTest.scala (version cd2df6ee767d78e7d8dde6aa80471148ad1c8117) (diffs)
  • Scala/src/test/scala/org/bretts/scala/lib/rxscala/comparison/ScalaObservables.scala (version cd2df6ee767d78e7d8dde6aa80471148ad1c8117) (diffs)
  • Scala/src/test/scala/org/bretts/scala/lib/rxscala/contract/RxContract.scala (version cd2df6ee767d78e7d8dde6aa80471148ad1c8117) (diffs)
  • Scala/src/test/scala/org/bretts/scala/lib/rxscala/contract/SynchronousContract.scala (version cd2df6ee767d78e7d8dde6aa80471148ad1c8117) (diffs)
  • Scala/src/test/scala/org/bretts/scala/lib/rxscala/contract/package.scala (version cd2df6ee767d78e7d8dde6aa80471148ad1c8117) (diffs)
  • build.gradle (version cd2df6ee767d78e7d8dde6aa80471148ad1c8117) (diffs)
• 

  Andrew Brett 03 Sep 2015 f1aa47ab166d9fbe806198a362b5ad4ea55d43cc m

  Merge pull request #45 in SCALA/mainline from feature/SCALA-11-minor-changes to dev
  * commit 'fe7503b0f190b8b52b7ae8d9407db9107e1757aa':
    Added newline at EOF for Scala scratch file
    Added simple JUnit example
    Corrected MagnetsTest class name
    Made Scala an object (was incorrectly a class)
• 

  Andrew Brett 03 Sep 2015 4a98e595523bf16b490a2bc9d919235d5a9c33fa m

  Merge pull request #46 in SCALA/mainline from feature/SCALA-12-upgrade-to-latest-dependencies to dev
  * commit 'b28198f5ef119c2d54c33eba669376be1646b012':
    Ignore unstable test
    Upgrade to latest deps (scala-async, shapeless, scalatest & jmh)
    Upgrade to scala 2.11.7
• 

  Andrew Brett 03 Sep 2015 b28198f5ef119c2d54c33eba669376be1646b012 m

  Ignore unstable test
  [SCALA-12]

  • Scala/src/test/scala/org/bretts/scala/lib/rxscala/contract/RxContract.scala (version b28198f5ef119c2d54c33eba669376be1646b012) (diffs)
• 

  Andrew Brett 03 Sep 2015 3633976d63597a7077c1e38fdb502043006a1c83 m

  Upgrade to latest deps (scala-async, shapeless, scalatest & jmh)
  [SCALA-12]

  • Scala/build.gradle (version 3633976d63597a7077c1e38fdb502043006a1c83) (diffs)
• 

  Andrew Brett 03 Sep 2015 926cc5a339631c2d8cc8d013cea0e61c8be1c106 m

  Upgrade to scala 2.11.7
  [SCALA-12]

  • build.gradle (version 926cc5a339631c2d8cc8d013cea0e61c8be1c106) (diffs)
• 

  Andrew Brett 03 Sep 2015 fe7503b0f190b8b52b7ae8d9407db9107e1757aa m

  Added newline at EOF for Scala scratch file
  [SCALA-11]

  • Scala/src/main/scala/org/bretts/scala/scratch/Scala.scala (version fe7503b0f190b8b52b7ae8d9407db9107e1757aa) (diffs)
• 

  Andrew Brett 03 Sep 2015 bc6db9f7cfb63f66afc8197ea32110b0a19275ae m

  Added simple JUnit example
  [SCALA-11]

  • Scala/src/test/scala/org/bretts/scala/lib/junit/JUnitExample.scala (version bc6db9f7cfb63f66afc8197ea32110b0a19275ae) (diffs)
• 

  Andrew Brett 03 Sep 2015 f7c30b96ea7b78da204d24e2975b0deeef394e4b m

  Merge branch 'dev' into feature/SCALA-11-minor-changes
  Conflicts:
          Scala/src/main/scala/org/bretts/scala/scratch/Scala.scala
• 

  Andrew Brett 03 Sep 2015 3a0b793e787d9fc5b592db16647be4320afd29be m

  Corrected MagnetsTest class name
  [SCALA-11]

  • Scala/src/test/scala/org/bretts/scala/designpatterns/MagnetsTest.scala (version 3a0b793e787d9fc5b592db16647be4320afd29be) (diffs)
• 

  Andrew Brett 03 Sep 2015 3548bfd5ea85c7287b2c161d4f988df15db06d6d m

  Merge pull request #44 in SCALA/mainline from feature/SCALA-17-intellij-integration to dev
  * commit '86dfcbe06353e7535cefb91b74edf36f62702edf':
    Create single definition for java major version
    Added intellij integration
• 

  Andrew Brett 03 Sep 2015 86dfcbe06353e7535cefb91b74edf36f62702edf m

  Create single definition for java major version
  [SCALA-17]

  • build.gradle (version 86dfcbe06353e7535cefb91b74edf36f62702edf) (diffs)
• 

  Andrew Brett 03 Sep 2015 cbd48df5647090c19a6bc157ac3221b309e3c724 m

  Added intellij integration
  [SCALA-17]

  • .gitignore (version cbd48df5647090c19a6bc157ac3221b309e3c724) (diffs)
  • build.gradle (version cbd48df5647090c19a6bc157ac3221b309e3c724) (diffs)
• 

  Andrew Brett 03 Sep 2015 3d1d5b51c38027828b7853f786adbb13f8f218e3 m

  Merge pull request #43 in SCALA/mainline from feature/SCALA-12-upgrade-to-latest-dependencies to dev
  * commit 'c192cc3bb789f58f6e9faef2022a25d49a7b3078':
    Upgrade to akka 2.4.0-RC1
    Fixed errors/warnings resulting from latest dependency upgrade
    Upgrade to latest deps
    Remove unhelpful example given latest akka-streams
    Upgraded dependencies to latest versions (including changes required for akka-streams 1.0-RC1)
• 

  Andrew Brett 03 Sep 2015 c192cc3bb789f58f6e9faef2022a25d49a7b3078 m

  Upgrade to akka 2.4.0-RC1
  [SCALA-12]

  • Scala/build.gradle (version c192cc3bb789f58f6e9faef2022a25d49a7b3078) (diffs)
  • Scala/src/main/scala/org/bretts/scala/actors/akka/AkkaActors.scala (version c192cc3bb789f58f6e9faef2022a25d49a7b3078) (diffs)
  • Scala/src/main/scala/org/bretts/scala/actors/akka/Pi.scala (version c192cc3bb789f58f6e9faef2022a25d49a7b3078) (diffs)
  • Scala/src/main/scala/org/bretts/scala/actors/akka/Typed.scala (version c192cc3bb789f58f6e9faef2022a25d49a7b3078) (diffs)
  • Scala/src/main/scala/org/bretts/scala/lib/akka/actor/Inheritance.scala (version c192cc3bb789f58f6e9faef2022a25d49a7b3078) (diffs)
  • Scala/src/main/scala/org/bretts/scala/lib/akka/actor/Routing.scala (version c192cc3bb789f58f6e9faef2022a25d49a7b3078) (diffs)
  • Scala/src/main/scala/org/bretts/scala/lib/akka/streams/AkkaStreams.scala (version c192cc3bb789f58f6e9faef2022a25d49a7b3078) (diffs)
  • Scala/src/main/scala/org/bretts/scala/lib/akka/streams/Callbacks.scala (version c192cc3bb789f58f6e9faef2022a25d49a7b3078) (diffs)
• 

  Andrew Brett 18 Aug 2015 9d0eb3ca0790f7a253f8258b41a72d0ddc1f32e4 m

  Fixed errors/warnings resulting from latest dependency upgrade
  [SCALA-12]

  • Scala/src/main/scala/org/bretts/scala/lib/shapeless/Typeables.scala (version 9d0eb3ca0790f7a253f8258b41a72d0ddc1f32e4) (diffs)
  • Scala/src/main/scala/org/bretts/scala/patterns/GenericsPatterns.scala (version 9d0eb3ca0790f7a253f8258b41a72d0ddc1f32e4) (diffs)
  • Scala/src/main/scala/org/bretts/scala/xml/Transforms.scala (version 9d0eb3ca0790f7a253f8258b41a72d0ddc1f32e4) (diffs)
• 

  Andrew Brett 18 Aug 2015 ca60a3eebddb7201be5f16e645d56053dec11f28 m

  Made Scala an object (was incorrectly a class)
  [SCALA-11]

  • Scala/src/main/scala/org/bretts/scala/scratch/Scala.scala (version ca60a3eebddb7201be5f16e645d56053dec11f28) (diffs)
• 

  Andrew Brett 18 Aug 2015 79289ccb1a5e7793b587da92bf9b510066be5af4 m

  Added MSIB example
  [SCALA-15]

  • Scala/src/main/scala/org/bretts/scala/examples/MSIB.scala (version 79289ccb1a5e7793b587da92bf9b510066be5af4) (diffs)
• 

  Andrew Brett 17 Jul 2015 f4a4ac51d680920384c748184a54dec245ad8c7e m

  Upgrade to latest deps
  [SCALA-12]

  • Scala/build.gradle (version f4a4ac51d680920384c748184a54dec245ad8c7e) (diffs)
  • Scala/src/main/scala/org/bretts/scala/lib/akka/streams/AkkaStreams.scala (version f4a4ac51d680920384c748184a54dec245ad8c7e) (diffs)
  • Scala/src/main/scala/org/bretts/scala/lib/akka/streams/Callbacks.scala (version f4a4ac51d680920384c748184a54dec245ad8c7e) (diffs)
• 

  Andrew Brett 28 Apr 2015 5ec1ec7807bdf7c249b1e08b5aca602e80e48fb9 m

  Remove unhelpful example given latest akka-streams
  [SCALA-12]

  • Scala/src/main/scala/org/bretts/scala/lib/akka/streams/AkkaStreams.scala (version 5ec1ec7807bdf7c249b1e08b5aca602e80e48fb9) (diffs)
• 

  Andrew Brett 28 Apr 2015 833f93bdb5e4de859f64fbfb582fc6b9dc61997c m

  Upgraded dependencies to latest versions (including changes required for akka-streams 1.0-RC1)
  [SCALA-12]

  • Scala/build.gradle (version 833f93bdb5e4de859f64fbfb582fc6b9dc61997c) (diffs)
  • Scala/src/main/scala/org/bretts/scala/lib/akka/streams/AkkaStreams.scala (version 833f93bdb5e4de859f64fbfb582fc6b9dc61997c) (diffs)
  • Scala/src/main/scala/org/bretts/scala/lib/akka/streams/Callbacks.scala (version 833f93bdb5e4de859f64fbfb582fc6b9dc61997c) (diffs)