Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Browser Injection for both platforms #113

Merged
merged 12 commits into from
Sep 1, 2018
Merged

Fix Browser Injection for both platforms #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
28ded36
android working with request interception
brunobar79 Sep 1, 2018
7bc6f24
fix reload
brunobar79 Sep 1, 2018
c0a93a7
progress bar working on android
brunobar79 Sep 1, 2018
bea9ee9
working like a charm
brunobar79 Sep 1, 2018
d19bb4a
migrate to react-native-web3-webview
brunobar79 Sep 1, 2018
2bf6066
fix unit tests
brunobar79 Sep 1, 2018
c5415f8
update unit tests
brunobar79 Sep 1, 2018
f4ad5d9
working
brunobar79 Sep 1, 2018
60842f8
clean up
brunobar79 Sep 1, 2018
620fc30
cleanup
brunobar79 Sep 1, 2018
f75f912
use mac osx for builds
brunobar79 Sep 1, 2018
458c037
fix circle config
brunobar79 Sep 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ version: 2
jobs:
prep-deps:
<<: *defaults
docker:
- image: circleci/node:9
macos:
xcode: "9.4.1"
steps:
- checkout
- restore_cache: *restore-cache
Expand All @@ -34,8 +34,8 @@ jobs:

lint:
<<: *defaults
docker:
- image: circleci/node:9
macos:
xcode: "9.4.1"
steps:
- checkout
- attach_workspace:
Expand All @@ -44,8 +44,8 @@ jobs:

test-unit:
<<: *defaults
docker:
- image: circleci/node:9
macos:
xcode: "9.4.1"
steps:
- checkout
- attach_workspace:
Expand All @@ -60,12 +60,10 @@ jobs:
<<: *defaults
macos:
xcode: "9.4.1"

steps:
- checkout
- attach_workspace:
at: .
- run: npm rebuild
- run:
name: Load dependencies
command:
Expand All @@ -78,8 +76,8 @@ jobs:

upload-coverage:
<<: *defaults
docker:
- image: circleci/node:9
macos:
xcode: "9.4.1"
steps:
- checkout
- attach_workspace:
Expand All @@ -88,9 +86,10 @@ jobs:
- run: codecov

all-tests-pass:
docker:
- image: circleci/node:9
steps:
<<: *defaults
macos:
xcode: "9.4.1"
steps:
- run:
name: All Tests Passed
command: echo 'weew - everything passed!'
Expand Down
45 changes: 24 additions & 21 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,9 @@ android {
ndk {
abiFilters "armeabi-v7a", "x86"
}
dexOptions {
javaMaxHeapSize "2048M"
}
}
splits {
abi {
Expand Down Expand Up @@ -163,30 +166,30 @@ android {
}

dependencies {
compile project(':react-native-camera')
compile project(':react-native-share')
compile project(':react-native-i18n')
compile project(':react-native-fabric')
compile 'com.android.support:multidex:1.0.1'
compile project(':react-native-aes-crypto')
compile project(':react-native-keychain')
compile project(':react-native-os')
compile project(':react-native-linear-gradient')
compile project(':react-native-randombytes')
compile project(':react-native-fs')
compile project(':react-native-vector-icons')
compile fileTree(dir: "libs", include: ["*.jar"])
compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
compile "com.facebook.react:react-native:+" // From node_modules
compile('com.crashlytics.sdk.android:crashlytics:2.9.4@aar') {
api project(':react-native-web3-webview')
api project(':react-native-camera')
api project(':react-native-share')
api project(':react-native-i18n')
api project(':react-native-fabric')
api 'com.android.support:multidex:1.0.1'
api project(':react-native-aes-crypto')
api project(':react-native-keychain')
api project(':react-native-os')
api project(':react-native-linear-gradient')
api project(':react-native-randombytes')
api project(':react-native-fs')
api project(':react-native-vector-icons')
api fileTree(dir: "libs", include: ["*.jar"])
api "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
api "com.facebook.react:react-native:+" // From node_modules
api('com.crashlytics.sdk.android:crashlytics:2.9.4@aar') {
transitive = true;
}

androidTestCompile(project(path: ":detox"))
androidTestCompile 'junit:junit:4.12'
androidTestCompile 'com.android.support.test:runner:1.0.1'
androidTestCompile 'com.android.support.test:rules:1.0.1'

androidTestImplementation(project(path: ":detox"))
androidTestImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test:rules:1.0.1'
}

// Run this once to be able to run the application with BUCK
Expand Down
3 changes: 0 additions & 3 deletions android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@
</intent-filter>
</activity>
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
<meta-data
android:name="io.fabric.ApiKey"
android:value="9216d1fa651341733ac1220be0cb2e62d4f703a1" />
<meta-data
android:name="io.fabric.ApiKey"
android:value="9216d1fa651341733ac1220be0cb2e62d4f703a1" />
Expand Down
Loading