Skip to content

Commit fea96ba

Browse files
authored
Merge pull request #17 from claytron/ruby-versions
Only support ruby 2.2+ and bump major version
2 parents ba557dd + 0c52187 commit fea96ba

File tree

6 files changed

+9
-6
lines changed

6 files changed

+9
-6
lines changed

.rubocop_schema.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ Style/ExtraSpacing:
55
AllowForAlignment: false
66

77
Style/NumericLiterals:
8-
Exclude:
9-
- 'db/schema.rb'
8+
Enabled: false
109

1110
Style/SpaceBeforeFirstArg:
1211
Enabled: true

.travis.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
language: ruby
22
rvm:
3-
- "2.0.0"
4-
- "2.1.0"
53
- "2.2.0"
64
- "2.3.0"
5+
- "2.4.0"

README.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ schema-conflicts', '~> 1.0.2'`
5959

6060
## Older versions of Ruby:
6161

62-
This gem only works with Ruby >= 2.0. Use versions 1.2.2 or below if you have an
62+
This gem only works with Ruby >= 2.2. Use versions 1.2.2 or below if you have an
6363
old Ruby.
6464

6565
## Contributing
@@ -79,9 +79,12 @@ old Ruby.
7979
- [@zoras](https://github.com/zoras)
8080
- [@jensljungblad](https://github.com/jensljungblad)
8181
- [@vsubramanian](https://github.com/vsubramanian)
82+
- [@claytron](https://github.com/claytron)
8283

8384
## Releases
8485

86+
- 3.0.0
87+
- Only support Ruby 2.2+ since lower versions haved reached EOL.
8588
- 2.0.1
8689
- Fix bug that caused failure when project directory has a space in it
8790
- 2.0.0
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module FixDBSchemaConflicts
2-
VERSION='2.0.1'
2+
VERSION='3.0.0'
33
end

spec/integration/integration_spec.rb

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
def reference_db_schema
2222
<<-RUBY
2323
# encoding: UTF-8
24+
2425
# This file is auto-generated from the current state of the database. Instead
2526
# of editing this file, please use the migrations feature of Active Record to
2627
# incrementally modify your database, and then regenerate this schema definition.

spec/test-app/db/schema.rb

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# encoding: UTF-8
2+
23
# This file is auto-generated from the current state of the database. Instead
34
# of editing this file, please use the migrations feature of Active Record to
45
# incrementally modify your database, and then regenerate this schema definition.

0 commit comments

Comments
 (0)