use custom Function interface instead of java 8

This commit is contained in:
Roman Volosovskyi 2017-09-26 11:19:38 +02:00
parent 698e90a62c
commit 133bd2da7b
6 changed files with 68 additions and 30 deletions

View File

@ -108,20 +108,13 @@ android {
defaultConfig { defaultConfig {
applicationId "im.status.ethereum" applicationId "im.status.ethereum"
minSdkVersion 18 minSdkVersion 18
targetSdkVersion 24 targetSdkVersion 23
multiDexEnabled true multiDexEnabled true
versionCode getVersionCode() versionCode getVersionCode()
versionName getVersionName() versionName getVersionName()
ndk { ndk {
abiFilters "armeabi-v7a", "x86" abiFilters "armeabi-v7a", "x86"
} }
jackOptions {
enabled true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
} }
dexOptions { dexOptions {
jumboMode true jumboMode true
@ -199,6 +192,7 @@ dependencies {
compile project(':react-native-fcm') compile project(':react-native-fcm')
compile 'com.google.firebase:firebase-core:10.0.1' //this decides your firebase SDK version compile 'com.google.firebase:firebase-core:10.0.1' //this decides your firebase SDK version
compile 'status-im:function:0.0.1'
compile fileTree(dir: "node_modules/realm/android/libs", include: ["*.jar"]) compile fileTree(dir: "node_modules/realm/android/libs", include: ["*.jar"])
} }
// Run this once to be able to run the application with BUCK // Run this once to be able to run the application with BUCK

View File

@ -32,7 +32,7 @@ import me.alwx.HttpServer.HttpServerReactPackage;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.function.Function; import im.status.ethereum.function.Function;
public class MainApplication extends MultiDexApplication implements ReactApplication { public class MainApplication extends MultiDexApplication implements ReactApplication {

View File

@ -15,5 +15,6 @@ android {
dependencies { dependencies {
compile 'com.facebook.react:react-native:+' compile 'com.facebook.react:react-native:+'
compile 'com.instabug.library:instabug:3+' compile 'com.instabug.library:instabug:3+'
compile 'status-im:function:0.0.1'
compile(group: 'status-im', name: 'status-go', version: 'develop-g283ae3e', ext: 'aar') compile(group: 'status-im', name: 'status-go', version: 'develop-g283ae3e', ext: 'aar')
} }

View File

@ -10,7 +10,7 @@ import com.github.status_im.status_go.cmd.Statusgo;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.function.Function; import im.status.ethereum.function.Function;
public class StatusPackage implements ReactPackage { public class StatusPackage implements ReactPackage {

81
package-lock.json generated
View File

@ -4,6 +4,11 @@
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
"Base64": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz",
"integrity": "sha1-ujpCMHCOGGcFBl5mur3Uw1z2ACg="
},
"abbrev": { "abbrev": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
@ -428,12 +433,56 @@
"resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz", "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
"integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
"requires": { "requires": {
"babel-core": "6.26.0",
"babel-runtime": "6.26.0", "babel-runtime": "6.26.0",
"core-js": "2.5.1", "core-js": "2.5.1",
"home-or-tmp": "2.0.0", "home-or-tmp": "2.0.0",
"lodash": "4.17.4", "lodash": "4.17.4",
"mkdirp": "0.5.1", "mkdirp": "0.5.1",
"source-map-support": "0.4.18" "source-map-support": "0.4.18"
},
"dependencies": {
"babel-core": {
"version": "6.26.0",
"resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz",
"integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=",
"requires": {
"babel-code-frame": "6.26.0",
"babel-generator": "6.26.0",
"babel-helpers": "6.24.1",
"babel-messages": "6.23.0",
"babel-register": "6.26.0",
"babel-runtime": "6.26.0",
"babel-template": "6.26.0",
"babel-traverse": "6.26.0",
"babel-types": "6.26.0",
"babylon": "6.18.0",
"convert-source-map": "1.5.0",
"debug": "2.6.8",
"json5": "0.5.1",
"lodash": "4.17.4",
"minimatch": "3.0.4",
"path-is-absolute": "1.0.1",
"private": "0.1.7",
"slash": "1.0.0",
"source-map": "0.5.7"
}
},
"babel-generator": {
"version": "6.26.0",
"resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz",
"integrity": "sha1-rBriAHC3n248odMmlhMFN3TyDcU=",
"requires": {
"babel-messages": "6.23.0",
"babel-runtime": "6.26.0",
"babel-types": "6.26.0",
"detect-indent": "4.0.0",
"jsesc": "1.3.0",
"lodash": "4.17.4",
"source-map": "0.5.7",
"trim-right": "1.0.1"
}
}
} }
} }
} }
@ -1122,11 +1171,6 @@
"resolved": "https://registry.npmjs.org/base-64/-/base-64-0.1.0.tgz", "resolved": "https://registry.npmjs.org/base-64/-/base-64-0.1.0.tgz",
"integrity": "sha1-eAqZyE59YAJgNhURxId2E78k9rs=" "integrity": "sha1-eAqZyE59YAJgNhURxId2E78k9rs="
}, },
"Base64": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz",
"integrity": "sha1-ujpCMHCOGGcFBl5mur3Uw1z2ACg="
},
"base64-js": { "base64-js": {
"version": "0.0.8", "version": "0.0.8",
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
@ -5284,14 +5328,13 @@
} }
}, },
"react": { "react": {
"version": "16.0.0-rc.3", "version": "16.0.0-alpha.6",
"resolved": "https://registry.npmjs.org/react/-/react-16.0.0-rc.3.tgz", "resolved": "https://registry.npmjs.org/react/-/react-16.0.0-alpha.6.tgz",
"integrity": "sha1-Sp35ljJrpxhZA9n77TFJdl4jfiY=", "integrity": "sha1-LMsa+0QlzMEveKEjpmby5MFBrbk=",
"requires": { "requires": {
"fbjs": "0.8.15", "fbjs": "0.8.15",
"loose-envify": "1.3.1", "loose-envify": "1.3.1",
"object-assign": "4.1.1", "object-assign": "4.1.1"
"prop-types": "15.5.10"
} }
}, },
"react-clone-referenced-element": { "react-clone-referenced-element": {
@ -5749,9 +5792,9 @@
} }
}, },
"react-native-tcp": { "react-native-tcp": {
"version": "3.3.0", "version": "3.2.1",
"resolved": "https://registry.npmjs.org/react-native-tcp/-/react-native-tcp-3.3.0.tgz", "resolved": "https://registry.npmjs.org/react-native-tcp/-/react-native-tcp-3.2.1.tgz",
"integrity": "sha512-WAiL3IGhVxvmM0iw7/5ZRzdkiJBfBbLoFKNaHLJIsTZVqD/N5ZHUlJMjIQ+RrmB/f5nJ82bUEZ2vPCxe+rlNqQ==", "integrity": "sha1-yfQBoWnF2Trh8AP6TRUf2fCoKpk=",
"requires": { "requires": {
"base64-js": "0.0.8", "base64-js": "0.0.8",
"buffer": "5.0.7", "buffer": "5.0.7",
@ -5954,7 +5997,7 @@
} }
}, },
"react-native-webview-bridge": { "react-native-webview-bridge": {
"version": "git+https://github.com/status-im/react-native-webview-bridge.git#3fc01ceeffaaffc6b86f7bc74edac7999530ffb1", "version": "git+https://github.com/status-im/react-native-webview-bridge.git#ae384894b51365db1c3f8578e15f041f9d6d264a",
"requires": { "requires": {
"invariant": "2.2.0", "invariant": "2.2.0",
"keymirror": "0.1.1" "keymirror": "0.1.1"
@ -7011,11 +7054,6 @@
} }
} }
}, },
"string_decoder": {
"version": "0.10.31",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
},
"string-range": { "string-range": {
"version": "1.2.2", "version": "1.2.2",
"resolved": "https://registry.npmjs.org/string-range/-/string-range-1.2.2.tgz", "resolved": "https://registry.npmjs.org/string-range/-/string-range-1.2.2.tgz",
@ -7036,6 +7074,11 @@
"resolved": "https://registry.npmjs.org/string.fromcodepoint/-/string.fromcodepoint-0.2.1.tgz", "resolved": "https://registry.npmjs.org/string.fromcodepoint/-/string.fromcodepoint-0.2.1.tgz",
"integrity": "sha1-jZeDM8C8klOPUPOD5IiPPlYZ1lM=" "integrity": "sha1-jZeDM8C8klOPUPOD5IiPPlYZ1lM="
}, },
"string_decoder": {
"version": "0.10.31",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
},
"stringstream": { "stringstream": {
"version": "0.0.5", "version": "0.0.5",
"resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",

View File

@ -79,7 +79,7 @@
"react-native-tcp": "^3.2.1", "react-native-tcp": "^3.2.1",
"react-native-udp": "^2.0.0", "react-native-udp": "^2.0.0",
"react-native-vector-icons": "^4.0.1", "react-native-vector-icons": "^4.0.1",
"react-native-webview-bridge": "git+https://github.com/status-im/react-native-webview-bridge.git#remove-status-go", "react-native-webview-bridge": "git+https://github.com/status-im/react-native-webview-bridge.git#remove-status-go-2",
"readable-stream": "1.0.33", "readable-stream": "1.0.33",
"realm": "^0.14.3", "realm": "^0.14.3",
"stream-browserify": "^1.0.0", "stream-browserify": "^1.0.0",