Sfoglia il codice sorgente

Bump support dependencies to 26.1.0 to support RN 0.56

closes #3387
Guy Carmeli 6 anni fa
parent
commit
b2f55374f3

+ 4
- 4
lib/android/app/build.gradle Vedi File

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
2 2
 apply from: '../prepare-robolectric.gradle'
3 3
 
4 4
 android {
5
-    compileSdkVersion 25
5
+    compileSdkVersion 26
6 6
     buildToolsVersion '27.0.3'
7 7
 
8 8
     defaultConfig {
@@ -66,9 +66,9 @@ allprojects { p ->
66 66
 
67 67
 dependencies {
68 68
     implementation fileTree(include: ['*.jar'], dir: 'libs')
69
-    implementation 'com.android.support:design:25.4.0'
70
-    implementation 'com.android.support:appcompat-v7:25.4.0'
71
-    implementation 'com.android.support:support-v4:25.4.0'
69
+    implementation 'com.android.support:design:26.1.0'
70
+    implementation 'com.android.support:appcompat-v7:26.1.0'
71
+    implementation 'com.android.support:support-v4:26.1.0'
72 72
     implementation 'com.aurelhubert:ahbottomnavigation:2.1.0'
73 73
     implementation 'com.github.clans:fab:1.6.4'
74 74
 

+ 2
- 2
lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/stack/StackControllerTest.java Vedi File

@@ -284,8 +284,8 @@ public class StackControllerTest extends BaseTest {
284 284
         uut.push(child2, new CommandListenerAdapter() {
285 285
             @Override
286 286
             public void onSuccess(String childId) {
287
-                assertThat(uut.getView().findViewById(child1.getView().getId())).isNull();
288
-                assertThat(uut.getView().findViewById(child2.getView().getId())).isNotNull();
287
+                assertThat((View) uut.getView().findViewById(child1.getView().getId())).isNull();
288
+                assertThat((View) uut.getView().findViewById(child2.getView().getId())).isNotNull();
289 289
             }
290 290
         });
291 291
     }

+ 2
- 1
lib/android/app/src/test/java/com/reactnativenavigation/views/TopBarBackgroundComponentTest.java Vedi File

@@ -2,6 +2,7 @@ package com.reactnativenavigation.views;
2 2
 
3 3
 import android.app.Activity;
4 4
 import android.util.Log;
5
+import android.view.View;
5 6
 import android.view.ViewGroup;
6 7
 
7 8
 import com.reactnativenavigation.BaseTest;
@@ -65,7 +66,7 @@ public class TopBarBackgroundComponentTest extends BaseTest {
65 66
         component.name = new Text("someComponent");
66 67
         component.componentId = new Text("id");
67 68
         uut.setBackgroundComponent(component);
68
-        assertThat(uut.findViewById(R.id.topBarBackgroundComponent)).isNull();
69
+        assertThat((View) uut.findViewById(R.id.topBarBackgroundComponent)).isNull();
69 70
     }
70 71
 
71 72
     @Test

+ 14
- 5
playground/android/app/build.gradle Vedi File

@@ -8,7 +8,7 @@ project.ext.react = [
8 8
 apply from: "../../../node_modules/react-native/react.gradle"
9 9
 
10 10
 android {
11
-    compileSdkVersion 25
11
+    compileSdkVersion 26
12 12
     buildToolsVersion "27.0.3"
13 13
 
14 14
     compileOptions {
@@ -46,10 +46,19 @@ android {
46 46
     }
47 47
 }
48 48
 
49
+configurations.all {
50
+    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
51
+        def requested = details.requested
52
+        if (requested.group == 'com.android.support') {
53
+            details.useVersion "26.1.0"
54
+        }
55
+    }
56
+}
57
+
49 58
 dependencies {
50 59
     implementation fileTree(dir: 'libs', include: ['*.jar'])
51
-    implementation 'com.android.support:design:25.4.0'
52
-    implementation "com.android.support:appcompat-v7:25.4.0"
60
+    implementation 'com.android.support:design:26.1.0'
61
+    implementation 'com.android.support:appcompat-v7:26.1.0'
53 62
 
54 63
     //noinspection GradleDynamicVersion
55 64
     implementation 'com.facebook.react:react-native:+'
@@ -57,6 +66,6 @@ dependencies {
57 66
 
58 67
     androidTestImplementation(project(':detox'))
59 68
     androidTestImplementation 'junit:junit:4.12'
60
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
61
-    androidTestImplementation 'com.android.support.test:rules:1.0.1'
69
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
70
+    androidTestImplementation 'com.android.support.test:rules:1.0.2'
62 71
 }