Skip to content

Commit e411c75

Browse files
committed
Now using yarn link to develop
1 parent a02ce37 commit e411c75

11 files changed

Lines changed: 2200 additions & 240 deletions

File tree

example/.babelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"presets": ["react-native", "react-native-stage-0/decorator-support"]
2+
"presets": ["react-native"]
33
}

example/.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,3 @@ buck-out/
5151
fastlane/report.xml
5252
fastlane/Preview.html
5353
fastlane/screenshots
54-
55-
ImageHeaderScrollView/*.js

example/android/app/BUCK

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import re
2-
31
# To learn about Buck see [Docs](https://buckbuild.com/).
42
# To run your application with Buck:
53
# - install Buck
@@ -11,56 +9,57 @@ import re
119
#
1210

1311
lib_deps = []
12+
1413
for jarfile in glob(['libs/*.jar']):
15-
name = 'jars__' + re.sub(r'^.*/([^/]+)\.jar$', r'\1', jarfile)
14+
name = 'jars__' + jarfile[jarfile.rindex('/') + 1: jarfile.rindex('.jar')]
1615
lib_deps.append(':' + name)
1716
prebuilt_jar(
1817
name = name,
1918
binary_jar = jarfile,
2019
)
2120

2221
for aarfile in glob(['libs/*.aar']):
23-
name = 'aars__' + re.sub(r'^.*/([^/]+)\.aar$', r'\1', aarfile)
22+
name = 'aars__' + aarfile[aarfile.rindex('/') + 1: aarfile.rindex('.aar')]
2423
lib_deps.append(':' + name)
2524
android_prebuilt_aar(
2625
name = name,
2726
aar = aarfile,
2827
)
2928

3029
android_library(
31-
name = 'all-libs',
32-
exported_deps = lib_deps
30+
name = "all-libs",
31+
exported_deps = lib_deps,
3332
)
3433

3534
android_library(
36-
name = 'app-code',
37-
srcs = glob([
38-
'src/main/java/**/*.java',
39-
]),
40-
deps = [
41-
':all-libs',
42-
':build_config',
43-
':res',
44-
],
35+
name = "app-code",
36+
srcs = glob([
37+
"src/main/java/**/*.java",
38+
]),
39+
deps = [
40+
":all-libs",
41+
":build_config",
42+
":res",
43+
],
4544
)
4645

4746
android_build_config(
48-
name = 'build_config',
49-
package = 'com.imageheaderscrollview',
47+
name = "build_config",
48+
package = "com.imageheaderscrollview",
5049
)
5150

5251
android_resource(
53-
name = 'res',
54-
res = 'src/main/res',
55-
package = 'com.imageheaderscrollview',
52+
name = "res",
53+
package = "com.imageheaderscrollview",
54+
res = "src/main/res",
5655
)
5756

5857
android_binary(
59-
name = 'app',
60-
package_type = 'debug',
61-
manifest = 'src/main/AndroidManifest.xml',
62-
keystore = '//android/keystores:debug',
63-
deps = [
64-
':app-code',
65-
],
58+
name = "app",
59+
keystore = "//android/keystores:debug",
60+
manifest = "src/main/AndroidManifest.xml",
61+
package_type = "debug",
62+
deps = [
63+
":app-code",
64+
],
6665
)

example/android/app/build.gradle

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@ import com.android.build.OutputFile
3333
* // bundleInPaidRelease: true,
3434
* // bundleInBeta: true,
3535
*
36+
* // whether to disable dev mode in custom build variants (by default only disabled in release)
37+
* // for example: to disable dev mode in the staging build type (if configured)
38+
* devDisabledInStaging: true,
39+
* // The configuration property can be in the following formats
40+
* // 'devDisabledIn${productFlavor}${buildType}'
41+
* // 'devDisabledIn${buildType}'
42+
*
3643
* // the root of your project, i.e. where "package.json" lives
3744
* root: "../../",
3845
*
@@ -58,7 +65,7 @@ import com.android.build.OutputFile
5865
* inputExcludes: ["android/**", "ios/**"],
5966
*
6067
* // override which node gets called and with what additional arguments
61-
* nodeExecutableAndArgs: ["node"]
68+
* nodeExecutableAndArgs: ["node"],
6269
*
6370
* // supply additional arguments to the packager
6471
* extraPackagerArgs: []

example/android/app/proguard-rules.pro

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@
5050

5151
-dontwarn com.facebook.react.**
5252

53+
# TextLayoutBuilder uses a non-public Android constructor within StaticLayout.
54+
# See libs/proxy/src/main/java/com/facebook/fbui/textlayoutbuilder/proxy for details.
55+
-dontwarn android.text.StaticLayout
56+
5357
# okhttp
5458

5559
-keepattributes Signature

example/android/keystores/BUCK

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
keystore(
2-
name = 'debug',
3-
store = 'debug.keystore',
4-
properties = 'debug.keystore.properties',
5-
visibility = [
6-
'PUBLIC',
7-
],
2+
name = "debug",
3+
properties = "debug.keystore.properties",
4+
store = "debug.keystore",
5+
visibility = [
6+
"PUBLIC",
7+
],
88
)

example/ios/imageHeaderScrollView.xcodeproj/project.pbxproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -998,8 +998,7 @@
998998
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
999999
CURRENT_PROJECT_VERSION = 1;
10001000
DEAD_CODE_STRIPPING = NO;
1001-
DEVELOPMENT_TEAM = "";
1002-
INFOPLIST_FILE = "$(SRCROOT)/imageHeaderScrollViewTests/Info.plist";
1001+
INFOPLIST_FILE = imageHeaderScrollView/Info.plist;
10031002
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
10041003
OTHER_LDFLAGS = (
10051004
"$(inherited)",
@@ -1016,8 +1015,7 @@
10161015
buildSettings = {
10171016
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
10181017
CURRENT_PROJECT_VERSION = 1;
1019-
DEVELOPMENT_TEAM = "";
1020-
INFOPLIST_FILE = "$(SRCROOT)/imageHeaderScrollViewTests/Info.plist";
1018+
INFOPLIST_FILE = imageHeaderScrollView/Info.plist;
10211019
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
10221020
OTHER_LDFLAGS = (
10231021
"$(inherited)",

example/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,14 @@
88
"lint": "eslint ."
99
},
1010
"dependencies": {
11-
"babel-preset-react-native-stage-0": "^1.0.1",
1211
"react": "16.0.0-alpha.12",
1312
"react-native": "^0.47.1",
1413
"react-native-animatable": "^1.1.0",
1514
"react-native-image-header-scroll-view": "^0.6.1",
1615
"react-navigation": "^1.0.0-beta.11"
1716
},
1817
"devDependencies": {
19-
"babel-jest": "19.0.0",
20-
"babel-preset-react-native": "1.9.1",
18+
"babel-preset-react-native": "2.1.0",
2119
"eslint": "^3.19.0",
2220
"eslint-config-prettier": "1.7.0",
2321
"eslint-config-react-app": "^0.6.2",

0 commit comments

Comments
 (0)