Skip to content

Commit

Permalink
Merge tag '7.0.8' into release/7.0.8-robin
Browse files Browse the repository at this point in the history
  • Loading branch information
jutaz committed Dec 2, 2019
2 parents d67d706 + 0a91fb9 commit 26b8212
Show file tree
Hide file tree
Showing 99 changed files with 3,284 additions and 1,304 deletions.
15 changes: 15 additions & 0 deletions .sonarcloud.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Path to sources
sonar.sources=javascript,android/src,ios/RCTMGL
#sonar.exclusions=
#sonar.inclusions=

# Path to tests
sonar.tests=__tests__
#sonar.test.exclusions=
#sonar.test.inclusions=

# Source encoding
#sonar.sourceEncoding=UTF-8

# Exclusions for copy-paste detection
#sonar.cpd.exclusions=
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ script:
- yarn global add -g '[email protected]'
- yarn install
- yarn run unittest
- yarn run generate
deploy:
provider: npm
email: [email protected]
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

### Breaking changes:

* iOS mapbox libraries updated to [5.2.0](https://github.com/mapbox/mapbox-gl-native/releases/tag/ios-v5.2.0) android libraries updated to [8.2.1](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.2.1)
* iOS mapbox libraries updated to [5.3.2](https://github.com/mapbox/mapbox-gl-native/releases/tag/ios-v5.3.2) android libraries updated to [8.2.1](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.2.1)
* `StyleSheet.create` removed.
Mapbox styles are now just a map no need for `StyleSheet.create`.
`StylesSheet.identity` also removed, use expressions array instead:
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ commit the changes and push them to a fork for creating a pull request.
1. If you add a feature, make sure you add it to the documentation
1. If you add an objective-c or java method, make sure you update the declaration file: `index.d.ts`.


## Documentation

1. Documentation is auto-generated from code blocks and comments. To generate documentation:
1. `npm install -g documentation` to install documentation generator
1. `npm run generate` to generate updated documentation
Documentation is generated from code blocks and comments.
It will be auto-generated when you commit changes.
If any changes are generated from your edits, the changed files will need to be added using `git add` before attempting the commit again.
To manually generate the changes, run `npm run generate`.
2 changes: 1 addition & 1 deletion android/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ You can set the Support Library version or the okhttp version if you use other m
* `okhttpVersion "3.12.1"`


## 3. `android/app/settings.gradle`
## 3. `android/settings.gradle`

Include project, so gradle knows where to find the project

Expand Down
1 change: 1 addition & 0 deletions android/rctmgl/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ dependencies {

implementation 'com.mapbox.mapboxsdk:mapbox-sdk-services:4.8.0'
implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:8.2.1'
implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v8:0.7.0'

// Dependencies
implementation "com.android.support:support-vector-drawable:${safeExtGet('supportLibVersion', '28.0.0')}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public List<ViewManager> createViewManagers(ReactApplicationContext reactApplica
// sources
managers.add(new RCTMGLVectorSourceManager(reactApplicationContext));
managers.add(new RCTMGLShapeSourceManager(reactApplicationContext));
managers.add(new RCTMGLRasterSourceManager());
managers.add(new RCTMGLRasterSourceManager(reactApplicationContext));
managers.add(new RCTMGLImageSourceManager());

// layers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,19 @@

import android.view.ViewGroup;

import com.facebook.react.ReactApplication;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.common.MapBuilder;
import com.facebook.react.uimanager.ThemedReactContext;
import com.facebook.react.uimanager.UIManagerModule;
import com.facebook.react.uimanager.ViewGroupManager;
import com.facebook.react.uimanager.events.RCTEventEmitter;
import com.facebook.react.uimanager.events.EventDispatcher;
import com.mapbox.rctmgl.events.IEvent;

import java.util.HashMap;
import java.util.Map;

import javax.annotation.Nullable;

import com.facebook.react.uimanager.events.EventDispatcher;
import com.mapbox.rctmgl.events.EventEmitter;
import com.mapbox.rctmgl.events.IEvent;
import javax.annotation.Nonnull;

/**
* Created by nickitaliano on 8/23/17.
Expand Down Expand Up @@ -47,14 +44,19 @@ public void handleEvent(IEvent event) {
}

@Override
protected void addEventEmitters(ThemedReactContext context, T view) {
protected void addEventEmitters(ThemedReactContext context, @Nonnull T view) {
mEventDispatcher = context.getNativeModule(UIManagerModule.class).getEventDispatcher();
}

@Nullable
@Override
public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
Map<String, String> events = customEvents();

if (events == null) {
return null;
}

Map<String, Object> exportedEvents = new HashMap<>();

for (Map.Entry<String, String> event : events.entrySet()) {
Expand All @@ -64,6 +66,7 @@ public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
return exportedEvents;
}

@Nullable
public abstract Map<String, String> customEvents();

private boolean shouldDropEvent(String cacheKey, IEvent event) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,4 @@ public class RCTMGLCallout extends ReactViewGroup {
public RCTMGLCallout(Context context) {
super(context);
}

@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
setMeasuredDimension(getWidth(), getHeight());
}
}

This file was deleted.

Loading

0 comments on commit 26b8212

Please sign in to comment.