Browse Source

merged from master

Daniel Zlotin 8 years ago
parent
commit
23c0c44979
2 changed files with 4 additions and 5 deletions
  1. 3
    3
      android/app/build.gradle
  2. 1
    2
      example/android/app/build.gradle

+ 3
- 3
android/app/build.gradle View File

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
2 2
 apply from: '../prepare-robolectric.gradle'
3 3
 
4 4
 android {
5
-    compileSdkVersion 23
5
+    compileSdkVersion 25
6 6
     buildToolsVersion "25.0.1"
7 7
 
8 8
     defaultConfig {
@@ -47,8 +47,8 @@ android {
47 47
 dependencies {
48 48
     compile fileTree(dir: "libs", include: ["*.jar"])
49 49
 
50
-    compile "com.android.support:appcompat-v7:23.3.0"
51
-    compile 'com.android.support:design:23.3.0'
50
+	compile 'com.android.support:support-v4:25.0.1'
51
+    compile "com.android.support:appcompat-v7:25.0.1"
52 52
 
53 53
     // node_modules
54 54
     compile "com.facebook.react:react-native:+"

+ 1
- 2
example/android/app/build.gradle View File

@@ -19,7 +19,7 @@ def enableSeparateBuildPerCPUArchitecture = false
19 19
 def enableProguardInReleaseBuilds = false
20 20
 
21 21
 android {
22
-    compileSdkVersion 23
22
+    compileSdkVersion 25
23 23
     buildToolsVersion "25.0.1"
24 24
 
25 25
     defaultConfig {
@@ -63,7 +63,6 @@ android {
63 63
 
64 64
 dependencies {
65 65
     compile fileTree(dir: 'libs', include: ['*.jar'])
66
-    compile 'com.android.support:appcompat-v7:23.0.1'
67 66
     compile 'com.facebook.react:react-native:+'
68 67
     compile project(':react-native-navigation')
69 68
 }