Skip to content

Commit ffffdfb

Browse files
committed
Upgrade to work with react-native 0.40.0, add eslint rules
1 parent 4095a5d commit ffffdfb

File tree

7 files changed

+44
-11
lines changed

7 files changed

+44
-11
lines changed

.babelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"presets": ["react-native"]
3+
}

.eslintrc.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
module.exports = {
2+
env: { browser: true },
3+
extends: [ 'standard', 'standard-react' ],
4+
plugins: [ 'import' ],
5+
parser: 'babel-eslint',
6+
rules: {
7+
// For readability (TODO: sort imports in same group)
8+
'import/order': ['error',{'newlines-between': 'always'}],
9+
}
10+
}

WebImage/Vendor/SDWebImage/SDWebImage.xcodeproj/xcshareddata/xcschemes/WebImage tvOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0710"
3+
LastUpgradeVersion = "0820"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

WebImage/Vendor/SDWebImage/SDWebImage.xcodeproj/xcshareddata/xcschemes/WebImage.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0710"
3+
LastUpgradeVersion = "0820"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

WebImage/WebImage.xcodeproj/project.pbxproj

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -261,9 +261,7 @@
261261
CLANG_WARN_SUSPICIOUS_MOVES = YES;
262262
CLANG_WARN_UNREACHABLE_CODE = YES;
263263
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
264-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
265264
COPY_PHASE_STRIP = NO;
266-
DEBUG_INFORMATION_FORMAT = dwarf;
267265
ENABLE_STRICT_OBJC_MSGSEND = YES;
268266
ENABLE_TESTABILITY = YES;
269267
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -280,11 +278,11 @@
280278
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
281279
GCC_WARN_UNUSED_FUNCTION = YES;
282280
GCC_WARN_UNUSED_VARIABLE = YES;
283-
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../node_modules/react-native/React/**";
284281
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
285282
MTL_ENABLE_DEBUG_INFO = YES;
286283
ONLY_ACTIVE_ARCH = YES;
287284
SDKROOT = iphoneos;
285+
SKIP_INSTALL = YES;
288286
};
289287
name = Debug;
290288
};
@@ -309,9 +307,7 @@
309307
CLANG_WARN_SUSPICIOUS_MOVES = YES;
310308
CLANG_WARN_UNREACHABLE_CODE = YES;
311309
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
312-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
313-
COPY_PHASE_STRIP = NO;
314-
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
310+
COPY_PHASE_STRIP = YES;
315311
ENABLE_NS_ASSERTIONS = NO;
316312
ENABLE_STRICT_OBJC_MSGSEND = YES;
317313
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -322,10 +318,10 @@
322318
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
323319
GCC_WARN_UNUSED_FUNCTION = YES;
324320
GCC_WARN_UNUSED_VARIABLE = YES;
325-
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../node_modules/react-native/React/**";
326321
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
327322
MTL_ENABLE_DEBUG_INFO = NO;
328323
SDKROOT = iphoneos;
324+
SKIP_INSTALL = YES;
329325
VALIDATE_PRODUCT = YES;
330326
};
331327
name = Release;
@@ -367,6 +363,7 @@
367363
A28797281DE0C0A60081BDFA /* Release */,
368364
);
369365
defaultConfigurationIsVisible = 0;
366+
defaultConfigurationName = Release;
370367
};
371368
/* End XCConfigurationList section */
372369
};

WebImage/WebImage/WebImageViewManager.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#import <SDWebImage/UIImageView+WebCache.h>
55

6-
#import "RCTViewManager.h"
6+
#import <React/RCTViewManager.h>
77

88
@interface WebImageViewManager : RCTViewManager
99

package.json

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@
1515
"cache",
1616
"mobile"
1717
],
18+
"files": [
19+
".babelrc",
20+
"android",
21+
"WebImage",
22+
"index.js",
23+
"LICENSE",
24+
"README.md"
25+
],
1826
"author": "Vladimir Timofeev <vovkasm@gmail.com>",
1927
"homepage": "https://github.com/vovkasm/react-native-web-image",
2028
"bugs": {
@@ -24,5 +32,20 @@
2432
"type": "git",
2533
"url": "git://github.com/vovkasm/react-native-web-image.git"
2634
},
27-
"license": "MIT"
35+
"license": "MIT",
36+
"devDependencies": {
37+
"babel-eslint": "^7.0.0",
38+
"babel-preset-react-native": "^1.9.0",
39+
"eslint": "^3.3.1",
40+
"eslint-config-standard": "^6.2.1",
41+
"eslint-config-standard-react": "^4.2.0",
42+
"eslint-plugin-classes": "^0.1.1",
43+
"eslint-plugin-import": "^2.0",
44+
"eslint-plugin-promise": "^3.4.0",
45+
"eslint-plugin-react": "^6.8.0",
46+
"eslint-plugin-react-native": "^2.0.0",
47+
"eslint-plugin-standard": "^2.0.1",
48+
"react": "15.4.2",
49+
"react-native": "0.40.0"
50+
}
2851
}

0 commit comments

Comments
 (0)