Bump up android sdk

.travis.yml

@@ -7,22 +7,22 @@ android:
     - tools
 
     # The BuildTools version used by your project
-    - build-tools-22.0.1
+    - build-tools-23.0.1
 
     # The SDK version used to compile your project
-    - android-22
+    - android-23
 
     # Additional components
     - extra-google-m2repository
     - extra-android-m2repository
 
     # Specify at least one system image,
     # if you need to run emulator(s) during your tests
-    # - sys-img-armeabi-v7a-android-22
+    # - sys-img-armeabi-v7a-android-23
 
 # Emulator Management: Create, Start and Wait
 #before_script:
-  #- echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
+  #- echo no | android create avd --force -n test -t android-23 --abi armeabi-v7a
   #- emulator -avd test -no-skin -no-audio -no-window &
   #- android-wait-for-emulator
   #- adb shell input keyevent 82 &

ChangeLog.md

@@ -1,3 +1,10 @@
+Version: 1.4.0
+* Refactor of class AndroidMvc so that controllers can access the MvcGraph
+* EventBusV2V is injectable same as EventBusC2V and EventBusC2C
+* Add method "use" in MvcGraph to consume an injectable classes which doesn't require a class field marked by @Inject
+* Remove BaseControllerImpl.onInitialized and replaced by onConstruct since onInitialized is also called when the controller is restored
+* Add call back BaseControllerImpl.onRestored
+
 Version: 1.3.0
 * Refactor the MvcFragment.Reason object.
 * Remove android-mvc-controller-retrofit
@@ -24,7 +31,7 @@ Once root fragment is restored, it should notify all nested fragments they are n
 Fix issue that nested fragments of popping out fragment won't call onReturnFromBackground incorrectly
 
 Version: 1.1.6
-Fix issue that onViewReady is called with incorrect reason - RESTORE which should be FIRST_TIME when the fragment is a page and recreated by FragmentStatePagerAdapter
+Fix issue that onViewReady is called with incorrect reason - RESTORE which should be FIRST_TIME when the fragment is a page and recreated by FragmentPagerAdapter
 
 Version: 1.1.5
 Allow remove preference key from SharedPreferenceService

README.md

