Skip to content

Commit ec27927

Browse files
authored
Infra organization rename (#72)
* [INFRA] Organization rename * [INFRA] Fix missing change, update getting started docs * [INFRA] Use Travis CI for publishing to NPM
1 parent f00d3c0 commit ec27927

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+82
-79
lines changed

.travis.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ matrix:
2121
- $HOME/.gradle/caches/
2222
- $HOME/.gradle/wrapper/
2323
before_cache:
24-
- rm -f example/node_modules/\@react-native-mapbox/
24+
- rm -f example/node_modules/\@react-native-mapbox-gl/
2525
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
2626
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
2727
- os: osx
@@ -35,7 +35,7 @@ matrix:
3535
- example/node_modules
3636
- $HOME/Library/Caches/Homebrew
3737
before_cache:
38-
- rm -f example/node_modules/\@react-native-mapbox/
38+
- rm -f example/node_modules/\@react-native-mapbox-gl/
3939
- brew cleanup
4040
podfile: example/ios/Podfile
4141

@@ -47,7 +47,7 @@ install:
4747
- cd $TRAVIS_BUILD_DIR/example
4848
- echo $MAPBOX_ACCESS_TOKEN > ./accesstoken
4949
- find node_modules -name ".git" -exec rm -r "{}" \; || true
50-
- rm -rf example/node_modules/\@react-native-mapbox/
50+
- rm -rf example/node_modules/\@react-native-mapbox-gl/
5151
- yarn install
5252
- echo $TRAVIS_OS_NAME
5353
- |
@@ -74,3 +74,12 @@ script:
7474
- yarn global add -g 'jest@24.8.0'
7575
- yarn install
7676
- yarn run unittest
77+
deploy:
78+
provider: npm
79+
email: kristfallro@gmail.com
80+
api_key:
81+
secure: B2hTPnT+8dWEbpBc8c2/8rwlmha8iVkRXzj88W+bgsg3k1c+tX+fNTJtbHqtahMuLfkBn6iSxfL9Bv70pXUSkdjyArlE7QdddzMx6UOO9vjoReuh1lyWNTHDx2u9iOSFYX1zsEJrf6wXkfhAtrBqF/tg2pu2NdHcaTy9grhPGnQgFpVCYKrQ67uoursqavd0nUiXVAteLH12zo0Nn1LhchogWA6CZPzz5PNgOv/KuiGIt/fmcg/Y7nlwI5BL0R29MmTIDR33tP509lFwyFTgqY/Xv4jWy0Miw+r0WQFYllkncj6dpuJ7FTdmOMfwL5vJX7B+kpZAtiBlXWtuIetRAfa/1KIWqeSIAYZTNFoEOymOXQM6DWklB3guGkAMnXNZslUvUevPzAY4SUL5fcoD+3FO8H4VAm328+hCtQWkyZbNLrU4X1FHd3BVY19YiHONHLGND9jzyzM/z0JocV0VG5azaIpPQDFVOjxhrWzTMAgwA+hNKtvQJegXIbW/sQJp12zPLv0dHJuIKjwXrnQtlSdr8JResHPFcLScuAWJ4QTSU2khcn0Ul5RnhCSGD3ic45nt46AzABqBhD6rMLesH+gbJ/i9v3LbiU7+r5JSTPfZ4ntJs168AeXy27hnWck54OjKIHp6JZ25jbJwTRCEZH1i7ETYKcheyTRR4sDiUxI=
82+
on:
83+
tags: true
84+
repo: react-native-mapbox-gl/maps
85+
branch: master

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
1. `cd` into your project
88
1. You have 2 options for linking `react-native-mapbox-gl`
99
* Use `react-native link`
10-
* Clone `@react-native-mapbox/maps` into the `node_modules` folder
10+
* Clone `@react-native-mapbox-gl/maps` into the `node_modules` folder
1111
1. Go through a normal install process for your platform
1212

13-
Once installed, you can edit any file in `@react-native-mapbox/maps`,
13+
Once installed, you can edit any file in `@react-native-mapbox-gl/maps`,
1414
commit the changes and push them to a fork for creating a pull request.
1515

1616
## Best practices for PR's

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
_An unofficial React Native library for building maps with the [Mapbox Maps SDK for iOS](https://www.mapbox.com/ios-sdk/) and [Mapbox Maps SDK for Android](https://www.mapbox.com/android-sdk/)_
44

55
[![npm version](https://badge.fury.io/js/%40mapbox%2Freact-native-mapbox-gl.svg)](https://badge.fury.io/js/%40mapbox%2Freact-native-mapbox-gl)
6-
![build_status](https://travis-ci.org/react-native-mapbox/maps.svg?branch=master)
6+
![build_status](https://travis-ci.org/react-native-mapbox-gl/maps.svg?branch=master)
77

88
## Installation
99

@@ -15,18 +15,18 @@ _An unofficial React Native library for building maps with the [Mapbox Maps SDK
1515

1616
**Git**
1717
```
18-
git clone git@github.com:react-native-mapbox/maps.git
18+
git clone git@github.com:react-native-mapbox-gl/maps.git
1919
cd maps
2020
```
2121

2222
**Yarn**
2323
```
24-
yarn add @react-native-mapbox/maps
24+
yarn add @react-native-mapbox-gl/maps
2525
```
2626

2727
**Npm**
2828
```
29-
npm install @react-native-mapbox/maps --save
29+
npm install @react-native-mapbox-gl/maps --save
3030
```
3131

3232
## Installation Guides

android/install.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ dependencies {
4343
implementation fileTree(dir: "libs", include: ["*.jar"])
4444
implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
4545
implementation "com.facebook.react:react-native:+" // From node_modules
46-
+ implementation project(':react-native-mapbox/maps')
46+
+ implementation project(':react-native-mapbox-gl/maps')
4747
}
4848
```
4949

@@ -60,7 +60,7 @@ Include project, so gradle knows where to find the project
6060
rootProject.name = <YOUR_PROJECT_NAME>
6161

6262
+include ':@react-native-mapbox_maps'
63-
+project(':@react-native-mapbox_maps').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-mapbox/maps/android/rctmgl')
63+
+project(':@react-native-mapbox_maps').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-mapbox-gl/maps/android/rctmgl')
6464

6565
include ':app'¬
6666
```

docs/GettingStarted.md

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Getting Started
22

3-
Congratulations, you successfully installed react-native-mapbox/maps! 🎉
3+
Congratulations, you successfully installed react-native-mapbox-gl/maps! 🎉
44
Where to go from here?
55
You can head straight to [examples](/example) folder if you want to jump into the deep end.
66
However, if you prefer an easier ramp-up, then make sure to stick around and check out the guides below.
@@ -13,7 +13,7 @@ You can create and manage your access tokens on your [Mapbox Account page](https
1313
Once you have your accessToken, set it like this
1414

1515
```js
16-
import MapboxGL from "@react-native-mapbox/maps";
16+
import MapboxGL from "@react-native-mapbox-gl/maps";
1717

1818
MapboxGL.setAccessToken("<YOUR_ACCESSTOKEN>");
1919
```
@@ -23,13 +23,9 @@ MapboxGL.setAccessToken("<YOUR_ACCESSTOKEN>");
2323
By default mapbox collects telemetry.
2424
If you would like to programmatically disable this within your app add the code below.
2525

26-
Notice that `isTelemetryEnabled` returns a Promise.
27-
2826
```js
2927
componentDidMount() {
30-
MapboxGL.isTelemetryEnabled().then(isEnabled => {
31-
isEnabled && MapboxGL.setTelemetryEnabled(false);
32-
});
28+
MapboxGL.setTelemetryEnabled(false);
3329
}
3430
```
3531

@@ -40,7 +36,7 @@ For more information on mapbox and telemetry: [https://www.mapbox.com/telemetry]
4036
```js
4137
import React, { Component } from "react";
4238
import { StyleSheet, View } from "react-native";
43-
import MapboxGL from "@react-native-mapbox/maps";
39+
import MapboxGL from "@react-native-mapbox-gl/maps";
4440

4541
MapboxGL.setAccessToken("<YOUR_ACCESSTOKEN>");
4642

@@ -63,9 +59,7 @@ const styles = StyleSheet.create({
6359

6460
export default class App extends Component {
6561
componentDidMount() {
66-
MapboxGL.isTelemetryEnabled().then(isEnabled => {
67-
isEnabled && MapboxGL.setTelemetryEnabled(false);
68-
});
62+
MapboxGL.setTelemetryEnabled(false);
6963
}
7064

7165
render() {

example/android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ rootProject.name = 'RNMapboxGLExample'
22
include ':app'
33

44
include ':android-mapbox-react-native-mapbox-gl'
5-
project(':android-mapbox-react-native-mapbox-gl').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-mapbox/maps/android/rctmgl')
5+
project(':android-mapbox-react-native-mapbox-gl').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-mapbox-gl/maps/android/rctmgl')
66

77
include ':react-native-vector-icons'
88
project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')

example/ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ target 'RNMapboxGLExample' do
3030
pod 'Folly', :podspec => "#{rn_path}/third-party-podspecs/Folly.podspec"
3131

3232
# Mapbox
33-
pod 'react-native-mapbox-gl', :path => '../node_modules/@react-native-mapbox/maps'
33+
pod 'react-native-mapbox-gl', :path => '../node_modules/@react-native-mapbox-gl/maps'
3434

3535
# RN-Vector-Icons
3636
pod 'RNVectorIcons', :path => '../node_modules/react-native-vector-icons'

example/ios/RNMapboxGLExample.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1252,7 +1252,7 @@
12521252
);
12531253
inputPaths = (
12541254
"${SRCROOT}/Pods/Target Support Files/Pods-RNMapboxGLExample/Pods-RNMapboxGLExample-frameworks.sh",
1255-
"${PODS_ROOT}/../../node_modules/@react-native-mapbox/maps/ios/Mapbox.framework",
1255+
"${PODS_ROOT}/../../node_modules/@react-native-mapbox-gl/maps/ios/Mapbox.framework",
12561256
);
12571257
name = "[CP] Embed Pods Frameworks";
12581258
outputFileListPaths = (
@@ -1350,7 +1350,7 @@
13501350
);
13511351
inputPaths = (
13521352
"${SRCROOT}/Pods/Target Support Files/Pods-RNMapboxGLExample/Pods-RNMapboxGLExample-frameworks.sh",
1353-
"${PODS_ROOT}/../../node_modules/@react-native-mapbox/maps/ios/Mapbox.framework",
1353+
"${PODS_ROOT}/../../node_modules/@react-native-mapbox-gl/maps/ios/Mapbox.framework",
13541354
);
13551355
name = "[CP] Embed Pods Frameworks";
13561356
outputPaths = (
@@ -1476,7 +1476,7 @@
14761476
DEAD_CODE_STRIPPING = NO;
14771477
FRAMEWORK_SEARCH_PATHS = (
14781478
"$(inherited)",
1479-
"$(PROJECT_DIR)/../node_modules/@mapbox/react-native-mapbox-gl/ios",
1479+
"$(PROJECT_DIR)/../node_modules/@react-native-mapbox-gl/maps/ios",
14801480
);
14811481
HEADER_SEARCH_PATHS = "$(inherited)";
14821482
INFOPLIST_FILE = RNMapboxGLExample/Info.plist;
@@ -1503,7 +1503,7 @@
15031503
CURRENT_PROJECT_VERSION = 1;
15041504
FRAMEWORK_SEARCH_PATHS = (
15051505
"$(inherited)",
1506-
"$(PROJECT_DIR)/../node_modules/@mapbox/react-native-mapbox-gl/ios",
1506+
"$(PROJECT_DIR)/../node_modules/@react-native-mapbox-gl/maps/ios",
15071507
);
15081508
HEADER_SEARCH_PATHS = "$(inherited)";
15091509
INFOPLIST_FILE = RNMapboxGLExample/Info.plist;

example/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"dependencies": {
1616
"@mapbox/geo-viewport": "^0.4.0",
17-
"@react-native-mapbox/maps": "file:../react-native-mapbox-maps-7.0.0.tgz",
17+
"@react-native-mapbox-gl/maps": "file:../react-native-mapbox-gl-maps-7.0.0.tgz",
1818
"@turf/along": "^5.1.5",
1919
"@turf/bearing": "^5.1.5",
2020
"@turf/distance": "^5.1.5",

example/scripts/watch_rngl.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const path = require('path');
22
const fs = require('fs-extra');
33

44
const RNGL_DIR = path.join('..');
5-
const RNGL_EXAMPLE_DIR = path.join('node_modules', '@mapbox', 'react-native-mapbox-gl');
5+
const RNGL_EXAMPLE_DIR = path.join('node_modules', '@react-native-mapbox-gl', 'maps');
66

77
function copyFile(source, dest) {
88
return new Promise((resolve, reject) => {

0 commit comments

Comments
 (0)