Bump dependencies. Move ReactiveNetwork to app module.

app/build.gradle

@@ -100,16 +100,14 @@ apt {
 dependencies {
     final SUPPORT_LIBRARY_VERSION = '23.1.1'
     final DAGGER_VERSION = '2.0.2'
-    final EVENTBUS_VERSION = '3.0.0'
+    final OKHTTP_VERSION = '3.2.0'
-    final OKHTTP_VERSION = '3.1.2'
     final RETROFIT_VERSION = '2.0.0-beta4'
     final STORIO_VERSION = '1.8.0'
-    final ICEPICK_VERSION = '3.1.0'
+    final ICEPICK_VERSION = '3.2.0'
     final MOCKITO_VERSION = '1.10.19'
 
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(":SubsamplingScaleImageView")
-    compile project(":ReactiveNetwork")
 
     compile "com.android.support:support-v4:$SUPPORT_LIBRARY_VERSION"
     compile "com.android.support:appcompat-v7:$SUPPORT_LIBRARY_VERSION"
@@ -135,17 +133,17 @@ dependencies {
     compile 'info.android15.nucleus:nucleus:2.0.5'
     compile 'com.github.bumptech.glide:glide:3.7.0'
     compile 'com.jakewharton:butterknife:7.0.1'
-    compile 'com.jakewharton.timber:timber:4.1.0'
+    compile 'com.jakewharton.timber:timber:4.1.1'
     compile 'ch.acra:acra:4.8.2'
     compile "frankiesardo:icepick:$ICEPICK_VERSION"
     provided "frankiesardo:icepick-processor:$ICEPICK_VERSION"
     compile 'com.github.dmytrodanylyk.android-process-button:library:1.0.4'
     compile 'eu.davidea:flexible-adapter:4.2.0'
-    compile 'com.nononsenseapps:filepicker:2.5.1'
+    compile 'com.nononsenseapps:filepicker:2.5.2'
     compile 'com.github.amulyakhare:TextDrawable:558677e'
 
-    compile "org.greenrobot:eventbus:$EVENTBUS_VERSION"
+    compile "org.greenrobot:eventbus:3.0.0"
-    apt "org.greenrobot:eventbus-annotation-processor:$EVENTBUS_VERSION"
+    apt "org.greenrobot:eventbus-annotation-processor:3.0.1"
 
     compile "com.google.dagger:dagger:$DAGGER_VERSION"
     apt "com.google.dagger:dagger-compiler:$DAGGER_VERSION"

app/src/main/AndroidManifest.xml

@@ -4,6 +4,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0-beta5'
+        classpath 'com.android.tools.build:gradle:2.0.0-beta6'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'me.tatarka:gradle-retrolambda:3.2.4'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'

libs/ReactiveNetwork/.gitignore

@@ -1 +0,0 @@
-/build

libs/ReactiveNetwork/build.gradle

@@ -1,40 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-  compileSdkVersion 23
-  buildToolsVersion "23.0.2"
-
-  defaultConfig {
-    minSdkVersion 9
-    targetSdkVersion 23
-    versionCode 1
-    versionName "1.0"
-    testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-  }
-
-  buildTypes {
-    release {
-      minifyEnabled false
-      proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-    }
-  }
-
-  packagingOptions {
-    exclude 'LICENSE.txt'
-    exclude 'META-INF/LICENSE.txt'
-  }
-}
-
-dependencies {
-  compile 'io.reactivex:rxjava:1.1.0'
-  compile 'io.reactivex:rxandroid:1.1.0'
-
-  androidTestCompile 'com.android.support.test:testing-support-lib:0.1'
-  androidTestCompile('com.google.truth:truth:0.27') {
-    exclude group: 'junit' // Android has JUnit built in
-  }
-}
-
-task wrapper(type: Wrapper) {
-  gradleVersion = '2.2.1'
-}

libs/ReactiveNetwork/proguard-rules.pro

@@ -1,17 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /home/piotr/Android/Sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}

libs/ReactiveNetwork/src/androidTest/java/com/github/pwittchen/reactivenetwork/library/ConnectivityStatusTest.java

@@ -1,64 +0,0 @@
-package com.github.pwittchen.reactivenetwork.library;
-
-import android.support.test.runner.AndroidJUnit4;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import rx.functions.Func1;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(AndroidJUnit4.class) public class ConnectivityStatusTest {
-
-  @Test public void testStatusShouldBeEqualToGivenValue() {
-    // given
-    ConnectivityStatus givenStatus = ConnectivityStatus.WIFI_CONNECTED;
-
-    // when
-    Func1<ConnectivityStatus, Boolean> equalTo = ConnectivityStatus.isEqualTo(givenStatus);
-    Boolean shouldBeEqualToGivenStatus = equalTo.call(givenStatus);
-
-    // then
-    assertThat(shouldBeEqualToGivenStatus).isTrue();
-  }
-
-  @Test public void testStatusShouldBeEqualToOneOfGivenMultipleValues() {
-    // given
-    ConnectivityStatus mobileConnected = ConnectivityStatus.MOBILE_CONNECTED;
-    ConnectivityStatus givenStatuses[] =
-        { ConnectivityStatus.WIFI_CONNECTED, ConnectivityStatus.MOBILE_CONNECTED };
-
-    // when
-    Func1<ConnectivityStatus, Boolean> equalTo = ConnectivityStatus.isEqualTo(givenStatuses);
-    Boolean shouldBeEqualToGivenStatus = equalTo.call(mobileConnected);
-
-    // then
-    assertThat(shouldBeEqualToGivenStatus).isTrue();
-  }
-
-  @Test public void testStatusShouldNotBeEqualToGivenValue() {
-    // given
-    ConnectivityStatus oneStatus = ConnectivityStatus.WIFI_CONNECTED;
-    ConnectivityStatus anotherStatus = ConnectivityStatus.MOBILE_CONNECTED;
-
-    // when
-    Func1<ConnectivityStatus, Boolean> notEqualTo = ConnectivityStatus.isNotEqualTo(oneStatus);
-    Boolean shouldBeEqualToGivenStatus = notEqualTo.call(anotherStatus);
-
-    // then
-    assertThat(shouldBeEqualToGivenStatus).isTrue();
-  }
-
-  @Test public void testStatusShouldNotBeEqualToOneOfGivenMultipleValues() {
-    // given
-    ConnectivityStatus offline = ConnectivityStatus.OFFLINE;
-    ConnectivityStatus givenStatuses[] =
-        { ConnectivityStatus.WIFI_CONNECTED, ConnectivityStatus.MOBILE_CONNECTED };
-
-    // when
-    Func1<ConnectivityStatus, Boolean> notEqualTo = ConnectivityStatus.isNotEqualTo(givenStatuses);
-    Boolean shouldBeEqualToGivenStatus = notEqualTo.call(offline);
-
-    // then
-    assertThat(shouldBeEqualToGivenStatus).isTrue();
-  }
-}

libs/ReactiveNetwork/src/androidTest/java/com/github/pwittchen/reactivenetwork/library/ReactiveNetworkTest.java

@@ -1,21 +0,0 @@
-package com.github.pwittchen.reactivenetwork.library;
-
-import android.support.test.runner.AndroidJUnit4;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(AndroidJUnit4.class) public class ReactiveNetworkTest {
-
-  @Test public void testReactiveNetworkObjectShouldNotBeNull() {
-    // given
-    ReactiveNetwork reactiveNetwork;
-
-    // when
-    reactiveNetwork = new ReactiveNetwork();
-
-    // then
-    assertThat(reactiveNetwork).isNotNull();
-  }
-}

libs/ReactiveNetwork/src/main/AndroidManifest.xml

@@ -1,10 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.github.pwittchen.reactivenetwork.library"
-    >
-
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-
-  <application/>
-
-</manifest>

settings.gradle

@@ -1,3 +1,2 @@
 include ':app', ':SubsamplingScaleImageView', ':ReactiveNetwork'
 project(':SubsamplingScaleImageView').projectDir = new File('libs/SubsamplingScaleImageView')
-project(':ReactiveNetwork').projectDir = new File('libs/ReactiveNetwork')