gradle fixes

android/app/build.gradle

@@ -1,30 +1,15 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
-    }
-}
-
 apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion "23.0.3"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 22
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
     }
-    defaultPublishConfig 'release'
-    publishNonDefault true
-    productFlavors {
-        library {
-        }
-    }
     buildTypes {
         release {
             minifyEnabled false
@@ -36,39 +21,43 @@ android {
     lintOptions {
         abortOnError false
     }
-}
 
-repositories {
-    mavenLocal()
-    jcenter()
-    maven {
-        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-        url "$rootDir/../node_modules/react-native/android"
-    }
-}
-
-allprojects { p ->
-    p.tasks.whenTaskAdded { task ->
-        if (task.name.toLowerCase().contains('lint')) {
-            task.enabled = false;
+    testOptions {
+        unitTests.all { t ->
+            reports {
+                html.enabled true
+            }
+            testLogging {
+                events "passed", "skipped", "failed", "standardOut", "standardError"
+            }
+            afterSuite { desc, result ->
+                if (!desc.parent) { // will match the outermost suite
+                    def output = "      ${result.resultType} (${result.successfulTestCount} successes, ${result.failedTestCount} failures, ${result.skippedTestCount} skipped)     "
+                    def repeatLength = output.length()
+                    println '\n' + ('-' * repeatLength) + '\n' + output + '\n' + ('-' * repeatLength) + '\n'
+
+                    println "see report at file://${t.reports.html.destination}/index.html"
+                }
+            }
         }
     }
 }
 
 dependencies {
     compile fileTree(dir: "libs", include: ["*.jar"])
-    compile "com.aurelhubert:ahbottomnavigation:1.3.3"
+
     compile "com.android.support:appcompat-v7:23.3.0"
     compile 'com.android.support:design:23.3.0'
-    compile "com.facebook.react:react-native:+"  // From node_modules
+
+    // node_modules
+    compile "com.facebook.react:react-native:+"
+
+    // third party
+    compile "com.aurelhubert:ahbottomnavigation:1.3.3"
     compile 'com.balysv.materialmenu:material-menu-toolbar:1.5.4'
 
+    // tests
     testCompile "junit:junit:4.12"
     testCompile "org.robolectric:robolectric:3.1.1"
     testCompile 'org.assertj:assertj-core:3.5.2'
 }
-
-task unit(dependsOn: 'testLibraryDebugUnitTest') << {
-    println 'Finished running unit all tests'
-    println 'report at file://' + tasks.testLibraryDebugUnitTest.outputs.files.last().absolutePath + '/index.html'
-}

android/app/src/test/java/com/reactnativenavigation/EnvironmentTest.java

@@ -10,6 +10,6 @@ import static org.assertj.core.api.Java6Assertions.assertThat;
 public class EnvironmentTest {
     @Test
     public void assertJ() {
-        assertThat(1 + 2).isEqualTo(3);
+        assertThat(1 + 2).isEqualTo(3).isGreaterThan(2).isLessThan(4).isNotNegative().isPositive().isNotZero();
     }
 }

android/app/src/test/resources/robolectric.properties

@@ -0,0 +1,2 @@
+manifest: src/main/AndroidManifest.xml
+sdk: 23

android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.1'
+        classpath 'com.android.tools.build:gradle:2.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -18,7 +18,7 @@ allprojects {
         jcenter()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-            url "$projectDir/../../node_modules/react-native/android"
+            url "$rootDir/../node_modules/react-native/android"
         }
     }
 }

android/settings.gradle

@@ -0,0 +1 @@
+include ':app'

example-redux/android/app/build.gradle

@@ -84,12 +84,12 @@ def enableProguardInReleaseBuilds = false
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion "23.0.3"
 
     defaultConfig {
         applicationId "com.exampleredux"
         minSdkVersion 16
-        targetSdkVersion 22
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
         ndk {
@@ -129,8 +129,7 @@ dependencies {
     compile fileTree(dir: "libs", include: ["*.jar"])
     compile "com.android.support:appcompat-v7:23.0.1"
     compile "com.facebook.react:react-native:+"  // From node_modules
-    debugCompile project(path: ':react-native-navigation', configuration: 'libraryDebug')
-    releaseCompile project(path: ':react-native-navigation', configuration: 'libraryRelease')
+    compile project(':react-native-navigation')
 }
 
 // Run this once to be able to run the application with BUCK

example-redux/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "start": "watchman watch-del-all && adb reverse tcp:8081 tcp:8081 && node node_modules/react-native/local-cli/cli.js start",
-    "install:android": "pushd android && ./gradlew installDebug && popd"
+    "install:android": "cd android && ./gradlew installDebug"
   },
   "dependencies": {
     "react-native-navigation": "file:../",
@@ -13,7 +13,6 @@
     "react-redux": "^4.0.6",
     "redux": "^3.0.5",
     "redux-thunk": "^1.0.3",
-    "seamless-immutable": "^5.0.1",
-    "babel-preset-react-native-stage-0": "*"
+    "seamless-immutable": "^5.0.1"
   }
 }

package.json

@@ -4,25 +4,25 @@
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,
+  "author": "Tal Kol <talkol@gmail.com>",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/wix/react-native-navigation.git"
-  },
   "bugs": {
     "url": "https://github.com/wix/react-native-navigation/issues"
   },
   "homepage": "https://github.com/wix/react-native-navigation",
   "readme": "https://github.com/wix/react-native-navigation#readme",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/wix/react-native-navigation.git"
+  },
   "main": "src/index.js",
-  "author": "Tal Kol <talkol@gmail.com>",
   "scripts": {
     "build": ":",
     "lint": "eslint src test",
     "pretest": "npm run lint",
-    "test": "cd android && ./gradlew test",
+    "test": "cd android && ./gradlew clean testDebugUnitTest",
     "release": "npm version prerelease && npm publish --tag next && npm view react-native-navigation dist-tags && git push"
   },
   "peerDependencies": {