Upgrade gradle plugin

android/app/src/main/java/com/reactnativenavigation/views/RctView.java

     };
     private boolean mIsScrollEventListenerRegistered = false;
 
-
     private final View.OnAttachStateChangeListener mStateChangeListener =
             new View.OnAttachStateChangeListener() {
                 @Override
         super(ctx);
         setLayoutParams(new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
 
-        OnDisplayedListener onDisplayedListenerInternal = onDisplayedListener;
-        if (screen.bottomTabsHiddenOnScroll) {
-            onDisplayedListenerInternal = new OnDisplayedListener() {
+        final OnDisplayedListener onDisplayedListenerInternal = screen.bottomTabsHiddenOnScroll ?
+            new OnDisplayedListener() {
                 @Override
                 public void onDisplayed() {
                     if (onDisplayedListener != null) {
 
                     setupScrollViewWithBottomTabs();
                 }
-            };
-        }
+            } : onDisplayedListener;
 
         mReactRootView = new RnnReactRootView(ctx, onDisplayedListenerInternal);
         mReactRootView.setLayoutParams(new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
-
+        Bundle passProps = createPassProps(screen);
         String componentName = screen.screenId;
+        mReactRootView.startReactApplication(rctInstanceManager, componentName, passProps);
+
+        addView(mReactRootView);
+    }
+
+    private Bundle createPassProps(Screen screen) {
         Bundle passProps = new Bundle();
         passProps.putString(Screen.KEY_SCREEN_INSTANCE_ID, screen.screenInstanceId);
         passProps.putString(Screen.KEY_NAVIGATOR_ID, screen.navigatorId);
         if (screen.passedProps != null) {
             BridgeUtils.addMapToBundle(screen.passedProps, passProps);
         }
-
-        mReactRootView.startReactApplication(rctInstanceManager, componentName, passProps);
-
-        addView(mReactRootView);
+        return passProps;
     }
 
     private void setupScrollViewWithBottomTabs() {

android/gradle/wrapper/gradle-wrapper.properties

-#Mon Dec 28 10:00:20 PST 2015
+#Wed Jul 13 11:11:29 IDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip