npm
/
react-native-navigation
Obserwuj 11
Gwiazdka 0
Forkuj 0
Kod Problemy 0 Pull Requests 0 Wydania 0 Wiki Aktywność
Przeglądaj źródła

merged

Daniel Zlotin 9 lat temu
rodzic
d5e9bc0745 f0e5bd6998
commit
bb6f598895
6 zmienionych plików z 156 dodań i 6 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 1
    1
      android/app/build.gradle
  2. 1
    1
      android/build.gradle
  3. 1
    1
      example/android/app/build.gradle
  4. 1
    1
      example/android/build.gradle
  5. 150
    0
      example/ios/example.xcodeproj/project.pbxproj
  6. 2
    2
      example/package.json

+ 1
- 1
android/app/build.gradle Wyświetl plik 

@@ -3,7 +3,7 @@ apply from: '../prepare-robolectric.gradle'
3 3
4 4 
 android {
5 5 
     compileSdkVersion 23
6 
-    buildToolsVersion "25"
6 
+    buildToolsVersion "25.0.1"
7 7
8 8 
     defaultConfig {
9 9 
         minSdkVersion 16

+ 1
- 1
android/build.gradle Wyświetl plik 

@@ -5,7 +5,7 @@ buildscript {
5 5 
         jcenter()
6 6 
     }
7 7 
     dependencies {
8 
-        classpath 'com.android.tools.build:gradle:2.2.0'
8 
+        classpath 'com.android.tools.build:gradle:2.2.2'
9 9
10 10 
         // NOTE: Do not place your application dependencies here; they belong
11 11 
         // in the individual module build.gradle files

+ 1
- 1
example/android/app/build.gradle Wyświetl plik 

@@ -20,7 +20,7 @@ def enableProguardInReleaseBuilds = false
20 20
21 21 
 android {
22 22 
     compileSdkVersion 23
23 
-    buildToolsVersion "23.0.3"
23 
+    buildToolsVersion "25.0.1"
24 24
25 25 
     defaultConfig {
26 26 
         applicationId "com.example"

+ 1
- 1
example/android/build.gradle Wyświetl plik 

@@ -5,7 +5,7 @@ buildscript {
5 5 
         jcenter()
6 6 
     }
7 7 
     dependencies {
8 
-        classpath 'com.android.tools.build:gradle:2.2.0'
8 
+        classpath 'com.android.tools.build:gradle:2.2.2'
9 9
10 10 
         // NOTE: Do not place your application dependencies here; they belong
11 11 
         // in the individual module build.gradle files

+ 150
- 0
example/ios/example.xcodeproj/project.pbxproj Wyświetl plik 

@@ -22,6 +22,7 @@
22 22 
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
23 23 
 		146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
24 24 
 		2647D65F1DB175C200B23722 /* libReactNativeNavigation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2647D65E1DB175B300B23722 /* libReactNativeNavigation.a */; };
25 
+		7B9B39861DEB4091004A6281 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B9B39631DEB4076004A6281 /* libRCTAnimation.a */; };
25 26 
 		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
26 27 
 /* End PBXBuildFile section */
27 28 
 
@@ -103,6 +104,69 @@
103 104 
 			remoteGlobalIDString = 134814201AA4EA6300B7C361;
104 105 
 			remoteInfo = RCTLinking;
105 106 
 		};
107 
+		7B9B39621DEB4076004A6281 /* PBXContainerItemProxy */ = {
108 
+			isa = PBXContainerItemProxy;
109 
+			containerPortal = 7B9B395C1DEB4076004A6281 /* RCTAnimation.xcodeproj */;
110 
+			proxyType = 2;
111 
+			remoteGlobalIDString = 134814201AA4EA6300B7C361;
112 
+			remoteInfo = RCTAnimation;
113 
+		};
114 
+		7B9B39641DEB4076004A6281 /* PBXContainerItemProxy */ = {
115 
+			isa = PBXContainerItemProxy;
116 
+			containerPortal = 7B9B395C1DEB4076004A6281 /* RCTAnimation.xcodeproj */;
117 
+			proxyType = 2;
118 
+			remoteGlobalIDString = 2D2A28201D9B03D100D4039D;
119 
+			remoteInfo = "RCTAnimation-tvOS";
120 
+		};
121 
+		7B9B39691DEB4076004A6281 /* PBXContainerItemProxy */ = {
122 
+			isa = PBXContainerItemProxy;
123 
+			containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */;
124 
+			proxyType = 2;
125 
+			remoteGlobalIDString = 2D2A283A1D9B042B00D4039D;
126 
+			remoteInfo = "RCTImage-tvOS";
127 
+		};
128 
+		7B9B396D1DEB4076004A6281 /* PBXContainerItemProxy */ = {
129 
+			isa = PBXContainerItemProxy;
130 
+			containerPortal = 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */;
131 
+			proxyType = 2;
132 
+			remoteGlobalIDString = 2D2A28471D9B043800D4039D;
133 
+			remoteInfo = "RCTLinking-tvOS";
134 
+		};
135 
+		7B9B39711DEB4076004A6281 /* PBXContainerItemProxy */ = {
136 
+			isa = PBXContainerItemProxy;
137 
+			containerPortal = 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */;
138 
+			proxyType = 2;
139 
+			remoteGlobalIDString = 2D2A28541D9B044C00D4039D;
140 
+			remoteInfo = "RCTNetwork-tvOS";
141 
+		};
142 
+		7B9B39751DEB4076004A6281 /* PBXContainerItemProxy */ = {
143 
+			isa = PBXContainerItemProxy;
144 
+			containerPortal = 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */;
145 
+			proxyType = 2;
146 
+			remoteGlobalIDString = 2D2A28611D9B046600D4039D;
147 
+			remoteInfo = "RCTSettings-tvOS";
148 
+		};
149 
+		7B9B39791DEB4076004A6281 /* PBXContainerItemProxy */ = {
150 
+			isa = PBXContainerItemProxy;
151 
+			containerPortal = 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */;
152 
+			proxyType = 2;
153 
+			remoteGlobalIDString = 2D2A287B1D9B048500D4039D;
154 
+			remoteInfo = "RCTText-tvOS";
155 
+		};
156 
+		7B9B397E1DEB4076004A6281 /* PBXContainerItemProxy */ = {
157 
+			isa = PBXContainerItemProxy;
158 
+			containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */;
159 
+			proxyType = 2;
160 
+			remoteGlobalIDString = 2D2A28881D9B049200D4039D;
161 
+			remoteInfo = "RCTWebSocket-tvOS";
162 
+		};
163 
+		7B9B39821DEB4076004A6281 /* PBXContainerItemProxy */ = {
164 
+			isa = PBXContainerItemProxy;
165 
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
166 
+			proxyType = 2;
167 
+			remoteGlobalIDString = 2D2A28131D9B038B00D4039D;
168 
+			remoteInfo = "React-tvOS";
169 
+		};
106 170 
 		832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */ = {
107 171 
 			isa = PBXContainerItemProxy;
108 172 
 			containerPortal = 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */;
 
@@ -134,6 +198,7 @@
134 198 
 		146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = "<group>"; };
135 199 
 		2647D6591DB175B300B23722 /* ReactNativeNavigation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactNativeNavigation.xcodeproj; path = "../node_modules/react-native-navigation/ios/ReactNativeNavigation.xcodeproj"; sourceTree = "<group>"; };
136 200 
 		78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
201 
+		7B9B395C1DEB4076004A6281 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
137 202 
 		832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
138 203 
 /* End PBXFileReference section */
139 204 
 
@@ -149,6 +214,7 @@
149 214 
 			isa = PBXFrameworksBuildPhase;
150 215 
 			buildActionMask = 2147483647;
151 216 
 			files = (
217 
+				7B9B39861DEB4091004A6281 /* libRCTAnimation.a in Frameworks */,
152 218 
 				2647D65F1DB175C200B23722 /* libReactNativeNavigation.a in Frameworks */,
153 219 
 				146834051AC3E58100842450 /* libReact.a in Frameworks */,
154 220 
 				00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
 
@@ -186,6 +252,7 @@
186 252 
 			isa = PBXGroup;
187 253 
 			children = (
188 254 
 				00C302C01ABCB91800DB3ED1 /* libRCTImage.a */,
255 
+				7B9B396A1DEB4076004A6281 /* libRCTImage-tvOS.a */,
189 256 
 			);
190 257 
 			name = Products;
191 258 
 			sourceTree = "<group>";
 
@@ -194,6 +261,7 @@
194 261 
 			isa = PBXGroup;
195 262 
 			children = (
196 263 
 				00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */,
264 
+				7B9B39721DEB4076004A6281 /* libRCTNetwork-tvOS.a */,
197 265 
 			);
198 266 
 			name = Products;
199 267 
 			sourceTree = "<group>";
 
@@ -227,6 +295,7 @@
227 295 
 			isa = PBXGroup;
228 296 
 			children = (
229 297 
 				139105C11AF99BAD00B5F7CC /* libRCTSettings.a */,
298 
+				7B9B39761DEB4076004A6281 /* libRCTSettings-tvOS.a */,
230 299 
 			);
231 300 
 			name = Products;
232 301 
 			sourceTree = "<group>";
 
@@ -235,6 +304,7 @@
235 304 
 			isa = PBXGroup;
236 305 
 			children = (
237 306 
 				139FDEF41B06529B00C62182 /* libRCTWebSocket.a */,
307 
+				7B9B397F1DEB4076004A6281 /* libRCTWebSocket-tvOS.a */,
238 308 
 			);
239 309 
 			name = Products;
240 310 
 			sourceTree = "<group>";
 
@@ -257,6 +327,7 @@
257 327 
 			isa = PBXGroup;
258 328 
 			children = (
259 329 
 				146834041AC3E56700842450 /* libReact.a */,
330 
+				7B9B39831DEB4076004A6281 /* libReact-tvOS.a */,
260 331 
 			);
261 332 
 			name = Products;
262 333 
 			sourceTree = "<group>";
 
@@ -273,6 +344,16 @@
273 344 
 			isa = PBXGroup;
274 345 
 			children = (
275 346 
 				78C398B91ACF4ADC00677621 /* libRCTLinking.a */,
347 
+				7B9B396E1DEB4076004A6281 /* libRCTLinking-tvOS.a */,
348 
+			);
349 
+			name = Products;
350 
+			sourceTree = "<group>";
351 
+		};
352 
+		7B9B395D1DEB4076004A6281 /* Products */ = {
353 
+			isa = PBXGroup;
354 
+			children = (
355 
+				7B9B39631DEB4076004A6281 /* libRCTAnimation.a */,
356 
+				7B9B39651DEB4076004A6281 /* libRCTAnimation-tvOS.a */,
276 357 
 			);
277 358 
 			name = Products;
278 359 
 			sourceTree = "<group>";
 
@@ -280,6 +361,7 @@
280 361 
 		832341AE1AAA6A7D00B99B32 /* Libraries */ = {
281 362 
 			isa = PBXGroup;
282 363 
 			children = (
364 
+				7B9B395C1DEB4076004A6281 /* RCTAnimation.xcodeproj */,
283 365 
 				2647D6591DB175B300B23722 /* ReactNativeNavigation.xcodeproj */,
284 366 
 				146833FF1AC3E56700842450 /* React.xcodeproj */,
285 367 
 				00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */,
 
@@ -299,6 +381,7 @@
299 381 
 			isa = PBXGroup;
300 382 
 			children = (
301 383 
 				832341B51AAA6A8300B99B32 /* libRCTText.a */,
384 
+				7B9B397A1DEB4076004A6281 /* libRCTText-tvOS.a */,
302 385 
 			);
303 386 
 			name = Products;
304 387 
 			sourceTree = "<group>";
 
@@ -394,6 +477,10 @@
394 477 
 					ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */;
395 478 
 					ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */;
396 479 
 				},
480 
+				{
481 
+					ProductGroup = 7B9B395D1DEB4076004A6281 /* Products */;
482 
+					ProjectRef = 7B9B395C1DEB4076004A6281 /* RCTAnimation.xcodeproj */;
483 
+				},
397 484 
 				{
398 485 
 					ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */;
399 486 
 					ProjectRef = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */;
 
@@ -514,6 +601,69 @@
514 601 
 			remoteRef = 78C398B81ACF4ADC00677621 /* PBXContainerItemProxy */;
515 602 
 			sourceTree = BUILT_PRODUCTS_DIR;
516 603 
 		};
604 
+		7B9B39631DEB4076004A6281 /* libRCTAnimation.a */ = {
605 
+			isa = PBXReferenceProxy;
606 
+			fileType = archive.ar;
607 
+			path = libRCTAnimation.a;
608 
+			remoteRef = 7B9B39621DEB4076004A6281 /* PBXContainerItemProxy */;
609 
+			sourceTree = BUILT_PRODUCTS_DIR;
610 
+		};
611 
+		7B9B39651DEB4076004A6281 /* libRCTAnimation-tvOS.a */ = {
612 
+			isa = PBXReferenceProxy;
613 
+			fileType = archive.ar;
614 
+			path = "libRCTAnimation-tvOS.a";
615 
+			remoteRef = 7B9B39641DEB4076004A6281 /* PBXContainerItemProxy */;
616 
+			sourceTree = BUILT_PRODUCTS_DIR;
617 
+		};
618 
+		7B9B396A1DEB4076004A6281 /* libRCTImage-tvOS.a */ = {
619 
+			isa = PBXReferenceProxy;
620 
+			fileType = archive.ar;
621 
+			path = "libRCTImage-tvOS.a";
622 
+			remoteRef = 7B9B39691DEB4076004A6281 /* PBXContainerItemProxy */;
623 
+			sourceTree = BUILT_PRODUCTS_DIR;
624 
+		};
625 
+		7B9B396E1DEB4076004A6281 /* libRCTLinking-tvOS.a */ = {
626 
+			isa = PBXReferenceProxy;
627 
+			fileType = archive.ar;
628 
+			path = "libRCTLinking-tvOS.a";
629 
+			remoteRef = 7B9B396D1DEB4076004A6281 /* PBXContainerItemProxy */;
630 
+			sourceTree = BUILT_PRODUCTS_DIR;
631 
+		};
632 
+		7B9B39721DEB4076004A6281 /* libRCTNetwork-tvOS.a */ = {
633 
+			isa = PBXReferenceProxy;
634 
+			fileType = archive.ar;
635 
+			path = "libRCTNetwork-tvOS.a";
636 
+			remoteRef = 7B9B39711DEB4076004A6281 /* PBXContainerItemProxy */;
637 
+			sourceTree = BUILT_PRODUCTS_DIR;
638 
+		};
639 
+		7B9B39761DEB4076004A6281 /* libRCTSettings-tvOS.a */ = {
640 
+			isa = PBXReferenceProxy;
641 
+			fileType = archive.ar;
642 
+			path = "libRCTSettings-tvOS.a";
643 
+			remoteRef = 7B9B39751DEB4076004A6281 /* PBXContainerItemProxy */;
644 
+			sourceTree = BUILT_PRODUCTS_DIR;
645 
+		};
646 
+		7B9B397A1DEB4076004A6281 /* libRCTText-tvOS.a */ = {
647 
+			isa = PBXReferenceProxy;
648 
+			fileType = archive.ar;
649 
+			path = "libRCTText-tvOS.a";
650 
+			remoteRef = 7B9B39791DEB4076004A6281 /* PBXContainerItemProxy */;
651 
+			sourceTree = BUILT_PRODUCTS_DIR;
652 
+		};
653 
+		7B9B397F1DEB4076004A6281 /* libRCTWebSocket-tvOS.a */ = {
654 
+			isa = PBXReferenceProxy;
655 
+			fileType = archive.ar;
656 
+			path = "libRCTWebSocket-tvOS.a";
657 
+			remoteRef = 7B9B397E1DEB4076004A6281 /* PBXContainerItemProxy */;
658 
+			sourceTree = BUILT_PRODUCTS_DIR;
659 
+		};
660 
+		7B9B39831DEB4076004A6281 /* libReact-tvOS.a */ = {
661 
+			isa = PBXReferenceProxy;
662 
+			fileType = archive.ar;
663 
+			path = "libReact-tvOS.a";
664 
+			remoteRef = 7B9B39821DEB4076004A6281 /* PBXContainerItemProxy */;
665 
+			sourceTree = BUILT_PRODUCTS_DIR;
666 
+		};
517 667 
 		832341B51AAA6A8300B99B32 /* libRCTText.a */ = {
518 668 
 			isa = PBXReferenceProxy;
519 669 
 			fileType = archive.ar;

+ 2
- 2
example/package.json Wyświetl plik 

@@ -8,8 +8,8 @@
8 8 
     "android": "cd android && ./gradlew installDebug"
9 9 
   },
10 10 
   "dependencies": {
11 
-    "react-native": "0.37.0",
12 
-    "react": "15.3.2",
11 
+    "react-native": "0.38.0",
12 
+    "react": "15.4.1",
13 13 
     "react-native-navigation": "file:../"
14 14 
   }
15 15 
 }