Skip to content

Commit 3a79617

Browse files
author
Andrew Lee (李健秋)
committed
Test pull request Update 3 gemspec files to support sass 3.5. Compass#2140
1 parent 4de0147 commit 3a79617

File tree

6 files changed

+19
-111
lines changed

6 files changed

+19
-111
lines changed

.travis.yml

Lines changed: 5 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
11
language: ruby
22

33
rvm:
4-
- 1.8.7
5-
- 1.9.2
6-
- 1.9.3
7-
- jruby-18mode
8-
- jruby-19mode
9-
- rbx
10-
- ree
11-
- 2.0.0
12-
- 2.1.0
13-
- 2.2.0
4+
- 2.5.1
145

156
sudo: false
167

@@ -20,7 +11,7 @@ env:
2011

2112
gemfile:
2213
- core/Gemfile
23-
- cli/gemfiles/sass_3_3.gemfile
14+
- cli/gemfiles/sass_3_5.gemfile
2415
- cli/gemfiles/listen_2.gemfile
2516

2617
script: cd $CI_TEST && bundle exec rake
@@ -29,103 +20,10 @@ matrix:
2920
exclude:
3021
- gemfile: cli/gemfiles/sass_3_3.gemfile
3122
env: CI_TEST=core
32-
rvm: 1.8.7
23+
rvm: 2.5.1
3324
- gemfile: cli/gemfiles/listen_2.gemfile
3425
env: CI_TEST=core
35-
rvm: 1.8.7
26+
rvm: 2.5.1
3627
- gemfile: core/Gemfile
3728
env: CI_TEST=cli
38-
rvm: 1.8.7
39-
- gemfile: cli/gemfiles/sass_3_3.gemfile
40-
env: CI_TEST=core
41-
rvm: 1.9.2
42-
- gemfile: cli/gemfiles/listen_2.gemfile
43-
env: CI_TEST=core
44-
rvm: 1.9.2
45-
- gemfile: core/Gemfile
46-
env: CI_TEST=cli
47-
rvm: 1.9.2
48-
- gemfile: cli/gemfiles/sass_3_3.gemfile
49-
env: CI_TEST=core
50-
rvm: 1.9.3
51-
- gemfile: cli/gemfiles/listen_2.gemfile
52-
env: CI_TEST=core
53-
rvm: 1.9.3
54-
- gemfile: core/Gemfile
55-
env: CI_TEST=cli
56-
rvm: 1.9.3
57-
- gemfile: cli/gemfiles/sass_3_3.gemfile
58-
env: CI_TEST=core
59-
rvm: jruby-18mode
60-
- gemfile: cli/gemfiles/listen_2.gemfile
61-
env: CI_TEST=core
62-
rvm: jruby-18mode
63-
- gemfile: core/Gemfile
64-
env: CI_TEST=cli
65-
rvm: jruby-18mode
66-
- gemfile: cli/gemfiles/sass_3_3.gemfile
67-
env: CI_TEST=core
68-
rvm: jruby-19mode
69-
- gemfile: cli/gemfiles/listen_2.gemfile
70-
env: CI_TEST=core
71-
rvm: jruby-19mode
72-
- gemfile: core/Gemfile
73-
env: CI_TEST=cli
74-
rvm: jruby-19mode
75-
- gemfile: cli/gemfiles/sass_3_3.gemfile
76-
env: CI_TEST=core
77-
rvm: rbx
78-
- gemfile: cli/gemfiles/listen_2.gemfile
79-
env: CI_TEST=core
80-
rvm: rbx
81-
- gemfile: core/Gemfile
82-
env: CI_TEST=cli
83-
rvm: rbx
84-
- gemfile: cli/gemfiles/sass_3_3.gemfile
85-
env: CI_TEST=core
86-
rvm: ree
87-
- gemfile: cli/gemfiles/listen_2.gemfile
88-
env: CI_TEST=core
89-
rvm: ree
90-
- gemfile: core/Gemfile
91-
env: CI_TEST=cli
92-
rvm: ree
93-
- gemfile: cli/gemfiles/sass_3_3.gemfile
94-
env: CI_TEST=core
95-
rvm: 2.0.0
96-
- gemfile: cli/gemfiles/listen_2.gemfile
97-
env: CI_TEST=core
98-
rvm: 2.0.0
99-
- gemfile: core/Gemfile
100-
env: CI_TEST=cli
101-
rvm: 2.0.0
102-
- gemfile: cli/gemfiles/sass_3_3.gemfile
103-
env: CI_TEST=core
104-
rvm: 2.1.0
105-
- gemfile: cli/gemfiles/listen_2.gemfile
106-
env: CI_TEST=core
107-
rvm: 2.1.0
108-
- gemfile: core/Gemfile
109-
env: CI_TEST=cli
110-
rvm: 2.1.0
111-
- gemfile: cli/gemfiles/listen_2.gemfile
112-
env: CI_TEST=cli
113-
rvm: 1.8.7
114-
- gemfile: cli/gemfiles/listen_2.gemfile
115-
env: CI_TEST=cli
116-
rvm: 1.9.2
117-
- gemfile: cli/gemfiles/listen_2.gemfile
118-
env: CI_TEST=cli
119-
rvm: jruby-18mode
120-
- gemfile: cli/gemfiles/listen_2.gemfile
121-
env: CI_TEST=cli
122-
rvm: jruby-19mode
123-
- gemfile: cli/gemfiles/listen_2.gemfile
124-
env: CI_TEST=cli
125-
rvm: ree
126-
127-
notifications:
128-
irc: {channels: "irc.freenode.org#compass"}
129-
campfire:
130-
rooms:
131-
secure: GXnvuoZ8BVMv+JwJIBb0Ey1ARbfeypmCvpmynykD5taooedTqwyTeT32jw1YTQAOuBewgeWW1H4bF10ySz0GWmu6X2sNx9CVYT1dFudoMvLtnvEmAe0JyyRuSCBFj45jP21eRUAACltxzyX4q/gh+zRIlaRin9YBo/Xv84gDzLw=
29+
rvm: 2.5.1

