From 779bc0157840c4813f81f060c5c16a616acccd51 Mon Sep 17 00:00:00 2001 From: Braiden Vasco Date: Fri, 23 Mar 2018 21:18:51 +0000 Subject: [PATCH 1/5] Fix example dependencies --- example/Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/example/Gemfile.lock b/example/Gemfile.lock index 28d54a4..8527b57 100644 --- a/example/Gemfile.lock +++ b/example/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - lita-tox (0.3.0) + lita-tox (0.4.0) lita (~> 4.7) tox (~> 0.0.1) @@ -36,7 +36,7 @@ GEM redis-namespace (1.5.3) redis (~> 3.0, >= 3.0.4) thor (0.19.4) - tox (0.0.1) + tox (0.0.2) url_mount (0.2.1) rack @@ -48,4 +48,4 @@ DEPENDENCIES lita-tox! BUNDLED WITH - 1.13.6 + 1.16.1 From f4645cfab64820e3eded3df61cadea4e61d60c1d Mon Sep 17 00:00:00 2001 From: Braiden Vasco Date: Fri, 23 Mar 2018 21:20:32 +0000 Subject: [PATCH 2/5] Use newer Tox gem version --- lita-tox.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lita-tox.gemspec b/lita-tox.gemspec index 66781d5..ba02fa6 100644 --- a/lita-tox.gemspec +++ b/lita-tox.gemspec @@ -38,5 +38,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'pry', '~> 0.10' spec.add_runtime_dependency 'lita', '~> 4.7' - spec.add_runtime_dependency 'tox', '~> 0.0.1' + spec.add_runtime_dependency 'tox', '~> 0.0.2' end From 352b9e12cde8d77cf0d48393be6660df27c3a2a0 Mon Sep 17 00:00:00 2001 From: Braiden Vasco Date: Fri, 23 Mar 2018 21:21:46 +0000 Subject: [PATCH 3/5] Update example dependencies --- example/Gemfile.lock | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/example/Gemfile.lock b/example/Gemfile.lock index 8527b57..17b43f9 100644 --- a/example/Gemfile.lock +++ b/example/Gemfile.lock @@ -3,17 +3,19 @@ PATH specs: lita-tox (0.4.0) lita (~> 4.7) - tox (~> 0.0.1) + tox (~> 0.0.2) GEM remote: https://rubygems.org/ specs: - faraday (0.12.1) + concurrent-ruby (1.0.5) + faraday (0.14.0) multipart-post (>= 1.2, < 3) http_router (0.11.2) rack (>= 1.0.0) url_mount (~> 0.2.1) - i18n (0.8.6) + i18n (1.0.0) + concurrent-ruby (~> 1.0) ice_nine (0.11.2) lita (4.7.1) bundler (>= 1.3) @@ -27,15 +29,15 @@ GEM rb-readline (>= 0.5.1) redis-namespace (>= 1.3.0) thor (>= 0.18.1) - multi_json (1.12.1) + multi_json (1.13.1) multipart-post (2.0.0) - puma (3.9.1) - rack (1.6.8) - rb-readline (0.5.4) - redis (3.3.3) - redis-namespace (1.5.3) - redis (~> 3.0, >= 3.0.4) - thor (0.19.4) + puma (3.11.3) + rack (1.6.9) + rb-readline (0.5.5) + redis (4.0.1) + redis-namespace (1.6.0) + redis (>= 3.0.4) + thor (0.20.0) tox (0.0.2) url_mount (0.2.1) rack From 6971f090e24960655695281ad9bb4a9b8d05156b Mon Sep 17 00:00:00 2001 From: Braiden Vasco Date: Fri, 23 Mar 2018 21:27:08 +0000 Subject: [PATCH 4/5] Upgrage .gitignore --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index 9a38858..dec7224 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,9 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + *.gem *.rbc /.config From e3350071402e0868e2c735a7ab7b619a554386e5 Mon Sep 17 00:00:00 2001 From: Braiden Vasco Date: Fri, 23 Mar 2018 21:35:50 +0000 Subject: [PATCH 5/5] Update vendor dependencies --- vendor/libsodium | 2 +- vendor/libtoxcore | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/libsodium b/vendor/libsodium index 63dd054..2f4f718 160000 --- a/vendor/libsodium +++ b/vendor/libsodium @@ -1 +1 @@ -Subproject commit 63dd05419e8a4175fd59da50a58afbdc20a2cd31 +Subproject commit 2f4f718cd94adab547c210a78050762cf667dfca diff --git a/vendor/libtoxcore b/vendor/libtoxcore index a429ef4..acb25e6 160000 --- a/vendor/libtoxcore +++ b/vendor/libtoxcore @@ -1 +1 @@ -Subproject commit a429ef4a28a5e5e0ad010efffb76d2abc3ada0af +Subproject commit acb25e66eb2f92ab532333d4f426b52a121cb516