Commits

Comparison is available only for releases created from the same branch as this release.

This release
Showing 100 of 108 code changes
Author Commit Message Commit date
Andrew Brett Andrew Brett 05c41ca78e9a81d3913fc62e8864bdf763aaba1d 05c41ca78e9a81d3913fc62e8864bdf763aaba1d Merge pull request #62 in SCALA/mainline from dev to master
Merge dev to master

* commit '444f6241fe57d3b8064262632d5e04d417cf884d': (61 commits)
  Upgraded to cats 0.4.0.
  Fixed codacy warnings
  Added cats examples
  Upgrade to latest dependency versions
  Convert tabs to spaces (no change to content)
  Upgrade to scalactic 3.0.0-M15
  Updated to akka-streams 2.0
  Added more typetag examples
  Improved typetag examples
  Improved scala-async example
  Handle nulls more elegantly in logging bootstrapping
  Move shadow plugin definition into Core
  Tidied up akka examples
  Use SimpleApp for scala scratchpad
  Added prototype node API
  Tweaked logging format
  Improved log configuration methods
  Add scoverage tasks to gradle
  Added sbt build scripts
  Don't output macro debugging information (in theory this is usable by IntelliJ, but that feature doesn't seem to work)
  ...
Andrew Brett Andrew Brett 444f6241fe57d3b8064262632d5e04d417cf884d 444f6241fe57d3b8064262632d5e04d417cf884d Merge pull request #61 in SCALA/mainline from feature/SCALA-12-upgrade-to-latest-dependencies to dev
Upgraded to cats 0.4.0

* commit '287ee2aae97d3490146a5d1f29732cb40bbf8b86':
  Upgraded to cats 0.4.0.
Andrew Brett Andrew Brett 287ee2aae97d3490146a5d1f29732cb40bbf8b86 287ee2aae97d3490146a5d1f29732cb40bbf8b86 Upgraded to cats 0.4.0.
Also changed to use cats-provided some and none, and scalatest ===

[SCALA-12]
Andrew Brett Andrew Brett 6c12a2e31cc6432b17907d9253971abd98dbe957 6c12a2e31cc6432b17907d9253971abd98dbe957 Merge pull request #60 in SCALA/mainline from feature/SCALA-19-codacy-warnings to dev
* commit '47f910cfd113d62a03d5521aa38a7bc1ae1dd723':
  Fixed codacy warnings
Andrew Brett Andrew Brett 47f910cfd113d62a03d5521aa38a7bc1ae1dd723 47f910cfd113d62a03d5521aa38a7bc1ae1dd723 Fixed codacy warnings
[SCALA-19]
Andrew Brett Andrew Brett 6fda2523d02382d0646dcae99d67d5e128991230 6fda2523d02382d0646dcae99d67d5e128991230 Merge pull request #59 in SCALA/mainline from feature/SCALA-22-cats to dev
Added cats examples

* commit 'cb9d712e5767150a5592f927300de2c55ead7566':
  Added cats examples
Andrew Brett Andrew Brett cb9d712e5767150a5592f927300de2c55ead7566 cb9d712e5767150a5592f927300de2c55ead7566 Added cats examples
[SCALA-22]
Andrew Brett Andrew Brett 4d6eb299e2a4271955f5d9e6301003aec3fb5e7b 4d6eb299e2a4271955f5d9e6301003aec3fb5e7b Merge pull request #58 in SCALA/mainline from feature/SCALA-12-upgrade-to-latest-dependencies to dev
Upgrade to latest dependencies

* commit 'e1ec29b631b9e6679bef3f876b37b2912928a014':
  Upgrade to latest dependency versions
  Convert tabs to spaces (no change to content)
  Upgrade to scalactic 3.0.0-M15
  Updated to akka-streams 2.0
