Skip to content

Commit

Permalink
Update iOS library + Potential CI fixes (#609)
Browse files Browse the repository at this point in the history
* Update iOS SDK to latest version. Regenerate yarn.lock for main repo to fix CI issues with yarn and add lock file for example project

* Update yarn on travis

* Remove example yarn.lock due to integrity check issues

* Also ignore package lock in example folder
  • Loading branch information
kristfal committed Jan 11, 2020
1 parent b4d8bb2 commit 5e4fb24
Show file tree
Hide file tree
Showing 4 changed files with 282 additions and 263 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -52,6 +52,7 @@ node_modules
.nvm
/bots/node_modules/
package-lock.json
/example/package-lock.json

# OS X
.DS_Store
Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
Expand Up @@ -5,7 +5,7 @@ matrix:
before_install:
- nvm install 8
- echo yes | sdkmanager "platforms;android-28"
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.16.0
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.21.1
- export PATH=$HOME/.yarn/bin:$PATH
android:
components:
Expand Down Expand Up @@ -40,7 +40,7 @@ matrix:
podfile: example/ios/Podfile

before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.16.0
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.21.1
- export PATH=$HOME/.yarn/bin:$PATH

install:
Expand Down Expand Up @@ -83,4 +83,4 @@ deploy:
on:
tags: true
repo: react-native-mapbox-gl/maps
branch: master
branch: master
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -20,7 +20,7 @@
"url": "https://github.com/react-native-mapbox-gl/maps"
},
"scripts": {
"fetch:ios:sdk": "node ./scripts/download-mapbox-gl-native-ios-if-on-mac.js 5.5.0",
"fetch:ios:sdk": "node ./scripts/download-mapbox-gl-native-ios-if-on-mac.js 5.6.1",
"fetch:style:spec": ". ./scripts/download-style-spec.sh",
"generate": "node ./scripts/autogenerate",
"preinstall": "npm run fetch:ios:sdk",
Expand Down

0 comments on commit 5e4fb24

Please sign in to comment.