Move Gemfile to top level so we can use CocoaPods linting and trunk p…

…ushing. Modernize linting script.
nytimes · Dec 2, 2020 · 7c5f3c9 · 7c5f3c9
1 parent d23c5ab
commit 7c5f3c9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -43,6 +43,6 @@ ocunit.xml
 *.xcbkptlist
 *.xcsettings
 
-Examples/vendor/bundle/
+vendor/bundle/
 .bundle/
 Pods/
diff --git a/Examples/Gemfile → Gemfile b/Examples/Gemfile → Gemfile
diff --git a/Examples/Gemfile.lock → Gemfile.lock b/Examples/Gemfile.lock → Gemfile.lock
diff --git a/scripts/lint b/scripts/lint
@@ -1,12 +1,26 @@
 #!/usr/bin/env sh
 
+set -eu
+set -o pipefail
+
+printf 'linting CocoaPods\n'
+
+if ! command -v bundle > /dev/null; then
+  printf 'bundler is not installed.\n'
+  printf 'install with $ gem install bundler\n'
+  exit 1
+fi
+
+bundle config set path 'vendor/bundle'
+bundle install 
+bundle exec pod lib lint
+
+printf 'linting Carthage\n'
+
 if ! command -v carthage > /dev/null; then
   printf 'Carthage is not installed.\n'
   printf 'See https://github.com/Carthage/Carthage for install instructions.\n'
   exit 1
 fi
 
-
 carthage build --platform iOS --no-use-binaries --no-skip-current
-
-pod lib lint