Andrew Brett Andrew Brett e1ec29b631b9e6679bef3f876b37b2912928a014 e1ec29b631b9e6679bef3f876b37b2912928a014 Upgrade to latest dependency versions
[SCALA-12]
Andrew Brett Andrew Brett 1947e62f3758f4e5e2be58cc29ad6555db2f27a9 1947e62f3758f4e5e2be58cc29ad6555db2f27a9 Convert tabs to spaces (no change to content)
[SCALA-12]
Andrew Brett Andrew Brett 64b14b39e10cac19404f3e0df4d4b73e07955055 64b14b39e10cac19404f3e0df4d4b73e07955055 Upgrade to scalactic 3.0.0-M15
[SCALA-12]
Andrew Brett Andrew Brett 318e682335ca0653134eac16d6487329ba4f2c4f 318e682335ca0653134eac16d6487329ba4f2c4f Updated to akka-streams 2.0
[SCALA-12]
Andrew Brett Andrew Brett fff58c40c886d9dea8c3fbbfae8f9c6315babcb7 fff58c40c886d9dea8c3fbbfae8f9c6315babcb7 Merge pull request #57 in SCALA/mainline from feature/SCALA-11-minor-changes to dev
Minor changes

* commit 'c06ba9d47983622a8a3c708946634bea3d8c9291':
  Added more typetag examples
  Improved typetag examples
  Improved scala-async example
  Handle nulls more elegantly in logging bootstrapping
  Move shadow plugin definition into Core
  Tidied up akka examples
  Use SimpleApp for scala scratchpad
  Added prototype node API
  Tweaked logging format
  Improved log configuration methods
Andrew Brett Andrew Brett c06ba9d47983622a8a3c708946634bea3d8c9291 c06ba9d47983622a8a3c708946634bea3d8c9291 Added more typetag examples
[SCALA-11]
Andrew Brett Andrew Brett 676f867a712d38e691e2783322983d6dcb6e4ae2 676f867a712d38e691e2783322983d6dcb6e4ae2 Improved typetag examples
[SCALA-11]
Andrew Brett Andrew Brett f8d63f1564406429949838f2d94f905f9d516d3e f8d63f1564406429949838f2d94f905f9d516d3e Improved scala-async example
[SCALA-11]
Andrew Brett Andrew Brett f35a3e6012ab692c47c6e66a353b5f2356f22c08 f35a3e6012ab692c47c6e66a353b5f2356f22c08 Handle nulls more elegantly in logging bootstrapping
[SCALA-11]
Andrew Brett Andrew Brett 4833170f968d593c1f459559c1d15a3bf7df9567 4833170f968d593c1f459559c1d15a3bf7df9567 Move shadow plugin definition into Core
[SCALA-11]
Andrew Brett Andrew Brett 2ed05e2a780111ae7cd0fa9766dab1216fdbe634 2ed05e2a780111ae7cd0fa9766dab1216fdbe634 Tidied up akka examples
[SCALA-11]
Andrew Brett Andrew Brett 838d000f2a75f3a3bfed08a5b445544b651881d7 838d000f2a75f3a3bfed08a5b445544b651881d7 Use SimpleApp for scala scratchpad
[SCALA-11]
Andrew Brett Andrew Brett 1d6e5d401a28b28f775da7e6a1cc96ac112ec694 1d6e5d401a28b28f775da7e6a1cc96ac112ec694 Added prototype node API
[SCALA-11]
Andrew Brett Andrew Brett bd873a4f13c6bd59221174a9f1aa56956398ca28 bd873a4f13c6bd59221174a9f1aa56956398ca28 Tweaked logging format
[SCALA-11]
Andrew Brett Andrew Brett f47d5c2c2535c3e7df53d2450e37d07e59d2c451 f47d5c2c2535c3e7df53d2450e37d07e59d2c451 Improved log configuration methods
[SCALA-11]
Andrew Brett Andrew Brett fd5cdb2fc83635a3e0e230258ba6433fa89a7cc3 fd5cdb2fc83635a3e0e230258ba6433fa89a7cc3 Merge pull request #54 in SCALA/mainline from feature/SCALA-18-coverage to dev
* commit 'e0c2597d65b79d16b881a21e98c80c37513c8f5a':
  Add scoverage tasks to gradle
Andrew Brett Andrew Brett e0c2597d65b79d16b881a21e98c80c37513c8f5a e0c2597d65b79d16b881a21e98c80c37513c8f5a Add scoverage tasks to gradle
[SCALA-18]
Andrew Brett Andrew Brett bffe7c60327005f9fc55a9a4813ae518495901e8 bffe7c60327005f9fc55a9a4813ae518495901e8 Merge pull request #56 in SCALA/mainline from feature/SCALA-21-sbt to dev
* commit 'dd8931bb73597a4970b944d9ae6363c69638c4c0':
  Added sbt build scripts
