updated gemfiles to reduce conflicts
This commit is contained in:
11
Gemfile
11
Gemfile
@ -1,5 +1,10 @@
|
|||||||
# frozen_string_literal: true
|
|
||||||
source "https://rubygems.org"
|
source "https://rubygems.org"
|
||||||
|
|
||||||
# gem "rails"source 'https://rubygems.org'
|
|
||||||
gem 'github-pages', group: :jekyll_plugins
|
gem "jekyll", "3.3.1"
|
||||||
|
|
||||||
|
|
||||||
|
group :jekyll_plugins do
|
||||||
|
gem "jekyll-feed", "~> 0.6"
|
||||||
|
gem 'github-pages', '~> 106'
|
||||||
|
end
|
||||||
|
139
Gemfile.lock
139
Gemfile.lock
@ -1,100 +1,115 @@
|
|||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
RedCloth (4.2.9)
|
activesupport (4.2.7)
|
||||||
activesupport (5.0.0.1)
|
|
||||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
|
||||||
i18n (~> 0.7)
|
i18n (~> 0.7)
|
||||||
|
json (~> 1.7, >= 1.7.7)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
|
thread_safe (~> 0.3, >= 0.3.4)
|
||||||
tzinfo (~> 1.1)
|
tzinfo (~> 1.1)
|
||||||
addressable (2.4.0)
|
addressable (2.4.0)
|
||||||
blankslate (2.1.2.4)
|
|
||||||
classifier-reborn (2.0.4)
|
|
||||||
fast-stemmer (~> 1.0)
|
|
||||||
coffee-script (2.4.1)
|
coffee-script (2.4.1)
|
||||||
coffee-script-source
|
coffee-script-source
|
||||||
execjs
|
execjs
|
||||||
coffee-script-source (1.11.1)
|
coffee-script-source (1.11.1)
|
||||||
colorator (0.1)
|
colorator (1.1.0)
|
||||||
concurrent-ruby (1.0.2)
|
|
||||||
ethon (0.10.1)
|
ethon (0.10.1)
|
||||||
ffi (>= 1.3.0)
|
ffi (>= 1.3.0)
|
||||||
execjs (2.7.0)
|
execjs (2.7.0)
|
||||||
faraday (0.10.0)
|
faraday (0.10.0)
|
||||||
multipart-post (>= 1.2, < 3)
|
multipart-post (>= 1.2, < 3)
|
||||||
fast-stemmer (1.0.2)
|
|
||||||
ffi (1.9.14)
|
ffi (1.9.14)
|
||||||
|
forwardable-extended (2.6.0)
|
||||||
gemoji (2.1.0)
|
gemoji (2.1.0)
|
||||||
github-pages (39)
|
github-pages (106)
|
||||||
RedCloth (= 4.2.9)
|
activesupport (= 4.2.7)
|
||||||
github-pages-health-check (~> 0.2)
|
github-pages-health-check (= 1.2.0)
|
||||||
jekyll (= 2.4.0)
|
jekyll (= 3.3.1)
|
||||||
|
jekyll-avatar (= 0.4.2)
|
||||||
jekyll-coffeescript (= 1.0.1)
|
jekyll-coffeescript (= 1.0.1)
|
||||||
jekyll-feed (= 0.3.1)
|
jekyll-feed (= 0.8.0)
|
||||||
jekyll-mentions (= 0.2.1)
|
jekyll-gist (= 1.4.0)
|
||||||
jekyll-redirect-from (= 0.8.0)
|
jekyll-github-metadata (= 2.2.0)
|
||||||
|
jekyll-mentions (= 1.2.0)
|
||||||
|
jekyll-paginate (= 1.1.0)
|
||||||
|
jekyll-redirect-from (= 0.11.0)
|
||||||
|
jekyll-relative-links (= 0.2.1)
|
||||||
jekyll-sass-converter (= 1.3.0)
|
jekyll-sass-converter (= 1.3.0)
|
||||||
jekyll-sitemap (= 0.8.1)
|
jekyll-seo-tag (= 2.1.0)
|
||||||
jemoji (= 0.5.0)
|
jekyll-sitemap (= 0.12.0)
|
||||||
kramdown (= 1.5.0)
|
jekyll-swiss (= 0.4.0)
|
||||||
liquid (= 2.6.2)
|
jemoji (= 0.7.0)
|
||||||
maruku (= 0.7.0)
|
kramdown (= 1.11.1)
|
||||||
|
liquid (= 3.0.6)
|
||||||
|
listen (= 3.0.6)
|
||||||
mercenary (~> 0.3)
|
mercenary (~> 0.3)
|
||||||
pygments.rb (= 0.6.3)
|
minima (= 2.0.0)
|
||||||
rdiscount (= 2.1.7)
|
rouge (= 1.11.1)
|
||||||
redcarpet (= 3.3.2)
|
|
||||||
terminal-table (~> 1.4)
|
terminal-table (~> 1.4)
|
||||||
github-pages-health-check (0.3.2)
|
github-pages-health-check (1.2.0)
|
||||||
net-dns (~> 0.6)
|
addressable (~> 2.3)
|
||||||
|
net-dns (~> 0.8)
|
||||||
|
octokit (~> 4.0)
|
||||||
public_suffix (~> 1.4)
|
public_suffix (~> 1.4)
|
||||||
typhoeus (~> 0.7)
|
typhoeus (~> 0.7)
|
||||||
html-pipeline (1.9.0)
|
html-pipeline (2.4.2)
|
||||||
activesupport (>= 2)
|
activesupport (>= 2)
|
||||||
nokogiri (~> 1.4)
|
nokogiri (>= 1.4)
|
||||||
i18n (0.7.0)
|
i18n (0.7.0)
|
||||||
jekyll (2.4.0)
|
jekyll (3.3.1)
|
||||||
classifier-reborn (~> 2.0)
|
addressable (~> 2.4)
|
||||||
colorator (~> 0.1)
|
colorator (~> 1.0)
|
||||||
jekyll-coffeescript (~> 1.0)
|
|
||||||
jekyll-gist (~> 1.0)
|
|
||||||
jekyll-paginate (~> 1.0)
|
|
||||||
jekyll-sass-converter (~> 1.0)
|
jekyll-sass-converter (~> 1.0)
|
||||||
jekyll-watch (~> 1.1)
|
jekyll-watch (~> 1.1)
|
||||||
kramdown (~> 1.3)
|
kramdown (~> 1.3)
|
||||||
liquid (~> 2.6.1)
|
liquid (~> 3.0)
|
||||||
mercenary (~> 0.3.3)
|
mercenary (~> 0.3.3)
|
||||||
pygments.rb (~> 0.6.0)
|
pathutil (~> 0.9)
|
||||||
redcarpet (~> 3.1)
|
rouge (~> 1.7)
|
||||||
safe_yaml (~> 1.0)
|
safe_yaml (~> 1.0)
|
||||||
toml (~> 0.1.0)
|
jekyll-avatar (0.4.2)
|
||||||
|
jekyll (~> 3.0)
|
||||||
jekyll-coffeescript (1.0.1)
|
jekyll-coffeescript (1.0.1)
|
||||||
coffee-script (~> 2.2)
|
coffee-script (~> 2.2)
|
||||||
jekyll-feed (0.3.1)
|
jekyll-feed (0.8.0)
|
||||||
|
jekyll (~> 3.3)
|
||||||
jekyll-gist (1.4.0)
|
jekyll-gist (1.4.0)
|
||||||
octokit (~> 4.2)
|
octokit (~> 4.2)
|
||||||
jekyll-mentions (0.2.1)
|
jekyll-github-metadata (2.2.0)
|
||||||
html-pipeline (~> 1.9.0)
|
jekyll (~> 3.1)
|
||||||
jekyll (~> 2.0)
|
octokit (~> 4.0, != 4.4.0)
|
||||||
|
jekyll-mentions (1.2.0)
|
||||||
|
activesupport (~> 4.0)
|
||||||
|
html-pipeline (~> 2.3)
|
||||||
|
jekyll (~> 3.0)
|
||||||
jekyll-paginate (1.1.0)
|
jekyll-paginate (1.1.0)
|
||||||
jekyll-redirect-from (0.8.0)
|
jekyll-redirect-from (0.11.0)
|
||||||
jekyll (>= 2.0)
|
jekyll (>= 2.0)
|
||||||
|
jekyll-relative-links (0.2.1)
|
||||||
|
jekyll (~> 3.3)
|
||||||
jekyll-sass-converter (1.3.0)
|
jekyll-sass-converter (1.3.0)
|
||||||
sass (~> 3.2)
|
sass (~> 3.2)
|
||||||
jekyll-sitemap (0.8.1)
|
jekyll-seo-tag (2.1.0)
|
||||||
|
jekyll (~> 3.3)
|
||||||
|
jekyll-sitemap (0.12.0)
|
||||||
|
jekyll (~> 3.3)
|
||||||
|
jekyll-swiss (0.4.0)
|
||||||
jekyll-watch (1.5.0)
|
jekyll-watch (1.5.0)
|
||||||
listen (~> 3.0, < 3.1)
|
listen (~> 3.0, < 3.1)
|
||||||
jemoji (0.5.0)
|
jemoji (0.7.0)
|
||||||
|
activesupport (~> 4.0)
|
||||||
gemoji (~> 2.0)
|
gemoji (~> 2.0)
|
||||||
html-pipeline (~> 1.9)
|
html-pipeline (~> 2.2)
|
||||||
jekyll (>= 2.0)
|
jekyll (>= 3.0)
|
||||||
kramdown (1.5.0)
|
json (1.8.3)
|
||||||
liquid (2.6.2)
|
kramdown (1.11.1)
|
||||||
listen (3.0.8)
|
liquid (3.0.6)
|
||||||
rb-fsevent (~> 0.9, >= 0.9.4)
|
listen (3.0.6)
|
||||||
rb-inotify (~> 0.9, >= 0.9.7)
|
rb-fsevent (>= 0.9.3)
|
||||||
maruku (0.7.0)
|
rb-inotify (>= 0.9.7)
|
||||||
mercenary (0.3.6)
|
mercenary (0.3.6)
|
||||||
mini_portile2 (2.1.0)
|
mini_portile2 (2.1.0)
|
||||||
|
minima (2.0.0)
|
||||||
minitest (5.10.1)
|
minitest (5.10.1)
|
||||||
multipart-post (2.0.0)
|
multipart-post (2.0.0)
|
||||||
net-dns (0.8.0)
|
net-dns (0.8.0)
|
||||||
@ -102,18 +117,13 @@ GEM
|
|||||||
mini_portile2 (~> 2.1.0)
|
mini_portile2 (~> 2.1.0)
|
||||||
octokit (4.6.2)
|
octokit (4.6.2)
|
||||||
sawyer (~> 0.8.0, >= 0.5.3)
|
sawyer (~> 0.8.0, >= 0.5.3)
|
||||||
parslet (1.5.0)
|
pathutil (0.14.0)
|
||||||
blankslate (~> 2.0)
|
forwardable-extended (~> 2.6)
|
||||||
posix-spawn (0.3.12)
|
|
||||||
public_suffix (1.5.3)
|
public_suffix (1.5.3)
|
||||||
pygments.rb (0.6.3)
|
|
||||||
posix-spawn (~> 0.3.6)
|
|
||||||
yajl-ruby (~> 1.2.0)
|
|
||||||
rb-fsevent (0.9.8)
|
rb-fsevent (0.9.8)
|
||||||
rb-inotify (0.9.7)
|
rb-inotify (0.9.7)
|
||||||
ffi (>= 0.5.0)
|
ffi (>= 0.5.0)
|
||||||
rdiscount (2.1.7)
|
rouge (1.11.1)
|
||||||
redcarpet (3.3.2)
|
|
||||||
safe_yaml (1.0.4)
|
safe_yaml (1.0.4)
|
||||||
sass (3.4.22)
|
sass (3.4.22)
|
||||||
sawyer (0.8.1)
|
sawyer (0.8.1)
|
||||||
@ -122,20 +132,19 @@ GEM
|
|||||||
terminal-table (1.7.3)
|
terminal-table (1.7.3)
|
||||||
unicode-display_width (~> 1.1.1)
|
unicode-display_width (~> 1.1.1)
|
||||||
thread_safe (0.3.5)
|
thread_safe (0.3.5)
|
||||||
toml (0.1.2)
|
|
||||||
parslet (~> 1.5.0)
|
|
||||||
typhoeus (0.8.0)
|
typhoeus (0.8.0)
|
||||||
ethon (>= 0.8.0)
|
ethon (>= 0.8.0)
|
||||||
tzinfo (1.2.2)
|
tzinfo (1.2.2)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
unicode-display_width (1.1.1)
|
unicode-display_width (1.1.1)
|
||||||
yajl-ruby (1.2.1)
|
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
ruby
|
ruby
|
||||||
|
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
github-pages
|
github-pages (~> 106)
|
||||||
|
jekyll (= 3.3.1)
|
||||||
|
jekyll-feed (~> 0.6)
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
1.13.6
|
1.13.6
|
||||||
|
@ -50,4 +50,38 @@ Fenced code blocks require a blank line before and after.
|
|||||||
|
|
||||||
If you're using an HTML file, you can also use the `highlight` command with Liquid markup.
|
If you're using an HTML file, you can also use the `highlight` command with Liquid markup.
|
||||||
|
|
||||||
|
<pre>
|
||||||
|
{% raw %}{% highlight java %}
|
||||||
|
import java.util.Scanner;
|
||||||
|
|
||||||
|
public class ScannerAndKeyboard
|
||||||
|
{
|
||||||
|
|
||||||
|
public static void main(String[] args)
|
||||||
|
{ Scanner s = new Scanner(System.in);
|
||||||
|
System.out.print( "Enter your name: " );
|
||||||
|
String name = s.nextLine();
|
||||||
|
System.out.println( "Hello " + name + "!" );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{% endhighlight %}{% endraw %}
|
||||||
|
</pre>
|
||||||
|
|
||||||
|
Result:
|
||||||
|
|
||||||
|
{% highlight java %}
|
||||||
|
import java.util.Scanner;
|
||||||
|
|
||||||
|
public class ScannerAndKeyboard
|
||||||
|
{
|
||||||
|
|
||||||
|
public static void main(String[] args)
|
||||||
|
{ Scanner s = new Scanner(System.in);
|
||||||
|
System.out.print( "Enter your name: " );
|
||||||
|
String name = s.nextLine();
|
||||||
|
System.out.println( "Hello " + name + "!" );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{% endhighlight %}
|
||||||
|
|
||||||
{% include links.html %}
|
{% include links.html %}
|
||||||
|
Reference in New Issue
Block a user