some android stuff

status-im · Mar 27, 2019 · 306e5d5 · 306e5d5
1 parent 77580f8
commit 306e5d5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 19 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -235,7 +235,6 @@ configurations.all {
 }
 
 dependencies {
-    implementation 'com.facebook.fresco:animated-gif:1.10.0'
     implementation project(':react-native-background-timer')
     implementation project(':react-native-svg')
     implementation 'com.android.support:multidex:1.0.2'
@@ -245,7 +244,7 @@ dependencies {
     implementation project(':react-native-dialogs')
     implementation project(':realm')
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "com.android.support:appcompat-v7:28.+"
+    implementation "com.android.support:appcompat-v7:28.0.0"
     // Force using exact RN version instead of relying on gradle dependency resolution
     // https://docs.gradle.org/current/userguide/introduction_dependency_management.html#sec:dependency_resolution
     //compile ("com.facebook.react:react-native:0.55.4") { force = true }  // From node_modules
@@ -274,6 +273,7 @@ dependencies {
 
     compile 'com.github.status-im:function:0.0.1'
     implementation fileTree(dir: "node_modules/realm/android/libs", include: ["*.jar"])
+    implementation 'com.facebook.fresco:animated-gif:1.10.0'
 }
 
 // Run this once to be able to run the application with BUCK

diff --git a/android/build.gradle b/android/build.gradle
@@ -24,21 +24,8 @@ buildscript {
 }
 
 subprojects {
-    /*project.configurations.all {
-        resolutionStrategy.eachDependency { details ->
-            if (details.requested.group == 'com.android.support'
-                    && !details.requested.name.contains('multidex') ) {
-                details.useVersion "27.1.1"
-            }
-        }
-    }*/
     afterEvaluate {
-        if (project.hasProperty("android") && true
-                /*(project.name == 'react-native-config'
-                || project.name == 'react-native-dialogs'
-                || project.name == 'react-native-http-bridge'
-                || project.name == 'react-native-image-crop-picker'
-                )*/) {
+        if (project.hasProperty("android")) {
             android {
                 compileSdkVersion 28
                 buildToolsVersion "28.0.3"

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -17,14 +17,11 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-# android.useDeprecatedNdk=true
 # To create a new keystore for development purposes (https://developer.android.com/studio/publish/app-signing.html)
 # $keytool -genkey -v -keystore ./status-keystore.jks -keyalg RSA -keysize 2048 -validity 10000 -alias status
 STATUS_RELEASE_STORE_FILE=~/.gradle/status-im.keystore
 STATUS_RELEASE_STORE_PASSWORD=password
 STATUS_RELEASE_KEY_ALIAS=status
 STATUS_RELEASE_KEY_PASSWORD=password
 
-android.enableAapt2=false
-
 org.gradle.jvmargs=-Xmx8704M