Browse Source

fix android gradle out-of-date

Daniel Zlotin 7 years ago
parent
commit
9cc712344a
6 changed files with 6 additions and 22 deletions
  1. 1
    1
      AndroidE2E/build.gradle
  2. 1
    1
      android/build.gradle
  3. 3
    5
      ios/RNNBridgeModule.m
  4. 0
    7
      ios/RNNStore.h
  5. 0
    7
      ios/RNNStore.m
  6. 1
    1
      playground/android/build.gradle

+ 1
- 1
AndroidE2E/build.gradle View File

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

+ 1
- 1
android/build.gradle View File

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

+ 3
- 5
ios/RNNBridgeModule.m View File

16
 	return dispatch_get_main_queue();
16
 	return dispatch_get_main_queue();
17
 }
17
 }
18
 
18
 
19
+#pragma mark - JS interface
20
+
19
 RCT_EXPORT_METHOD(setRoot:(NSDictionary*)layout)
21
 RCT_EXPORT_METHOD(setRoot:(NSDictionary*)layout)
20
 {
22
 {
21
 	[self assertReady];
23
 	[self assertReady];
64
 	[[[RNNModalManager alloc] initWithStore:[RNN instance].store] dismissAllModals];
66
 	[[[RNNModalManager alloc] initWithStore:[RNN instance].store] dismissAllModals];
65
 }
67
 }
66
 
68
 
67
-
69
+#pragma mark - private
68
 
70
 
69
 - (void)assertReady
71
 - (void)assertReady
70
 {
72
 {
73
 	}
75
 	}
74
 }
76
 }
75
 
77
 
76
-
77
-
78
-
79
-
80
 @end
78
 @end
81
 
79
 

+ 0
- 7
ios/RNNStore.h View File

1
-//
2
-//  RNNStore.h
3
-//  ReactNativeNavigation
4
-//
5
-//  Created by Ran Greenberg on 12/02/2017.
6
-//  Copyright © 2017 Wix. All rights reserved.
7
-//
8
 
1
 
9
 #import <Foundation/Foundation.h>
2
 #import <Foundation/Foundation.h>
10
 #import <UIKit/UIKit.h>
3
 #import <UIKit/UIKit.h>

+ 0
- 7
ios/RNNStore.m View File

1
-//
2
-//  RNNStore.m
3
-//  ReactNativeNavigation
4
-//
5
-//  Created by Ran Greenberg on 12/02/2017.
6
-//  Copyright © 2017 Wix. All rights reserved.
7
-//
8
 
1
 
9
 #import "RNNStore.h"
2
 #import "RNNStore.h"
10
 
3
 

+ 1
- 1
playground/android/build.gradle View File

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