Procházet zdrojové kódy

merged from master

Daniel Zlotin před 8 roky
rodič
revize
23c0c44979
2 změnil soubory, kde provedl 4 přidání a 5 odebrání
  1. 3
    3
      android/app/build.gradle
  2. 1
    2
      example/android/app/build.gradle

+ 3
- 3
android/app/build.gradle Zobrazit soubor

2
 apply from: '../prepare-robolectric.gradle'
2
 apply from: '../prepare-robolectric.gradle'
3
 
3
 
4
 android {
4
 android {
5
-    compileSdkVersion 23
5
+    compileSdkVersion 25
6
     buildToolsVersion "25.0.1"
6
     buildToolsVersion "25.0.1"
7
 
7
 
8
     defaultConfig {
8
     defaultConfig {
47
 dependencies {
47
 dependencies {
48
     compile fileTree(dir: "libs", include: ["*.jar"])
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
     // node_modules
53
     // node_modules
54
     compile "com.facebook.react:react-native:+"
54
     compile "com.facebook.react:react-native:+"

+ 1
- 2
example/android/app/build.gradle Zobrazit soubor

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