Skip to content

Commit

Permalink
fix android RN breaking change - remove createJSModules
Browse files Browse the repository at this point in the history
  • Loading branch information
MacKentoch committed Aug 15, 2017
1 parent bdd64f0 commit 12d5827
Show file tree
Hide file tree
Showing 17 changed files with 4,653 additions and 290 deletions.
4 changes: 3 additions & 1 deletion .babelrc
@@ -1,3 +1,5 @@
{
"presets": ["flow"]
"presets": [
"flow"
]
}
3 changes: 2 additions & 1 deletion .editorconfig
Expand Up @@ -2,4 +2,5 @@ root = true

[*]
indent_style = space
indent_size = 2
indent_size = 2
insert_final_newline = true
8 changes: 7 additions & 1 deletion .eslintrc
Expand Up @@ -8,10 +8,16 @@
"env": {
"es6": true,
"jasmine": true,
"jest": true
},

"plugins": [
"react"
"react",
"flowtype"
],
"extends": [
"plugin:react/recommended",
"plugin:flowtype/recommended"
],

// Map from global var to bool specifying if it can be redefined
Expand Down
1 change: 1 addition & 0 deletions .nvmrc
@@ -0,0 +1 @@
6.11.1
1 change: 1 addition & 0 deletions CHANGELOG.md
@@ -1,6 +1,7 @@
## 1.0.5 (UPCOMING)
- improved documentation
- when you want to understand or something's wrong please have a look at [this detailed documentation + code sample](https://github.com/MacKentoch/react-native-beacons-manager/tree/master/examples/samples)
- fix `React Native 0.47` android breaking change: `Remove unused createJSModules`

## 1.0.4 (RELEASE)
- same as v1.0.3 (npm publish nightmare...)
Expand Down
4 changes: 2 additions & 2 deletions android/.settings/org.eclipse.buildship.core.prefs
@@ -1,3 +1,3 @@
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
connection.project.dir=
#Tue Aug 15 09:41:57 CEST 2017
eclipse.preferences.version=1
connection.project.dir=
Expand Up @@ -23,7 +23,6 @@ public List<ViewManager> createViewManagers(ReactApplicationContext reactContext
return new ArrayList<>();
}

@Override
public List<Class<? extends JavaScriptModule>> createJSModules() {
return new ArrayList<>();
}
Expand Down
2 changes: 1 addition & 1 deletion examples/BeaconsDemo/.eslintrc
Expand Up @@ -7,7 +7,7 @@

"env": {
"es6": true,
"jasmine": true,
"jasmine": true
},

"plugins": [
Expand Down
11 changes: 5 additions & 6 deletions jsconfig.json
@@ -1,9 +1,8 @@
{
"compilerOptions": {
"allowJs": true,
"allowSyntheticDefaultImports": true
},
"exclude": [
"node_modules"
"typeAcquisition": {
"include": [
"react",
"react-native"
]
}
}
2 changes: 0 additions & 2 deletions lib/module.android.js
@@ -1,7 +1,5 @@
// @flow

'use strict';

import { NativeModules } from 'react-native';

const beaconsAndroid: any = NativeModules.BeaconsAndroidModule;
Expand Down
2 changes: 0 additions & 2 deletions lib/module.ios.js
@@ -1,7 +1,5 @@
// @flow

'use strict';

import { NativeModules } from 'react-native';
const NativeRNiBeacons = NativeModules.RNiBeacon;

Expand Down
17 changes: 12 additions & 5 deletions package.json
Expand Up @@ -25,6 +25,11 @@
"directories": {
"example": "examples"
},
"engines": {
"node": ">=6.11.1",
"npm": ">=5.3.0",
"yarn": ">=0.27.5"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"flow": "node_modules/.bin/flow",
Expand All @@ -35,12 +40,14 @@
"nativePackage": true,
"devDependencies": {
"babel-cli": "^6.24.1",
"babel-eslint": "^7.1.1",
"babel-eslint": "^7.2.3",
"babel-preset-flow": "^6.23.0",
"eslint": "^3.15.0",
"eslint-plugin-react": "^6.10.0",
"eslint-plugin-react-native": "^2.2.1",
"flow-bin": "^0.46.0",
"eslint": "^4.4.1",
"eslint-plugin-flowtype": "^2.35.0",
"eslint-plugin-react": "^7.2.0",
"eslint-plugin-react-native": "^3.0.1",
"flow-bin": "^0.52.0",
"prop-types": "^15.5.10",
"react": "^15.4.2",
"react-native": "^0.41.2"
},
Expand Down
5 changes: 4 additions & 1 deletion typings.json
@@ -1,4 +1,7 @@
{
"name": "react-native-beacons-manager",
"dependencies": {}
"dependencies": {},
"globalDependencies": {
"node": "registry:dt/node#7.0.0+20170322231424"
}
}

0 comments on commit 12d5827

Please sign in to comment.