Andrew Brett Andrew Brett dd8931bb73597a4970b944d9ae6363c69638c4c0 dd8931bb73597a4970b944d9ae6363c69638c4c0 Added sbt build scripts
[SCALA-21]
Andrew Brett Andrew Brett d1a7ce5bcc7b9ed5eff715caacb370f7ad305771 d1a7ce5bcc7b9ed5eff715caacb370f7ad305771 Merge pull request #55 in SCALA/mainline from feature/SCALA-11-minor-changes to dev
* commit '728db71b96824a1f1c55ed5e6a989f91d3770ae1':
  Don't output macro debugging information (in theory this is usable by IntelliJ, but that feature doesn't seem to work)
  Remove repeated scalac options
  Moved scalastyle config to location in root (in a project subdir, which is where IntelliJ will look for it)
  Removed empty ActorLog trait, and changed usages to use akka ActorLogging
  Fixed scalastyle issues in Macros project
  Use akka logback.xml for akka-typed example
  Delegate log implementations to scalalogging/ActorLogging
  Add akka-slf4j dependency
  Delete old-style typed actors example
  Converted tabs to spaces
  Update akka logger config to match new syntax
  Exclude duplicated libs imported by spark
  Move non-java/scala files into src/main/resources
Andrew Brett Andrew Brett 728db71b96824a1f1c55ed5e6a989f91d3770ae1 728db71b96824a1f1c55ed5e6a989f91d3770ae1 Don't output macro debugging information (in theory this is usable by IntelliJ, but that feature doesn't seem to work)
[SCALA-11]
Andrew Brett Andrew Brett 97196fc1482c6195ae7e06c8bb9d3b11a55afa26 97196fc1482c6195ae7e06c8bb9d3b11a55afa26 Remove repeated scalac options
[SCALA-11]
Andrew Brett Andrew Brett 36de3be858b453eaf7fb50e3311932cf1f217bfb 36de3be858b453eaf7fb50e3311932cf1f217bfb Moved scalastyle config to location in root (in a project subdir, which is where IntelliJ will look for it)
[SCALA-11]
Andrew Brett Andrew Brett 24e93ff03243c899b7bb65b722e266b0b6c59076 24e93ff03243c899b7bb65b722e266b0b6c59076 Removed empty ActorLog trait, and changed usages to use akka ActorLogging
[SCALA-11]
Andrew Brett Andrew Brett 1f69b5b5e9f63490db724e8555c6c0e83a6b8f0e 1f69b5b5e9f63490db724e8555c6c0e83a6b8f0e Fixed scalastyle issues in Macros project
[SCALA-11]
Andrew Brett Andrew Brett 5de067880c7853d22a3c6f37797047c9fc7fcc8a 5de067880c7853d22a3c6f37797047c9fc7fcc8a Use akka logback.xml for akka-typed example
[SCALA-11]
Andrew Brett Andrew Brett ed559f2d96b005e2eee215a3b5a2f50f080cb332 ed559f2d96b005e2eee215a3b5a2f50f080cb332 Delegate log implementations to scalalogging/ActorLogging
[SCALA-11]
Andrew Brett Andrew Brett 85115afcbacd7d42abc84429058404bbd9bfbe8a 85115afcbacd7d42abc84429058404bbd9bfbe8a Add akka-slf4j dependency
[SCALA-11]
Andrew Brett Andrew Brett 7915943d80f573b33b1fb76c60cdf59727e0f77b 7915943d80f573b33b1fb76c60cdf59727e0f77b Delete old-style typed actors example
[SCALA-11]
Andrew Brett Andrew Brett 9d10c2fd2dc69f5c771fe2d59fe9cb09d47290b8 9d10c2fd2dc69f5c771fe2d59fe9cb09d47290b8 Converted tabs to spaces
[SCALA-11]
Andrew Brett Andrew Brett b8441dd38cf118579230064f862d3785099da7ef b8441dd38cf118579230064f862d3785099da7ef Update akka logger config to match new syntax
[SCALA-11]
Andrew Brett Andrew Brett ba2a38f1443bf401c7c4130a523b49924c00c7e2 ba2a38f1443bf401c7c4130a523b49924c00c7e2 Exclude duplicated libs imported by spark
[SCALA-11]
Andrew Brett Andrew Brett fad37eda5e82669334c6194174aabb5f9da484c7 fad37eda5e82669334c6194174aabb5f9da484c7 Move non-java/scala files into src/main/resources
[SCALA-11]
Andrew Brett Andrew Brett 08009fa289ec1c53f92ea31c5f9f57e9b31879d7 08009fa289ec1c53f92ea31c5f9f57e9b31879d7 Merge pull request #53 in SCALA/mainline from feature/SCALA-20-project-rename to dev
* commit 'c8e295736e09a8604a491eb1310e896e3d62b29a':
  Rename 'Scala' -> 'Core' and 'Scala Macros' -> 'Macros'
