Merge pull request #42 from izumin5210/apply-java-plugin

Change droidux and droidux-thunk to java library
izumin5210 · Jan 13, 2016 · 30285e2 · 30285e2
2 parents f248ae0 + 1633546
commit 30285e2
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 128 deletions.
diff --git a/README.md b/README.md
@@ -160,8 +160,9 @@ store.dispatch(new ClearCountAction()).subscribe();     // Counter: 0
 ### Data Binding
 
 ```java
+// If you use databinding, yor store interface must extend `android.databinding.Observable`.
 @Store(CounterReducer.class)
-public interface CounterStore extends BaseStore {
+public interface CounterStore extends BaseStore, android.databinding.Observable {
     // You should annotate the getter method with @Bindable
     @Bindable Counter getCounter();
 }

diff --git a/droidux-processor/build.gradle b/droidux-processor/build.gradle
@@ -19,15 +19,16 @@ dependencies {
     compile 'com.google.auto:auto-common:0.5'
     compile 'com.google.auto.service:auto-service:1.0-rc2'
 
+    compile "io.reactivex:rxjava:${project.rxJavaVersion}"
+    compile "com.android.databinding:baseLibrary:${project.databindingBaseLibraryVersion}"
+    compile fileTree(dir: './libs', includes: ['*.jar'])
+
     testCompile 'junit:junit:4.12'
     testCompile 'org.assertj:assertj-core:2.2.0'
     testCompile 'org.mockito:mockito-core:1.10.19'
     testCompile 'com.google.testing.compile:compile-testing:0.6'
     testCompile files(Jvm.current().getToolsJar())
-    compile "io.reactivex:rxjava:${project.rxJavaVersion}"
-    compile 'com.google.android:android:4.1.1.4'
-    compile "com.android.databinding:baseLibrary:${project.databindingBaseLibraryVersion}"
-    compile fileTree(dir: './libs', includes: ['*.jar'])
+    testCompile 'com.google.android:android:4.1.1.4'
 }
 
 publish {

diff --git a/droidux-processor/src/test/java/info/izumin/android/droidux/processor/fixture/Source.java b/droidux-processor/src/test/java/info/izumin/android/droidux/processor/fixture/Source.java
@@ -186,7 +186,7 @@ public static class BindableCounter {
                 "import info.izumin.android.droidux.processor.fixture.CounterReducer;",
                 "import rx.Observable;",
                 "@Store({CounterReducer.class})",
-                "public interface RootStore extends BaseStore {",
+                "public interface RootStore extends BaseStore, android.databinding.Observable {",
                 "    @Bindable Counter counter();",
                 "    Observable<Counter> observeCounter();",
                 "}"
@@ -423,7 +423,7 @@ public static class CombinedReducerAndBindableReducer {
                 "import info.izumin.android.droidux.processor.fixture.TodoList;",
                 "import rx.Observable;",
                 "@Store({CounterReducer.class, TodoListReducer.class})",
-                "public interface RootStore extends BaseStore {",
+                "public interface RootStore extends BaseStore, android.databinding.Observable {",
                 "    Counter counter();",
                 "    Observable<Counter> observeCounter();",
                 "    @Bindable TodoList todoList();",

diff --git a/droidux/build.gradle b/droidux/build.gradle
@@ -1,37 +1,13 @@
-apply plugin: 'com.android.library'
+apply plugin: 'java'
+apply plugin: 'groovy'
 apply plugin: 'com.novoda.bintray-release'
-apply plugin: 'groovyx.grooid.groovy-android'
 
-android {
-    compileSdkVersion project.compileSdkVersion
-    buildToolsVersion project.buildToolsVersion
-
-    defaultConfig {
-        minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-    packagingOptions {
-        exclude 'META-INF/services/javax.annotation.processing.Processor'
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-}
+targetCompatibility = JavaVersion.VERSION_1_7
+sourceCompatibility = JavaVersion.VERSION_1_7
 
 dependencies {
-    provided "io.reactivex:rxjava:${project.rxJavaVersion}"
-    provided "com.android.databinding:baseLibrary:${project.databindingBaseLibraryVersion}"
+    compile "io.reactivex:rxjava:${project.rxJavaVersion}"
 
-    testCompile 'junit:junit:4.12'
     testCompile "org.spockframework:spock-core:${project.spockCoreVersion}"
     testCompile "cglib:cglib-nodep:${project.cglibVersion}"
 }

diff --git a/droidux/src/androidTest/java/info/izumin/android/droidux/ApplicationTest.java b/droidux/src/androidTest/java/info/izumin/android/droidux/ApplicationTest.java
diff --git a/droidux/src/main/AndroidManifest.xml b/droidux/src/main/AndroidManifest.xml
diff --git a/droidux/src/main/java/info/izumin/android/droidux/BaseStore.java b/droidux/src/main/java/info/izumin/android/droidux/BaseStore.java
@@ -3,6 +3,6 @@
 /**
  * Created by izumin on 12/6/15.
  */
-public interface BaseStore extends android.databinding.Observable {
+public interface BaseStore {
     rx.Observable<Action> dispatch(Action action);
 }
diff --git a/droidux/src/main/res/values/strings.xml b/droidux/src/main/res/values/strings.xml
diff --git a/droidux/src/test/java/info/izumin/android/droidux/ExampleUnitTest.java b/droidux/src/test/java/info/izumin/android/droidux/ExampleUnitTest.java
diff --git a/examples/counter/src/main/java/info/izumin/android/droidux/example/counter/RootStore.java b/examples/counter/src/main/java/info/izumin/android/droidux/example/counter/RootStore.java
@@ -9,6 +9,6 @@
  * Created by izumin on 12/6/15.
  */
 @Store(CounterReducer.class)
-public interface RootStore extends BaseStore {
+public interface RootStore extends BaseStore, android.databinding.Observable {
     @Bindable Counter getCounter();
 }
diff --git a/middlewares/droidux-thunk/build.gradle b/middlewares/droidux-thunk/build.gradle
@@ -1,29 +1,12 @@
-apply plugin: 'com.android.library'
+apply plugin: 'java'
+apply plugin: 'groovy'
 apply plugin: 'com.novoda.bintray-release'
-apply plugin: 'groovyx.grooid.groovy-android'
 
-android {
-    compileSdkVersion project.compileSdkVersion
-    buildToolsVersion project.buildToolsVersion
-
-    defaultConfig {
-        minSdkVersion project.minSdkVersion
-        targetSdkVersion project.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-}
+targetCompatibility = JavaVersion.VERSION_1_7
+sourceCompatibility = JavaVersion.VERSION_1_7
 
 dependencies {
-    provided "com.android.databinding:library:${project.databindingLibraryVersion}"
-    provided "io.reactivex:rxjava:${project.rxJavaVersion}"
-    provided project(':droidux')
+    compile project(':droidux')
 
     testCompile "org.spockframework:spock-core:${spockCoreVersion}"
     testCompile "cglib:cglib-nodep:${project.cglibVersion}"

diff --git a/...droidux-thunk/src/androidTest/java/info/izumin/android/droidux/thunk/ApplicationTest.java b/...droidux-thunk/src/androidTest/java/info/izumin/android/droidux/thunk/ApplicationTest.java
diff --git a/...ewares/droidux-thunk/src/test/java/info/izumin/android/droidux/thunk/ExampleUnitTest.java b/...ewares/droidux-thunk/src/test/java/info/izumin/android/droidux/thunk/ExampleUnitTest.java