Skip to content

Commit

Permalink
issue 3037: Fix android compilation warnings
Browse files Browse the repository at this point in the history
Signed-off-by: Dmitry Novotochinov <[email protected]>
  • Loading branch information
pacamara authored and dmitryn committed Feb 1, 2018
1 parent 008f877 commit 6dd585f
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 49 deletions.
67 changes: 33 additions & 34 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,7 @@ def getVersionName = { ->
}

android {
compileSdkVersion 24
buildToolsVersion "26.0.2"
compileSdkVersion 27

defaultConfig {
applicationId "im.status.ethereum"
Expand Down Expand Up @@ -187,38 +186,38 @@ android {
}

dependencies {
compile project(':react-native-svg')
compile project(':react-native-mapbox-gl')
compile 'com.android.support:multidex:1.0.2'
compile project(':react-native-http-bridge')
compile project(':nfc-react-native')
compile project(':instabug-reactnative')
compile project(':react-native-splash-screen')
compile project(':react-native-image-resizer')
compile project(':react-native-dialogs')
compile project(':react-native-randombytes')
compile project(':react-native-android-sms-listener')
compile project(':realm')
compile project(':react-native-vector-icons')
compile fileTree(dir: "libs", include: ["*.jar"])
compile "com.android.support:appcompat-v7:23.0.1"
compile "com.facebook.react:react-native:+" // From node_modules
compile project(':react-native-contacts')
compile project(':react-native-i18n')
compile project(':react-native-linear-gradient')
compile project(':react-native-camera')
compile project(':react-native-status')
compile project(':react-native-orientation')
compile project(':react-native-fs')
compile project(':react-native-image-crop-picker')
compile project(':react-native-webview-bridge')
compile 'testfairy:testfairy-android-sdk:1.+@aar'
compile project(':react-native-config')
compile project(':react-native-fcm')
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"])
implementation project(':react-native-svg')
implementation project(':react-native-mapbox-gl')
implementation 'com.android.support:multidex:1.0.2'
implementation project(':react-native-http-bridge')
implementation project(':nfc-react-native')
implementation project(':instabug-reactnative')
implementation project(':react-native-splash-screen')
implementation project(':react-native-image-resizer')
implementation project(':react-native-dialogs')
implementation project(':react-native-randombytes')
implementation project(':react-native-android-sms-listener')
implementation project(':realm')
implementation project(':react-native-vector-icons')
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation "com.android.support:appcompat-v7:23.0.1"
implementation "com.facebook.react:react-native:+" // From node_modules
implementation project(':react-native-contacts')
implementation project(':react-native-i18n')
implementation project(':react-native-linear-gradient')
implementation project(':react-native-camera')
implementation project(':react-native-status')
implementation project(':react-native-orientation')
implementation project(':react-native-fs')
implementation project(':react-native-image-crop-picker')
implementation project(':react-native-webview-bridge')
implementation 'testfairy:testfairy-android-sdk:1.+@aar'
implementation project(':react-native-config')
implementation project(':react-native-fcm')
implementation 'com.google.firebase:firebase-core:10.0.1' //this decides your firebase SDK version

implementation 'status-im:function:0.0.1'
implementation fileTree(dir: "node_modules/realm/android/libs", include: ["*.jar"])
}
// Run this once to be able to run the application with BUCK
// puts all compile dependencies into folder libs for BUCK to use
Expand Down
4 changes: 2 additions & 2 deletions android/app/jni/Application.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
APP_ABI := all
APP_PLATFORM := android-15
APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
APP_PLATFORM := android-18
APP_STL := gnustl_static
NDK_TOOLCHAIN_VERSION=4.9
7 changes: 1 addition & 6 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,8 @@
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

<!-- these permissions should be removed -->
<!-- react-native-orientation adds an unnecessary permission; here we remove it -->
<uses-permission android:name="android.permission.BLUETOOTH" tools:node="remove"/>
<!-- react-native-contacts -->
<uses-permission android:name="android.permission.WRITE_CONTACTS" tools:node="remove"/>
<!-- react-native-camera -->
<!-- RECORD_AUDIO is pulled in by instabug-reactnative, not needed for status-react -->
<uses-permission android:name="android.permission.RECORD_AUDIO" tools:node="remove"/>
<uses-permission android:name="android.permission.RECORD_VIDEO" tools:node="remove"/>
<!-- React Native unnecessary permissions (https://github.com/facebook/react-native/issues/5886) -->
<uses-permission android:name="android.permission.READ_PHONE_STATE" tools:node="remove"/>

Expand Down
11 changes: 5 additions & 6 deletions modules/react-native-status/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
compileSdkVersion 24
buildToolsVersion "23.0.1"

defaultConfig {
minSdkVersion 18
Expand All @@ -13,10 +12,10 @@ android {
}

dependencies {
compile 'com.facebook.react:react-native:+'
compile 'com.instabug.library:instabug:3+'
compile 'com.github.ericwlange:AndroidJSCore:3.0.1'
compile 'status-im:function:0.0.1'
implementation 'com.facebook.react:react-native:+'
implementation 'com.instabug.library:instabug:3+'
implementation 'com.github.ericwlange:AndroidJSCore:3.0.1'
implementation 'status-im:function:0.0.1'

String statusGoVersion = 'develop-gd71c66a2'
final String statusGoGroup = 'status-im', statusGoName = 'status-go'
Expand All @@ -28,5 +27,5 @@ dependencies {
statusGoVersion = localVersion
}

compile(group: statusGoGroup, name: statusGoName, version: statusGoVersion, ext: 'aar')
implementation(group: statusGoGroup, name: statusGoName, version: statusGoVersion, ext: 'aar')
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"react-native-randombytes": "3.0.0",
"react-native-sortable-listview": "0.2.6",
"react-native-splash-screen": "3.0.6",
"react-native-svg": "6.0.0",
"react-native-svg": "6.0.1-rc.3",
"react-native-tcp": "3.3.0",
"react-native-udp": "2.2.1",
"react-native-vector-icons": "4.4.2",
Expand Down

0 comments on commit 6dd585f

Please sign in to comment.