Skip to content

Commit

Permalink
Rename react-native-mapbox-gl/maps to rnmapbox/maps
Browse files Browse the repository at this point in the history
  • Loading branch information
mfazekas committed Mar 16, 2022
1 parent ead7262 commit 90379a9
Show file tree
Hide file tree
Showing 76 changed files with 147 additions and 128 deletions.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ import {
ShapeSource,
LineLayer,
Camera,
} from '@react-native-mapbox-gl/maps';
} from '@rnmapbox/maps';

const aLine = {
type: 'LineString',
Expand Down Expand Up @@ -80,7 +80,7 @@ Example:
react-native init sample --version [email protected]
cd sample
npm install rnmapbox/maps#main --save
# or released version `npm install @react-native-mapbox-gl/[email protected] --save`
# or released version `npm install @rnmapbox/[email protected] --save`
react-native run-android
```

Expand All @@ -99,7 +99,7 @@ If applicable, add screenshots to help explain your problem.
- Device: [e.g. iPhone6]
- Emulator/ Simulator: [yes/ no]
- Dev OS: [e.g. OSX 11.0.1, Win10]
- react-native-mapbox-gl Version [e.g. 7.0.9]
- @rnmapbox/maps Version [e.g. 10.0.1]
- Mapbox GL version [e.g. 6.3.0]
- React Native Version [e.g. 0.59]

Expand Down
2 changes: 1 addition & 1 deletion .github/label-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
close: true
"question":
comment: >
:thinking: @{issue-author}, this is rather a question than an issue<br>please use our [discussions](https://github.com/rnmapbox/maps/discussions) or [gitter](https://gitter.im/react-native-mapbox-gl/Lobby) or stackoverflow for this.
:thinking: @{issue-author}, this is rather a question than an issue<br>please use our [discussions](https://github.com/rnmapbox/maps/discussions) or [gitter](https://gitter.im/rnmapbox/Lobby) or stackoverflow for this.
# Close the issue
close: true
"stale":
Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/ios-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,8 @@ jobs:
- name: Install Yarn Dependencies
run: yarn install --network-timeout 1000000

- name: Check cocapods
run: |
curl https://cdn.cocoapods.org/CocoaPods-version.yml
curl https://cdn.cocoapods.org/all_pods.txt
ruby -e 'require "yaml" ; puts YAML.load(`curl https://cdn.cocoapods.org/CocoaPods-version.yml`).inspect'
- name: Install Pod Dependencies
run: cd ios && pod --version && pod install --verbose
run: cd ios && pod --version && pod update RCT-Folly --no-repo-update && pod install
env:
CI_MAP_IMPL: ${{ inputs.MAP_IMPL }}

Expand Down
24 changes: 15 additions & 9 deletions .github/workflows/on-push.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
name: CI
on: [push, pull_request]
on:
push:
branches:
- main
pull_request:
branches:
- main

concurrency:
group: ${{ github.head_ref || github.run_id }}
Expand Down Expand Up @@ -40,13 +46,13 @@ jobs:
has_mapbox_token:
runs-on: ubuntu-latest
outputs:
has_mapbox_token: ${{ steps.has_mapbox_token.outputs.defined }}
has-mapbox-token: ${{ steps.has-mapbox-token.outputs.defined }}
steps:
- id: has_mapbox_token
env:
MAPBOX_ACCESS_TOKEN: ${{ secrets.MAPBOX_ACCESS_TOKEN }}
if: "${{ env.MAPBOX_ACCESS_TOKEN != '' }}"
run: echo "::set-output name=defined::true"
- id: has-mapbox-token
env:
MAPBOX_ACCESS_TOKEN: ${{ secrets.MAPBOX_ACCESS_TOKEN }}
if: "${{ env.MAPBOX_ACCESS_TOKEN != '' }}"
run: echo "::set-output name=defined::true"

call_android_workflow:
name: "Android/Mapbox"
Expand All @@ -55,7 +61,7 @@ jobs:
with:
NVMRC: ${{ needs.lint_test_generate.outputs.NVMRC }}
MAP_IMPL: mapbox
if: needs.has_mapbox_token.outputs.has_mapbox_token == 'true'
if: needs.has_mapbox_token.outputs.has-mapbox-token == 'true'
secrets:
MAPBOX_ACCESS_TOKEN: ${{ secrets.MAPBOX_ACCESS_TOKEN }}
MAPBOX_DOWNLOAD_TOKEN: ${{ secrets.MAPBOX_DOWNLOAD_TOKEN }}
Expand All @@ -75,7 +81,7 @@ jobs:
name: "iOS/Mapbox"
needs: [lint_test_generate,has_mapbox_token]
uses: ./.github/workflows/ios-actions.yml
if: needs.has_mapbox_token.outputs.has_mapbox_token == 'true'
if: needs.has_mapbox_token.outputs.has-mapbox-token == 'true'
with:
NVMRC: ${{ needs.lint_test_generate.outputs.NVMRC }}
MAP_IMPL: mapbox
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ coverage
*.core.prefs
*.iml

react-native-mapbox-gl-maps.tgz
rnmapbox-maps.tgz

# Config plugin
/plugin/build
2 changes: 1 addition & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ android/gradlew
android/gradlew.bat
android/local.properties

# react-native-mapbox-gl
# rnmapbox/maps
example
__tests__
coverage
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ npm run android
```js
import React, { Component } from 'react';
import { StyleSheet, View } from 'react-native';
import MapboxGL from '@react-native-mapbox-gl/maps';
import MapboxGL from '@rnmapbox/maps';

MapboxGL.setAccessToken('<YOUR_ACCESSTOKEN>');

Expand Down
2 changes: 1 addition & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ As redundant as it might sound, please add the changes from the `CHANGELOG.md` i

## Monitor the repos issues for updates

Once the release is out the door (on [npm](https://www.npmjs.com/package/@react-native-mapbox-gl/maps)), make sure to monitor the [issues](https://github.com/rnmapbox/maps/issues) closely for problems the community might encounter
Once the release is out the door (on [npm](https://www.npmjs.com/package/@rnmapbox/maps)), make sure to monitor the [issues](https://github.com/rnmapbox/maps/issues) closely for problems the community might encounter
2 changes: 1 addition & 1 deletion android/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ buildscript {
}
```

Feel free to check out the `/example` projects [`android/build.gradle`](https://github.com/react-native-mapbox-gl/maps/blob/master/example/android/build.gradle) for inspiration!
Feel free to check out the `/example` projects [`android/build.gradle`](https://github.com/rnmapbox/maps/blob/master/example/android/build.gradle) for inspiration!

## Mapbox Maps SDK v10

Expand Down
6 changes: 6 additions & 0 deletions android/rctmgl/.classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin/default"/>
</classpath>
8 changes: 4 additions & 4 deletions docs/GettingStarted.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Getting Started

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

```js
import MapboxGL from "@react-native-mapbox-gl/maps";
import MapboxGL from "@rnmapbox/maps";

MapboxGL.setAccessToken("<YOUR_ACCESSTOKEN>");
```
Expand All @@ -25,7 +25,7 @@ If you are hosting styles and sources on localhost, you might need to set the co
Manually sets the connectivity state of the app, bypassing any checks to the ConnectivityManager. Set to `true` for connected, `false` for disconnected, and `null` for ConnectivityManager to determine.

```js
import MapboxGL from "@react-native-mapbox-gl/maps";
import MapboxGL from "@rnmapbox/maps";

MapboxGL.setConnected(true);
```
Expand All @@ -48,7 +48,7 @@ For more information on mapbox and telemetry: [https://www.mapbox.com/telemetry]
```js
import React, { Component } from "react";
import { StyleSheet, View } from "react-native";
import MapboxGL from "@react-native-mapbox-gl/maps";
import MapboxGL from "@rnmapbox/maps";

MapboxGL.setAccessToken("<YOUR_ACCESSTOKEN>");

Expand Down
6 changes: 6 additions & 0 deletions example/android/app/.classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin/default"/>
</classpath>
5 changes: 5 additions & 0 deletions example/ios/.byebug_history
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
c
target
c
up
target
1 change: 1 addition & 0 deletions example/ios/.ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.6.6
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"object": {
"pins": [
{
"package": "MapLibre GL Native",
"repositoryURL": "https://github.com/maplibre/maplibre-gl-native-distribution",
"state": {
"branch": null,
"revision": "d761956e81e74d8bdbfba31e0ec3a75616190658",
"version": "5.12.2"
}
}
]
},
"version": 1
}
2 changes: 1 addition & 1 deletion example/metro.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const exclusionList = require('metro-config/src/defaults/exclusionList');
const glob = require('glob-to-regexp');

const extraNodeModules = {
'@react-native-mapbox-gl/maps': path.resolve(__dirname + '/../maps'),
'@rnmapbox/maps': path.resolve(__dirname + '/../maps'),
};

function getBlacklist() {
Expand Down
2 changes: 1 addition & 1 deletion example/src/App.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import MapboxGL from '@react-native-mapbox-gl/maps';
import MapboxGL from '@rnmapbox/maps';
import {StyleSheet, Text, View, LogBox, SafeAreaView} from 'react-native';
import {createStackNavigator, TransitionPresets} from 'react-navigation-stack';
import {createAppContainer} from 'react-navigation';
Expand Down
2 changes: 1 addition & 1 deletion example/src/examples/Animations/AnimatedLine.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import {Easing, Button} from 'react-native';
import {Animated, MapView, Camera} from '@react-native-mapbox-gl/maps';
import {Animated, MapView, Camera} from '@rnmapbox/maps';
import along from '@turf/along';
import length from '@turf/length';
import {point, lineString} from '@turf/helpers';
Expand Down
2 changes: 1 addition & 1 deletion example/src/examples/Animations/DriveTheLine.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import MapboxGL from '@react-native-mapbox-gl/maps';
import MapboxGL from '@rnmapbox/maps';
import {View, StyleSheet} from 'react-native';
import {Button} from 'react-native-elements';
import {lineString as makeLineString} from '@turf/helpers';
Expand Down
2 changes: 1 addition & 1 deletion example/src/examples/Annotations/CustomCallout.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, {FC, useState} from 'react';
import MapboxGL, {SymbolLayerStyle} from '@react-native-mapbox-gl/maps';
import MapboxGL, {SymbolLayerStyle} from '@rnmapbox/maps';
import {Feature} from '@turf/helpers/dist/js';
import {View, Text, ViewStyle, StyleProp, TextStyle} from 'react-native';

Expand Down
2 changes: 1 addition & 1 deletion example/src/examples/Annotations/Heatmap.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import MapboxGL from '@react-native-mapbox-gl/maps';
import MapboxGL from '@rnmapbox/maps';

import sheet from '../../styles/sheet';
import {SF_OFFICE_COORDINATE} from '../../utils';
Expand Down
2 changes: 1 addition & 1 deletion example/src/examples/Annotations/MarkerView.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import {View, Text, TouchableOpacity} from 'react-native';
import MapboxGL from '@react-native-mapbox-gl/maps';
import MapboxGL from '@rnmapbox/maps';
import PropTypes from 'prop-types';

import sheet from '../../styles/sheet';
Expand Down
2 changes: 1 addition & 1 deletion example/src/examples/Annotations/PointAnnotationAnchors.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import MapboxGL from '@react-native-mapbox-gl/maps';
import MapboxGL from '@rnmapbox/maps';
import {StyleSheet, Text, View} from 'react-native';

import sheet from '../../styles/sheet';
Expand Down
2 changes: 1 addition & 1 deletion example/src/examples/Annotations/ShowPointAnnotation.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import {Animated, View, Text, StyleSheet, Image} from 'react-native';
import MapboxGL from '@react-native-mapbox-gl/maps';
import MapboxGL from '@rnmapbox/maps';
import PropTypes from 'prop-types';

import sheet from '../../styles/sheet';
Expand Down
2 changes: 1 addition & 1 deletion example/src/examples/BugReportExample.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
SymbolLayer,
CircleLayer,
Camera,
} from '@react-native-mapbox-gl/maps';
} from '@rnmapbox/maps';

const styles = {
mapView: {flex: 1},
Expand Down
2 changes: 1 addition & 1 deletion example/src/examples/CacheManagement.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import MapboxGL, {MapView, Camera} from '@react-native-mapbox-gl/maps';
import MapboxGL, {MapView, Camera} from '@rnmapbox/maps';
import {
Alert,
StyleSheet,
Expand Down
2 changes: 1 addition & 1 deletion example/src/examples/Camera/CompassView.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import {MapView, Camera} from '@react-native-mapbox-gl/maps';
import {MapView, Camera} from '@rnmapbox/maps';

import sheet from '../../styles/sheet';
import BaseExamplePropTypes from '../common/BaseExamplePropTypes';
Expand Down
2 changes: 1 addition & 1 deletion example/src/examples/Camera/Fit.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import {View, Text} from 'react-native';
import {isEqual} from 'lodash';
import {ScrollView, TouchableOpacity} from 'react-native-gesture-handler';
import MapboxGL from '@react-native-mapbox-gl/maps';
import MapboxGL from '@rnmapbox/maps';

import sheet from '../../styles/sheet';
import BaseExamplePropTypes from '../common/BaseExamplePropTypes';
Expand Down
2 changes: 1 addition & 1 deletion example/src/examples/Camera/FlyTo.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import {Alert} from 'react-native';
import MapboxGL from '@react-native-mapbox-gl/maps';
import MapboxGL from '@rnmapbox/maps';

import sheet from '../../styles/sheet';
import BaseExamplePropTypes from '../common/BaseExamplePropTypes';
Expand Down
2 changes: 1 addition & 1 deletion example/src/examples/Camera/GetCenter.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import {Text} from 'react-native';
import MapboxGL from '@react-native-mapbox-gl/maps';
import MapboxGL from '@rnmapbox/maps';

import BaseExamplePropTypes from '../common/BaseExamplePropTypes';
import Page from '../common/Page';
Expand Down
2 changes: 1 addition & 1 deletion example/src/examples/Camera/GetZoom.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import {Text} from 'react-native';
import MapboxGL from '@react-native-mapbox-gl/maps';
import MapboxGL from '@rnmapbox/maps';

import BaseExamplePropTypes from '../common/BaseExamplePropTypes';
import Page from '../common/Page';
Expand Down
2 changes: 1 addition & 1 deletion example/src/examples/Camera/RestrictMapBounds.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import MapboxGL from '@react-native-mapbox-gl/maps';
import MapboxGL from '@rnmapbox/maps';
import bboxPolygon from '@turf/bbox-polygon';

import sheet from '../../styles/sheet';
Expand Down
2 changes: 1 addition & 1 deletion example/src/examples/Camera/SetHeading.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import MapboxGL from '@react-native-mapbox-gl/maps';
import MapboxGL from '@rnmapbox/maps';

import sheet from '../../styles/sheet';
import BaseExamplePropTypes from '../common/BaseExamplePropTypes';
Expand Down
2 changes: 1 addition & 1 deletion example/src/examples/Camera/SetPitch.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import MapboxGL from '@react-native-mapbox-gl/maps';
import MapboxGL from '@rnmapbox/maps';

import sheet from '../../styles/sheet';
import BaseExamplePropTypes from '../common/BaseExamplePropTypes';
Expand Down
2 changes: 1 addition & 1 deletion example/src/examples/Camera/SetUserTrackingModes.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import {Text} from 'react-native';
import MapboxGL from '@react-native-mapbox-gl/maps';
import MapboxGL from '@rnmapbox/maps';

import sheet from '../../styles/sheet';
import {onSortOptions} from '../../utils';
Expand Down
2 changes: 1 addition & 1 deletion example/src/examples/Camera/TakeSnapshot.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import MapboxGL from '@react-native-mapbox-gl/maps';
import MapboxGL from '@rnmapbox/maps';
import {
View,
Image,
Expand Down
2 changes: 1 addition & 1 deletion example/src/examples/Camera/TakeSnapshotWithMap.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import {StyleSheet, View, Text, TouchableOpacity, Image} from 'react-native';
import MapboxGL from '@react-native-mapbox-gl/maps';
import MapboxGL from '@rnmapbox/maps';

import sheet from '../../styles/sheet';
import colors from '../../styles/colors';
Expand Down
2 changes: 1 addition & 1 deletion example/src/examples/Camera/YoYo.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import MapboxGL from '@react-native-mapbox-gl/maps';
import MapboxGL from '@rnmapbox/maps';

import sheet from '../../styles/sheet';
import colors from '../../styles/colors';
Expand Down
Loading

0 comments on commit 90379a9

Please sign in to comment.