Andrew Brett Andrew Brett c8e295736e09a8604a491eb1310e896e3d62b29a c8e295736e09a8604a491eb1310e896e3d62b29a Rename 'Scala' -> 'Core' and 'Scala Macros' -> 'Macros'
[SCALA-20]
Andrew Brett Andrew Brett 4d9f01b624703dfff4ad318b5dfb754bb63e7c47 4d9f01b624703dfff4ad318b5dfb754bb63e7c47 Merge pull request #52 in SCALA/mainline from feature/SCALA-16-apache-spark to dev
* commit 'e7339b42f4f1efd920e90bb22d3037f88fed17a4':
  Enable 64-bit zip mode, since otherwise the shadow jar is too large
  Explicitly type RDD
  Update to latest spark (1.3.1)
  Added logback config, and turn down logging for spark to ERROR
  Added simple Apache Spark example
Andrew Brett Andrew Brett e7339b42f4f1efd920e90bb22d3037f88fed17a4 e7339b42f4f1efd920e90bb22d3037f88fed17a4 Enable 64-bit zip mode, since otherwise the shadow jar is too large
[SCALA-16]
Andrew Brett Andrew Brett 9023cfd3cf420438ae795cee6ce41e750071e14d 9023cfd3cf420438ae795cee6ce41e750071e14d Merge branch 'dev' into feature/SCALA-16-apache-spark
Andrew Brett Andrew Brett 8649d2d9c0c9bbcae3ec6337eb98c6a1f33eac93 8649d2d9c0c9bbcae3ec6337eb98c6a1f33eac93 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 Andrew Brett 24c6d8da2c1dd90c8c47c63509489711f1bc8062 24c6d8da2c1dd90c8c47c63509489711f1bc8062 Added shapeless TypeCase examples
[SCALA-11]
Andrew Brett Andrew Brett f15c7f864555f472ff37fff7e344c16b627c8764 f15c7f864555f472ff37fff7e344c16b627c8764 Changes to improve intellij interaction
[SCALA-11]
Andrew Brett Andrew Brett 072982f132244e30920f1cc961757ff60ffa40f6 072982f132244e30920f1cc961757ff60ffa40f6 Added akka typed example
[SCALA-11]
Andrew Brett Andrew Brett 6c9b1943a8df80a9fbb270cd3eda45ddb28239a4 6c9b1943a8df80a9fbb270cd3eda45ddb28239a4 Fixed tab vs. space indentation
[SCALA-11]
Andrew Brett Andrew Brett f61622bb0bc6aa5ce43cc2d5bd3c195f8a86e3a2 f61622bb0bc6aa5ce43cc2d5bd3c195f8a86e3a2 Merge branch 'dev' into feature/SCALA-11-minor-changes
Andrew Brett Andrew Brett 0ba1c1ba6f1967d469fbc4d475e07ff4cc546e39 0ba1c1ba6f1967d469fbc4d475e07ff4cc546e39 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 Andrew Brett 78559cd52dbc4a9b9070c1931001415ffb5fbdb7 78559cd52dbc4a9b9070c1931001415ffb5fbdb7 Merge pull request #49 in SCALA/mainline from feature/SCALA-15-exercises to dev
* commit '1257493a5ee94b676679165fe385750d420e9f91':
  Added MSIB example