@@ -1,6 +1,7 @@
 # AndroidMvc Framework
 [![Build Status](https://travis-ci.org/kejunxia/AndroidMvc.svg?branch=ci-travis)](https://travis-ci.org/kejunxia/AndroidMvc)
 [![Coverage Status](https://coveralls.io/repos/kejunxia/AndroidMvc/badge.svg)](https://coveralls.io/r/kejunxia/AndroidMvc)
+[![Download](https://api.bintray.com/packages/kejunxia/maven/android-mvc/images/download.svg)](https://bintray.com/kejunxia/maven/android-mvc/_latestVersion)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.shipdream/android-mvc/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.shipdream/android-mvc)
 
 # Website
@@ -26,20 +27,22 @@
    See [**Source code** here](https://github.com/kejunxia/AndroidMvc/tree/master/samples/note) and download [**Sample APK** here](https://docs.google.com/uc?authuser=0&id=0BwcZml9gnwoZOHcxZFI3Z0ZGUUk&export=download)
 
 ## Download
-The library is currently release to jCenter and MavenCentral
+The library is currently released to both
+* jCenter [![Download](https://api.bintray.com/packages/kejunxia/maven/android-mvc/images/download.svg)](https://bintray.com/kejunxia/maven/android-mvc/_latestVersion)
+* Maven Central [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.shipdream/android-mvc/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.shipdream/android-mvc)
 
 **Maven:**
 ```xml
 <dependency>
     <groupId>com.shipdream</groupId>
     <artifactId>android-mvc</artifactId>
-    <version>1.3.0</version>
+    <version>[LatestVersion]</version>
 </dependency>
 ```
 
 **Gradle:**
 ```groovy
-compile "com.shipdream:android-mvc:1.3.0"
+compile "com.shipdream:android-mvc:[LatestVersion]"
 ```
 
 ## Dependency injection with reference count

build.gradle

@@ -29,10 +29,9 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.+'
+        classpath 'com.android.tools.build:gradle:1.3.1'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
 
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.0.1'
     }
@@ -74,21 +73,21 @@ ext {
     gitUrl = 'https://github.com/kejunxia/AndroidMvc.git'   // Git repository URL
     version = [
         major: 1,
-        minor: 3,
+        minor: 4,
         patch : 0
     ]
     libGroup = 'com.shipdream'
     libVersion = "${version.major}.${version.minor}.${version.patch}"
     shouldPublish = false
 
     androidMinSdkVersion = 14
-    androidCompileSdkVersion = 22
-    supportLibVersion = "22.2.1"
+    androidCompileSdkVersion = 23
+    supportLibVersion = "23.1.0"
     androidTargetSdkVersion = androidCompileSdkVersion
     lib = [
             androidMinSdk: 'com.google.android:android:4.0.1.2',
             androidSupportLib: "com.android.support:appcompat-v7:$supportLibVersion",
-            androidBuildToolVersion: "22.0.1",
+            androidBuildToolVersion: "23.0.1",
             junit: 'junit:junit:4.12',
             mokito: 'org.mockito:mockito-core:1.9.5',
             slf4jApi: "org.slf4j:slf4j-api:$log4jVersion",

documents/sites/Site-MarkDown.md

@@ -33,20 +33,22 @@ First of all, let's look at some problems of the Android development below:
   - Well tested by jUnit and instrument test with Espresso.
 
 ## Download
-The library is currently release to jCenter and MavenCentral
+The library is currently released to both
+* jCenter [![Download](https://api.bintray.com/packages/kejunxia/maven/android-mvc/images/download.svg)](https://bintray.com/kejunxia/maven/android-mvc/_latestVersion)
+* Maven Central [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.shipdream/android-mvc/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.shipdream/android-mvc)
 
 **Maven:**
 ```xml
 <dependency>
     <groupId>com.shipdream</groupId>
     <artifactId>android-mvc</artifactId>
-    <version>1.3.0</version>
+    <version>[LatestVersion]</version>
 </dependency>
 ```
 
 **Gradle:**
 ```groovy
-compile "com.shipdream:android-mvc:1.3.0"
+compile "com.shipdream:android-mvc:[LatestVersion]"
 ```
 
 ## Samples

extension/service-core/build.gradle

@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
+plugins {
+    id "com.jfrog.bintray" version "1.4"
+}
+
 apply plugin: 'java'
 apply plugin: 'maven'
-apply plugin: 'com.jfrog.bintray'
 
 task sourceJar(type: Jar) {
     from sourceSets.main.java.srcDirs

gradle/wrapper/gradle-wrapper.properties

@@ -19,4 +19,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip
+- add org.gradle.daemon=true

library/android-mvc-controller/build.gradle

@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
+plugins {
+    id "com.jfrog.bintray" version "1.4"
+}
+
 apply plugin: 'java'
 apply plugin: 'maven'
-apply plugin: 'com.jfrog.bintray'
 
 task sourceJar(type: Jar) {
     from sourceSets.main.java.srcDirs

library/android-mvc-controller/src/main/java/com/shipdream/lib/android/mvc/Injector.java

@@ -0,0 +1,28 @@
+package com.shipdream.lib.android.mvc;
+
+import com.shipdream.lib.poke.exception.PokeException;
+
+public class Injector {
+    private static MvcGraph mvcGraph;
+
+    /**
+     * Config the dependencies of MvcGraph. Be careful to use this method because it will dump the
+     * existing graph and all injectable instances managed by it
+     * @param dependencies the dependencies.
+     */
+    public static void configGraph(MvcGraph.BaseDependencies dependencies) {
+        try {
+            mvcGraph = new MvcGraph(dependencies);
+        } catch (PokeException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Get the graph managing injectable objects.
+     * @return
+     */
+    public static MvcGraph getGraph() {
+        return mvcGraph;
+    }
+}