Browse Source

Merge branch 'master' into set-deployment-target-to-8

Darin Wilson 8 years ago
parent
commit
a89b20fbf7
3 changed files with 3 additions and 3 deletions
  1. 1
    1
      ReactNativePermissions.js
  2. 1
    1
      ReactNativePermissions.podspec
  3. 1
    1
      package.json

+ 1
- 1
ReactNativePermissions.js View File

58
 
58
 
59
 
59
 
60
 	getPermissionStatus(permission) {
60
 	getPermissionStatus(permission) {
61
-  	if (RNPTypes.indexOf(permission) >= 0) {
61
+  	if (this.getPermissionTypes().indexOf(permission) >= 0) {
62
 			return RNPermissions.getPermissionStatus(permission)
62
 			return RNPermissions.getPermissionStatus(permission)
63
 		} else {
63
 		} else {
64
 			return Promise.reject(`ReactNativePermissions: ${permission} is not a valid permission type on ${Platform.OS}`)
64
 			return Promise.reject(`ReactNativePermissions: ${permission} is not a valid permission type on ${Platform.OS}`)

+ 1
- 1
ReactNativePermissions.podspec View File

18
   s.dependency 'React'
18
   s.dependency 'React'
19
 
19
 
20
   s.preserve_paths      = 'docs', 'CHANGELOG.md', 'LICENSE', 'package.json', 'ReactNativePermissions.ios.js'
20
   s.preserve_paths      = 'docs', 'CHANGELOG.md', 'LICENSE', 'package.json', 'ReactNativePermissions.ios.js'
21
-  s.source_files        = '*.{h,m}'
21
+  s.source_files        = '**/*.{h,m}'
22
 end
22
 end

+ 1
- 1
package.json View File

1
 {
1
 {
2
   "name": "react-native-permissions",
2
   "name": "react-native-permissions",
3
-  "version": "0.2.0",
3
+  "version": "0.2.2",
4
   "repository": {
4
   "repository": {
5
     "type": "git",
5
     "type": "git",
6
     "url": "https://github.com/joshblour/react-native-permissions.git"
6
     "url": "https://github.com/joshblour/react-native-permissions.git"