re-organize project structure to use library project

build.gradle

@@ -1,43 +1,29 @@
-ext.deps = [
-    android_gradle_plugin      : 'com.android.tools.build:gradle:1.5.0',
-]
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
 
-ext.minSdkVersion = 14
-ext.compileSdkVersion = 23
-ext.buildToolsVersion = '23.0.1'
-
-task wrapper(type: Wrapper) {
-  gradleVersion = '2.10'
-}
-
-subprojects {
-  buildscript {
+buildscript {
     repositories {
-      mavenCentral()
+        mavenCentral()
+        jcenter()
+        maven {url "https://clojars.org/repo/"}
+        maven { url "https://jitpack.io" }
     }
-  }
-
-  repositories {
-    mavenCentral()
-  }
-
-  group = GROUP
-  version = VERSION_NAME
-
-  apply plugin: 'maven'
-
-  afterEvaluate { project ->
-    if (!(project.plugins.hasPlugin('com.android.application') ||
-        project.plugins.hasPlugin('com.android.library'))) {
-      return
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
     }
+}
 
-    android {
-      lintOptions {
-        quiet false
-        textReport true
-        textOutput 'stdout'
-      }
+allprojects {
+    repositories {
+        mavenCentral()
+        jcenter()
+        maven {url "https://clojars.org/repo/"}
+        maven { url "https://jitpack.io" }
     }
-  }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
 }

flow-sample-basic/build.gradle

@@ -1,46 +1,27 @@
-buildscript {
-  dependencies {
-    classpath deps.android_gradle_plugin
-  }
-}
-
 apply plugin: 'com.android.application'
 
 android {
-  compileSdkVersion rootProject.ext.compileSdkVersion
-  buildToolsVersion rootProject.ext.buildToolsVersion
-
-  defaultConfig {
-    applicationId "flow.sample.basic"
-
-    minSdkVersion rootProject.ext.minSdkVersion
-    versionName VERSION_NAME
-    testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-  }
-
-  buildTypes {
-    release {
-      minifyEnabled false
+    compileSdkVersion 23
+    buildToolsVersion "23.0.2"
+
+    defaultConfig {
+        applicationId "flow.sample.basic"
+        minSdkVersion 14
+        targetSdkVersion 23
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
     }
-  }
-
-  packagingOptions {
-    exclude 'LICENSE.txt'
-  }
 }
 
 dependencies {
-  compile project(':flow')
-  compile 'com.android.support:appcompat-v7:23.1.1'
-  compile 'com.android.support:design:23.1.1'
-  androidTestCompile 'com.android.support.test:runner:0.4'
-  androidTestCompile 'com.android.support.test:rules:0.4'
-  androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1'
-}
-
-//noinspection GroovyAssignabilityCheck
-configurations.all {
-  resolutionStrategy {
-    force 'com.android.support:support-annotations:23.1.1'
-  }
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    testCompile 'junit:junit:4.12'
+    compile 'com.android.support:appcompat-v7:23.4.0'
+    compile project(':flow')
 }

flow/build.gradle

@@ -1,27 +1,25 @@
-import com.android.builder.core.BuilderConstants;
-
-buildscript {
-  dependencies {
-    classpath deps.android_gradle_plugin
-  }
-}
-
 apply plugin: 'com.android.library'
+
 android {
-  compileSdkVersion rootProject.ext.compileSdkVersion
-  buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion 23
+    buildToolsVersion "23.0.2"
 
-  defaultConfig {
-    minSdkVersion rootProject.ext.minSdkVersion
-    versionName VERSION_NAME
-  }
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 23
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
 }
 
 dependencies {
-  compile 'com.android.support:support-annotations:23.1.1'
-  testCompile 'junit:junit:4.10'
-  testCompile 'org.assertj:assertj-core:1.7.1'
-  testCompile 'org.mockito:mockito-core:1.10.19'
-  testCompile 'org.robolectric:robolectric:3.0'
-  testCompile 'org.apache.maven:maven-ant-tasks:2.1.3'
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    testCompile 'junit:junit:4.12'
+    compile 'com.android.support:support-annotations:23.4.0'
 }

flow/src/main/java/flow/Flow.java

@@ -23,7 +23,6 @@
 import android.support.annotation.CheckResult;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.util.Log;
 import android.view.View;
 
 import java.util.Iterator;

flow/src/main/java/flow/KeyManager.java

@@ -16,10 +16,6 @@
 
 package flow;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;

flow/src/main/java/flow/preset/ContainerRootDispatcher.java

@@ -11,7 +11,6 @@
 
 import flow.Dispatcher;
 import flow.Flow;
-import flow.ForceBundler;
 import flow.Traversal;
 import flow.TraversalCallback;
 

flow/src/main/java/flow/preset/FlowContainerLifecycleListener.java

@@ -1,10 +1,5 @@
 package flow.preset;
 
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.CheckResult;
-import android.view.View;
-
 /**
  * Created by Zhuinden on 2016.07.01..
  */

flow/src/main/java/flow/preset/SingleRootDispatcher.java

@@ -13,7 +13,6 @@
 import android.view.ViewGroup;
 
 import flow.Direction;
-import flow.Dispatcher;
 import flow.Flow;
 import flow.ForceBundler;
 import flow.Traversal;

flowless-sample-master-detail/.gitignore

@@ -1,8 +1 @@
-*.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
 /build
-/captures