Andrew Brett Andrew Brett 930ce1e372e45f3eaaaa849548cb6e9660354973 930ce1e372e45f3eaaaa849548cb6e9660354973 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 Andrew Brett 9d6d43e9da97de39e7551b3fb309bf5b06e318a6 9d6d43e9da97de39e7551b3fb309bf5b06e318a6 Merge branch 'dev' into feature/SCALA-11-minor-changes
Andrew Brett Andrew Brett 5c6e35f7cb8bf617a2041c976f62bde9c26ad1b2 5c6e35f7cb8bf617a2041c976f62bde9c26ad1b2 Update to akka 2.4.0
[SCALA-12]
Andrew Brett Andrew Brett 1257493a5ee94b676679165fe385750d420e9f91 1257493a5ee94b676679165fe385750d420e9f91 Merge branch 'dev' into feature/SCALA-15-exercises
Andrew Brett Andrew Brett 2d7ba02455938bfc26e6590be193b5305e20511e 2d7ba02455938bfc26e6590be193b5305e20511e 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 Andrew Brett 46e9134b84b81fb3ea0bcd772b35617ccd445bc8 46e9134b84b81fb3ea0bcd772b35617ccd445bc8 Merge branch 'dev' into feature/SCALA-15-exercises
Andrew Brett Andrew Brett 5460f2c9d3c0aac0abd6c7b265e182fe9f4d5ebf 5460f2c9d3c0aac0abd6c7b265e182fe9f4d5ebf Updated readme to reflect new gradle version
[SCALA-11]
Andrew Brett Andrew Brett 8b42fe5bcd54be1a23845165168ace96ac3be787 8b42fe5bcd54be1a23845165168ace96ac3be787 Improved Map examples
[SCALA-11]
Andrew Brett Andrew Brett cd2df6ee767d78e7d8dde6aa80471148ad1c8117 cd2df6ee767d78e7d8dde6aa80471148ad1c8117 Detect extra warnings from scalac
[SCALA-14]
Andrew Brett Andrew Brett f1aa47ab166d9fbe806198a362b5ad4ea55d43cc f1aa47ab166d9fbe806198a362b5ad4ea55d43cc 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 Andrew Brett 4a98e595523bf16b490a2bc9d919235d5a9c33fa 4a98e595523bf16b490a2bc9d919235d5a9c33fa 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 Andrew Brett b28198f5ef119c2d54c33eba669376be1646b012 b28198f5ef119c2d54c33eba669376be1646b012 Ignore unstable test
[SCALA-12]
Andrew Brett Andrew Brett 3633976d63597a7077c1e38fdb502043006a1c83 3633976d63597a7077c1e38fdb502043006a1c83 Upgrade to latest deps (scala-async, shapeless, scalatest & jmh)
[SCALA-12]
Andrew Brett Andrew Brett 926cc5a339631c2d8cc8d013cea0e61c8be1c106 926cc5a339631c2d8cc8d013cea0e61c8be1c106 Upgrade to scala 2.11.7
[SCALA-12]
Andrew Brett Andrew Brett fe7503b0f190b8b52b7ae8d9407db9107e1757aa fe7503b0f190b8b52b7ae8d9407db9107e1757aa Added newline at EOF for Scala scratch file
[SCALA-11]
Andrew Brett Andrew Brett bc6db9f7cfb63f66afc8197ea32110b0a19275ae bc6db9f7cfb63f66afc8197ea32110b0a19275ae Added simple JUnit example
[SCALA-11]
Andrew Brett Andrew Brett f7c30b96ea7b78da204d24e2975b0deeef394e4b f7c30b96ea7b78da204d24e2975b0deeef394e4b Merge branch 'dev' into feature/SCALA-11-minor-changes
Conflicts:
        Scala/src/main/scala/org/bretts/scala/scratch/Scala.scala
