fix android RN breaking change - remove createJSModules

MacKentoch · MacKentoch · commit 12d5827958a3 · 2017-08-15T13:40:14.000+02:00
diff --git a/.babelrc b/.babelrc
@@ -1,3 +1,5 @@
 {
-  "presets": ["flow"]
+  "presets": [
+    "flow"
+  ]
 }
diff --git a/.editorconfig b/.editorconfig
@@ -2,4 +2,5 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 2
+indent_size = 2
+insert_final_newline = true
diff --git a/.eslintrc b/.eslintrc
@@ -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
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+6.11.1
diff --git a/CHANGELOG.md b/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...)
diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/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=
diff --git a/android/src/main/java/com/mackentoch/beaconsandroid/BeaconsAndroidPackage.java b/android/src/main/java/com/mackentoch/beaconsandroid/BeaconsAndroidPackage.java
@@ -23,7 +23,6 @@ public List<ViewManager> createViewManagers(ReactApplicationContext reactContext
         return new ArrayList<>();
     }
 
-    @Override
     public List<Class<? extends JavaScriptModule>> createJSModules() {
         return new ArrayList<>();
     }
diff --git a/examples/BeaconsDemo/.eslintrc b/examples/BeaconsDemo/.eslintrc
@@ -7,7 +7,7 @@
 
   "env": {
     "es6": true,
-    "jasmine": true,
+    "jasmine": true
   },
 
   "plugins": [
diff --git a/jsconfig.json b/jsconfig.json
@@ -1,9 +1,8 @@
 {
-    "compilerOptions": {
-        "allowJs": true,
-        "allowSyntheticDefaultImports": true
-    },
-    "exclude": [
-        "node_modules"
+  "typeAcquisition": {
+    "include": [
+      "react",
+      "react-native"
     ]
+  }
 }
diff --git a/lib/module.android.js b/lib/module.android.js
@@ -1,7 +1,5 @@
 // @flow
 
-'use strict';
-
 import { NativeModules } from 'react-native';
 
 const beaconsAndroid: any = NativeModules.BeaconsAndroidModule;
diff --git a/lib/module.ios.js b/lib/module.ios.js
@@ -1,7 +1,5 @@
 // @flow
 
-'use strict';
-
 import { NativeModules } from 'react-native';
 const NativeRNiBeacons = NativeModules.RNiBeacon;
 
diff --git a/package.json b/package.json
@@ -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",
@@ -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"
   },
diff --git a/typings.json b/typings.json
@@ -1,4 +1,7 @@
 {
   "name": "react-native-beacons-manager",
-  "dependencies": {}
+  "dependencies": {},
+  "globalDependencies": {
+    "node": "registry:dt/node#7.0.0+20170322231424"
+  }
 }
diff --git a/typings/globals/node/index.d.ts b/typings/globals/node/index.d.ts
diff --git a/typings/globals/node/typings.json b/typings/globals/node/typings.json
diff --git a/typings/index.d.ts b/typings/index.d.ts
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
`1`	`1`	`{`
`2`		`- "presets": ["flow"]`
	`2`	`+ "presets": [`
	`3`	`+ "flow"`
	`4`	`+ ]`
`3`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ public List<ViewManager> createViewManagers(ReactApplicationContext reactContext`
`23`	`23`	`return new ArrayList<>();`
`24`	`24`	`}`
`25`	`25`
`26`		`- @Override`
`27`	`26`	`public List<Class<? extends JavaScriptModule>> createJSModules() {`
`28`	`27`	`return new ArrayList<>();`
`29`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,8 @@`
`1`	`1`	`{`
`2`		`- "compilerOptions": {`
`3`		`- "allowJs": true,`
`4`		`- "allowSyntheticDefaultImports": true`
`5`		`- },`
`6`		`- "exclude": [`
`7`		`- "node_modules"`
	`2`	`+ "typeAcquisition": {`
	`3`	`+ "include": [`
	`4`	`+ "react",`
	`5`	`+ "react-native"`
`8`	`6`	`]`
	`7`	`+ }`
`9`	`8`	`}`