Merge pull request #1772 from gooddata/develop

Merge develop to master

Reviewed-by: https://github.com/sangtm

Author: gdgate

.travis.yml

@@ -7,8 +7,6 @@ stages:
   if: type IN (api, cron)
 - name: platform-cleanup
   if: type IN (cron)
-- name: license-update
-  if: branch = master AND type = push
 - name: gem-release
   if: branch = master AND type = push
 - name: gem-smoke-test
@@ -348,16 +346,6 @@ jobs:
     rvm: jruby-9.1.14
     osx_image: xcode9.4
 
-  - stage: license-update
-    name: Update license file
-    rvm: 2.3
-    script: |
-      bundle exec rake license:update
-  - stage: license-update
-    name: Update license file
-    rvm: jruby-9.1.14
-    script: |
-      bundle exec rake license:update
   - stage: gem-release
     name: deploy MRI gem
     rvm: 2.3

Rakefile

@@ -33,13 +33,14 @@ namespace :gem do
   desc "Release gem version #{GoodData::VERSION} to rubygems"
   task :release do
     gem = "gooddata-#{GoodData::VERSION}.gem"
+    origin_license_file = 'LICENSE'
+    new_license_file = 'LICENSE_FOR_RUBY_SDK_COMPONENT.txt'
     notices_file = 'NOTICES.txt'
-
-    if File.exist?(notices_file)
-      File.delete(notices_file)
-      puts "Deleted files: #{notices_file}"
-    end
-
+    File.delete(origin_license_file) if File.exist?(origin_license_file)
+    File.delete(notices_file) if File.exist?(notices_file)
+    puts "Deleted files: #{origin_license_file} and #{notices_file}"
+    File.rename(new_license_file, origin_license_file) if File.exists?(new_license_file)
+    puts "Renamed file #{new_license_file} to #{origin_license_file}"
     puts "Building #{gem} ..."
     res = `gem build ./gooddata.gemspec`
     file = res.match('File: (.*)')[1]
@@ -111,24 +112,6 @@ namespace :license do
     puts 'All licenses seem to be OK'
   end
 
-  desc 'Update LICENSE file'
-  task :update do
-    origin_license_file = 'LICENSE'
-    new_license_file = 'LICENSE_FOR_RUBY_SDK_COMPONENT.txt'
-
-    if File.exist?(origin_license_file)
-      File.delete(origin_license_file)
-      puts "Deleted files: #{origin_license_file}"
-    end
-
-    if File.exists?(new_license_file)
-      File.rename(new_license_file, origin_license_file)
-      puts "Renamed file #{new_license_file} to #{origin_license_file}"
-    end
-
-    puts 'Update LICENSE seem to be OK'
-  end
-
   desc 'Add license header to each file'
   task :add do
     spec = Gem::Specification.load('gooddata.gemspec')

gooddata.gemspec

@@ -61,7 +61,11 @@ Gem::Specification.new do |s|
   end
 
   s.add_dependency 'aws-sdk-s3', '~> 1.16'
-  s.add_dependency 'docile', '~> 1.1'
+  if RUBY_VERSION >= '2.5'
+    s.add_dependency 'docile', '~> 1.1'
+  else
+    s.add_dependency 'docile', '> 1.1', '< 1.4.0'
+  end
   s.add_dependency 'gli', '~> 2.15'
   s.add_dependency 'gooddata_datawarehouse', '~> 0.0.10' if RUBY_PLATFORM == 'java'
   s.add_dependency 'highline', '= 2.0.0.pre.develop.14'