Andrew Brett Andrew Brett 3a0b793e787d9fc5b592db16647be4320afd29be 3a0b793e787d9fc5b592db16647be4320afd29be Corrected MagnetsTest class name
[SCALA-11]
Andrew Brett Andrew Brett 3548bfd5ea85c7287b2c161d4f988df15db06d6d 3548bfd5ea85c7287b2c161d4f988df15db06d6d 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 Andrew Brett 86dfcbe06353e7535cefb91b74edf36f62702edf 86dfcbe06353e7535cefb91b74edf36f62702edf Create single definition for java major version
[SCALA-17]
Andrew Brett Andrew Brett cbd48df5647090c19a6bc157ac3221b309e3c724 cbd48df5647090c19a6bc157ac3221b309e3c724 Added intellij integration
[SCALA-17]
Andrew Brett Andrew Brett 3d1d5b51c38027828b7853f786adbb13f8f218e3 3d1d5b51c38027828b7853f786adbb13f8f218e3 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 Andrew Brett c192cc3bb789f58f6e9faef2022a25d49a7b3078 c192cc3bb789f58f6e9faef2022a25d49a7b3078 Upgrade to akka 2.4.0-RC1
[SCALA-12]
Andrew Brett Andrew Brett 9d0eb3ca0790f7a253f8258b41a72d0ddc1f32e4 9d0eb3ca0790f7a253f8258b41a72d0ddc1f32e4 Fixed errors/warnings resulting from latest dependency upgrade
[SCALA-12]
Andrew Brett Andrew Brett ca60a3eebddb7201be5f16e645d56053dec11f28 ca60a3eebddb7201be5f16e645d56053dec11f28 Made Scala an object (was incorrectly a class)
[SCALA-11]
Andrew Brett Andrew Brett 79289ccb1a5e7793b587da92bf9b510066be5af4 79289ccb1a5e7793b587da92bf9b510066be5af4 Added MSIB example
[SCALA-15]
Andrew Brett Andrew Brett f4a4ac51d680920384c748184a54dec245ad8c7e f4a4ac51d680920384c748184a54dec245ad8c7e Upgrade to latest deps
[SCALA-12]
Andrew Brett Andrew Brett 4b107a6b371145b27dace0c659a1b3f591020e0b 4b107a6b371145b27dace0c659a1b3f591020e0b Explicitly type RDD
[SCALA-16]
Andrew Brett Andrew Brett 43d2550ee279b8a019ee154b60a442771daf2d1a 43d2550ee279b8a019ee154b60a442771daf2d1a Update to latest spark (1.3.1)
[SCALA-16]
Andrew Brett Andrew Brett 5ec1ec7807bdf7c249b1e08b5aca602e80e48fb9 5ec1ec7807bdf7c249b1e08b5aca602e80e48fb9 Remove unhelpful example given latest akka-streams
[SCALA-12]
Andrew Brett Andrew Brett 833f93bdb5e4de859f64fbfb582fc6b9dc61997c 833f93bdb5e4de859f64fbfb582fc6b9dc61997c Upgraded dependencies to latest versions (including changes required for akka-streams 1.0-RC1)
[SCALA-12]
Andrew Brett Andrew Brett 95dd5f97a3c673abbb73815d23373463976600ab 95dd5f97a3c673abbb73815d23373463976600ab Added logback config, and turn down logging for spark to ERROR
[SCALA-16]
Andrew Brett Andrew Brett a44f2590d795cfaa5e6568016ea86274ba2f4455 a44f2590d795cfaa5e6568016ea86274ba2f4455 Added simple Apache Spark example
[SCALA-16]
Andrew Brett Andrew Brett b0d5475ebefb9462ef109232a5db3f858e7ac6e7 b0d5475ebefb9462ef109232a5db3f858e7ac6e7 Merge pull request #42 in SCALA/mainline from dev to master
* commit '7df007c6e8a2def72befa54c9570ce5be13f879c':
  Remove Thread.sleep hackery (hopefully earlier race condition will not recur)
  Reuse await(..) utility method
  Update rx tests to reflect change in subscriber/observer behaviour
  Corrected scalastyle exclusion comment
  Added test 6 and modified 8, 100 and 303
  Upgraded dependencies (including scala -> 2.11.5, akka-stream -> 1.0-M3 and shapeless -> 2.1.0)
  Added project euler exercises, and SimpleApp utility trait
  Added functional programming chapter 7
  Added check for while loops
  Added /setup.env to ignored files
  Max method length: 50 lines
  Added blank line at EOF scalastyle check
Andrew Brett Andrew Brett 7df007c6e8a2def72befa54c9570ce5be13f879c 7df007c6e8a2def72befa54c9570ce5be13f879c Merge pull request #41 in SCALA/mainline from feature/SCALA-12-upgrade-to-latest-dependencies to dev
* commit '57d890590a546c846b7a3413eea8205702851d81':
  Remove Thread.sleep hackery (hopefully earlier race condition will not recur)
  Reuse await(..) utility method