cli/compass.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Gem::Specification.new do |gemspec|
1414
gemspec.rubygems_version = "1.3.5"
1515
gemspec.summary = %q{A Real Stylesheet Framework}
1616

17-
gemspec.add_dependency 'sass', '>= 3.3.13', '< 3.5'
17+
gemspec.add_dependency 'sass', '>= 3.3.13', '< 3.6'
1818
gemspec.add_dependency 'compass-core', "~> #{File.read(File.join(File.dirname(__FILE__),"..","core","VERSION")).strip}"
1919
gemspec.add_dependency 'compass-import-once', "~> #{File.read(File.join(File.dirname(__FILE__),"..","import-once","VERSION")).strip}"
2020
gemspec.add_dependency 'chunky_png', '~> 1.2'

cli/gemfiles/listen_2.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CI=true
22
main_gemfile = File.expand_path(File.join(File.dirname(__FILE__), "..", "Gemfile"))
33
eval File.read(main_gemfile), nil, main_gemfile
44

5-
gem 'sass', '~> 3.3.12'
5+
gem 'sass', '~> 3.5.3'
66
gem 'compass', :path => "../"
77
gem 'compass-core', :path => "../../core"
88
gem 'compass-import-once', :path => "../../import-once"

cli/gemfiles/sass_3_5.gemfile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
CI=true
2+
main_gemfile = File.expand_path(File.join(File.dirname(__FILE__), "..", "Gemfile"))
3+
eval File.read(main_gemfile), nil, main_gemfile
4+
5+
gem 'sass', "~> 3.5.3"
6+
gem 'compass', :path => "../"
7+
gem 'compass-core', :path => "../../core"
8+
gem 'compass-import-once', :path => "../../import-once"
9+
10+
gemspec :path=>"../"

core/compass-core.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
2121
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
2222
spec.require_paths = ["lib"]
2323

24-
spec.add_dependency "sass", ">= 3.3.0", "< 3.5"
24+
spec.add_dependency "sass", ">= 3.3.0", "< 3.6"
2525
spec.add_dependency 'multi_json', '~> 1.0'
2626
spec.add_development_dependency "bundler"
2727
spec.add_development_dependency "rake"

import-once/compass-import-once.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
1818
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
1919
spec.require_paths = ["lib"]
2020

21-
spec.add_dependency "sass", ">= 3.2", "< 3.5"
21+
spec.add_dependency "sass", ">= 3.2", "< 3.6"
2222
spec.add_development_dependency "bundler", "~> 1.3"
2323
spec.add_development_dependency "diff-lcs"
2424
spec.add_development_dependency "rake"

0 commit comments

Comments
 (0)