Update topology to latest (#1525)

electricitymaps · Jul 30, 2018 · 8ac91b6 · 8ac91b6
1 parent dca45ea
commit 8ac91b6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/mobileapp/README.md b/mobileapp/README.md
@@ -30,3 +30,15 @@ code-push promote electricitymap-{ios,android} Staging Production
 ```
 
 Note about releases: bumping the release number will cause a new binary to be created. All code-push updates are tied to a binary version, meaning that apps will only update to code-push updates that are compatible with their binary version.
+
+## Troubleshooting
+
+If you get
+
+```
+ld: warning: directory not found for option '-L/Users/oliviercorradi/Library/Developer/Xcode/DerivedData/electricityMap-bodzannsraziqncaeafoyayssnvd/Build/Products/Debug-iphonesimulator/GoogleToolboxForMac'
+ld: warning: directory not found for option '-L/Users/oliviercorradi/Library/Developer/Xcode/DerivedData/electricityMap-bodzannsraziqncaeafoyayssnvd/Build/Products/Debug-iphonesimulator/nanopb'
+ld: library not found for -lGoogleToolboxForMac
+```
+
+while building for ios, you should run `pod install` from the `platforms/ios` directory.
diff --git a/mobileapp/build.sh b/mobileapp/build.sh
@@ -15,4 +15,5 @@ docker rm $CONTAINER_ID
 
 # Run node in order to build index.html
 echo 'Generating index pages..'
+yarn add ejs
 node generate-index.js
diff --git a/mobileapp/package.json b/mobileapp/package.json
@@ -21,7 +21,7 @@
     "cordova-plugin-zip": "^3.1.0",
     "cordova-support-google-services": "^1.1.0",
     "cordova-universal-links-plugin": "git+https://github.com/flipflopapp/cordova-universal-links-plugin.git",
-    "ejs": "^2.5.5",
+    "ejs": "^2.6.1",
     "i18n": "^0.8.3"
   },
   "repository": {

diff --git a/web/src/world.json b/web/src/world.json