Andrew Brett Andrew Brett 57d890590a546c846b7a3413eea8205702851d81 57d890590a546c846b7a3413eea8205702851d81 Remove Thread.sleep hackery (hopefully earlier race condition will not recur)
[SCALA-12]
Andrew Brett Andrew Brett 43fb1e273c2db78653e73f746b6d4eddc59b0e10 43fb1e273c2db78653e73f746b6d4eddc59b0e10 Reuse await(..) utility method
[SCALA-12]
Andrew Brett Andrew Brett af3e3e7f80263232479eebf4462bc1fcdc5a470f af3e3e7f80263232479eebf4462bc1fcdc5a470f Merge pull request #40 in SCALA/mainline from feature/SCALA-12-upgrade-to-latest-dependencies to dev
* commit '94c63712c53ecf4c7cd11ba05a4e9bed2d5f2a17':
  Update rx tests to reflect change in subscriber/observer behaviour
  Upgraded dependencies (including scala -> 2.11.5, akka-stream -> 1.0-M3 and shapeless -> 2.1.0)
Andrew Brett Andrew Brett 94c63712c53ecf4c7cd11ba05a4e9bed2d5f2a17 94c63712c53ecf4c7cd11ba05a4e9bed2d5f2a17 Update rx tests to reflect change in subscriber/observer behaviour
[SCALA-12]
Andrew Brett Andrew Brett 7ffbfe4c8c7b02cb480e4f2fb8aa88d56450d859 7ffbfe4c8c7b02cb480e4f2fb8aa88d56450d859 Merge branch 'dev' into feature/SCALA-12-upgrade-to-latest-dependencies
Conflicts:
        Scala/build.gradle
        Scala/src/main/scala/org/bretts/scala/lib/akka/streams/AkkaStreams.scala
        Scala/src/main/scala/org/bretts/scala/lib/akka/streams/Callbacks.scala
        Scala/src/main/scala/org/bretts/scala/lib/shapeless/HMaps.scala
        Scala/src/main/scala/org/bretts/scala/lib/shapeless/Typeables.scala
        Scala/src/main/scala/org/bretts/scala/patterns/GenericsPatterns.scala
        build.gradle

[SCALA-12]
Andrew Brett Andrew Brett 47f2140c0b86e46b43cb686732afed8bce793e6e 47f2140c0b86e46b43cb686732afed8bce793e6e Merge pull request #39 in SCALA/mainline from feature/SCALA-14-stricter-scala-checks to dev
* commit 'e0fdd455feca39b5477ca47bba3178184a7e8cff':
  Corrected scalastyle exclusion comment
  Added check for while loops
Andrew Brett Andrew Brett e0fdd455feca39b5477ca47bba3178184a7e8cff e0fdd455feca39b5477ca47bba3178184a7e8cff Merge branch 'dev' into feature/SCALA-14-stricter-scala-checks
Andrew Brett Andrew Brett 79e413634131d142fa9804acd861c3180a139b39 79e413634131d142fa9804acd861c3180a139b39 Merge pull request #38 in SCALA/mainline from feature/SCALA-15-exercises to dev
* commit 'ed11299f51bc403fc797e2da08d0b31539431a2a':
  Added test 6 and modified 8, 100 and 303
  Added project euler exercises, and SimpleApp utility trait
  Added functional programming chapter 7
Andrew Brett Andrew Brett 6c0406c7ec6a39b7312cc4503829290e7b1a2a32 6c0406c7ec6a39b7312cc4503829290e7b1a2a32 Corrected scalastyle exclusion comment
[SCALA-14]
Andrew Brett Andrew Brett ed11299f51bc403fc797e2da08d0b31539431a2a ed11299f51bc403fc797e2da08d0b31539431a2a Added test 6 and modified 8, 100 and 303
[SCALA-15]
Andrew Brett Andrew Brett ca4e00aaab1456da07aec4222d3675abc06cd229 ca4e00aaab1456da07aec4222d3675abc06cd229 Upgraded dependencies (including scala -> 2.11.5, akka-stream -> 1.0-M3 and shapeless -> 2.1.0)
[SCALA-12]