diff --git a/.gitignore b/.gitignore index 5c20ad04f..784267cdd 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,3 @@ tmp/cache/webpacker .vscode/ -# TODO: Get rid of this if/when I fix the issue with gdal -Gemfile -Gemfile.lock \ No newline at end of file diff --git a/Gemfile b/Gemfile index 345d2955c..76efd8fa2 100644 --- a/Gemfile +++ b/Gemfile @@ -35,7 +35,10 @@ gem 'vuejs-rails', '~> 2.3.2' gem 'sprockets-vue', '~> 0.1.0' gem 'rails-controller-testing' -gem 'gdal', '~> 2.0' + +# gem 'gdal', '~> 2.0' +# TODO Stanley - Need to change this version of gdal back to 2.0 (and remove from gitignore) when I reinstall GDAL to 2.4.4 +gem 'gdal', '~> 3.0' # group :production, :staging do # gem 'unicorn' diff --git a/Gemfile.lock b/Gemfile.lock index 9d44644c6..68ec71d11 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1066,7 +1066,7 @@ GEM multipart-post (>= 1.2, < 3) fastercsv (1.5.5) ffi (1.12.1) - gdal (2.0.0) + gdal (3.0.0) globalid (0.4.2) activesupport (>= 4.2.0) haml (5.1.2) @@ -1335,7 +1335,7 @@ DEPENDENCIES elasticsearch (~> 7.2.0) exception_notification (~> 4.3.0) factory_girl_rails (~> 4.4.1) - gdal (~> 2.0) + gdal (~> 3.0) httmultiparty (~> 0.3.14) httparty (~> 0.15.1) jquery-rails (~> 4.3.3)