temporarily added gdal 3.0 to gemfile

unepwcmc · Aug 4, 2020 · 3f4abff · 3f4abff
1 parent a457853
commit 3f4abff
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
diff --git 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
@@ -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)