From 678aff73ba007ce492769082e2b640bf2f864036 Mon Sep 17 00:00:00 2001
From: Sang Truong <sang.truong-minh@gooddata.com>
Date: Thu, 8 Apr 2021 17:17:28 +0700
Subject: [PATCH] DC-1701: Bump ruby sdk version to 2.1.17

---
 CHANGELOG.md     | 2 +-
 Rakefile         | 7 +++++--
 SDK_VERSION      | 2 +-
 gooddata.gemspec | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56e59367b..a428a690b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
 # GoodData Ruby SDK Changelog
-## 2.1.16
+## 2.1.17
  - BUGFIX:TMA-1704 - Enhance error message when not found clientId in source table 
  - BUGFIX: TMA-1694 [UsersBrick] Enhance messages add more log for missing users when running remove_from_organization 
  - FEATURE:TMA-1717 - replace Erbis by standard ERB 
diff --git a/Rakefile b/Rakefile
index eeef4fb90..393e87fc2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -35,9 +35,12 @@ namespace :gem do
     gem = "gooddata-#{GoodData::VERSION}.gem"
     origin_license_file = 'LICENSE'
     new_license_file = 'LICENSE_FOR_RUBY_SDK_COMPONENT.txt'
+    notices_file = 'NOTICES.txt'
     File.delete(origin_license_file) if File.exist?(origin_license_file)
-    FileUtils.cp(new_license_file, origin_license_file) if File.exists?(new_license_file)
-    puts "Copied file #{new_license_file} to #{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]
diff --git a/SDK_VERSION b/SDK_VERSION
index 291d0de4a..2f1a5aa9c 100644
--- a/SDK_VERSION
+++ b/SDK_VERSION
@@ -1 +1 @@
-2.1.16
+2.1.17
diff --git a/gooddata.gemspec b/gooddata.gemspec
index cc9a8f9cc..5f5122fef 100644
--- a/gooddata.gemspec
+++ b/gooddata.gemspec
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.email = 'lcm@gooddata.com'
   s.extra_rdoc_files = %w(LICENSE README.md)
 
-  s.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  s.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR).map { |f| f unless %w(NOTICES.txt LICENSE_FOR_RUBY_SDK_COMPONENT.txt).include?(f) }
   s.files.reject! { |fn| fn.start_with? 'spec/' }
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }