Revert "Fix broken install task due to module renaming"

This reverts commit 6516ca4.
ReactiveX · Nov 12, 2014 · f281f09 · f281f09
1 parent 6516ca4
commit f281f09
Show file tree

Hide file tree

Showing 49 changed files with 3 additions and 4 deletions.
diff --git a/rxandroid/build.gradle → library/build.gradle b/rxandroid/build.gradle → library/build.gradle
diff --git a/...ndroid/concurrency/AndroidSchedulers.java → ...ndroid/concurrency/AndroidSchedulers.java b/...ndroid/concurrency/AndroidSchedulers.java → ...ndroid/concurrency/AndroidSchedulers.java
diff --git a/...d/concurrency/HandlerThreadScheduler.java → ...d/concurrency/HandlerThreadScheduler.java b/...d/concurrency/HandlerThreadScheduler.java → ...d/concurrency/HandlerThreadScheduler.java
diff --git a/.../android/events/OnCheckedChangeEvent.java → .../android/events/OnCheckedChangeEvent.java b/.../android/events/OnCheckedChangeEvent.java → .../android/events/OnCheckedChangeEvent.java
diff --git a/.../java/rx/android/events/OnClickEvent.java → .../java/rx/android/events/OnClickEvent.java b/.../java/rx/android/events/OnClickEvent.java → .../java/rx/android/events/OnClickEvent.java
diff --git a/...a/rx/android/events/OnItemClickEvent.java → ...a/rx/android/events/OnItemClickEvent.java b/...a/rx/android/events/OnItemClickEvent.java → ...a/rx/android/events/OnItemClickEvent.java
diff --git a/.../rx/android/events/OnTextChangeEvent.java → .../rx/android/events/OnTextChangeEvent.java b/.../rx/android/events/OnTextChangeEvent.java → .../rx/android/events/OnTextChangeEvent.java
diff --git a/...ava/rx/android/functions/ViewAction1.java → ...ava/rx/android/functions/ViewAction1.java b/...ava/rx/android/functions/ViewAction1.java → ...ava/rx/android/functions/ViewAction1.java
diff --git a/...oid/functions/ViewActionSetActivated.java → ...oid/functions/ViewActionSetActivated.java b/...oid/functions/ViewActionSetActivated.java → ...oid/functions/ViewActionSetActivated.java
diff --git a/...oid/functions/ViewActionSetClickable.java → ...oid/functions/ViewActionSetClickable.java b/...oid/functions/ViewActionSetClickable.java → ...oid/functions/ViewActionSetClickable.java
diff --git a/...droid/functions/ViewActionSetEnabled.java → ...droid/functions/ViewActionSetEnabled.java b/...droid/functions/ViewActionSetEnabled.java → ...droid/functions/ViewActionSetEnabled.java
diff --git a/...oid/functions/ViewActionSetFocusable.java → ...oid/functions/ViewActionSetFocusable.java b/...oid/functions/ViewActionSetFocusable.java → ...oid/functions/ViewActionSetFocusable.java
diff --git a/...roid/functions/ViewActionSetSelected.java → ...roid/functions/ViewActionSetSelected.java b/...roid/functions/ViewActionSetSelected.java → ...roid/functions/ViewActionSetSelected.java
diff --git a/...id/functions/ViewActionSetVisibility.java → ...id/functions/ViewActionSetVisibility.java b/...id/functions/ViewActionSetVisibility.java → ...id/functions/ViewActionSetVisibility.java
diff --git a/...ava/rx/android/functions/ViewActions.java → ...ava/rx/android/functions/ViewActions.java b/...ava/rx/android/functions/ViewActions.java → ...ava/rx/android/functions/ViewActions.java
diff --git a/...ndroid/observables/AndroidObservable.java → ...ndroid/observables/AndroidObservable.java b/...ndroid/observables/AndroidObservable.java → ...ndroid/observables/AndroidObservable.java
diff --git a/...va/rx/android/observables/Assertions.java → ...va/rx/android/observables/Assertions.java b/...va/rx/android/observables/Assertions.java → ...va/rx/android/observables/Assertions.java
diff --git a/...x/android/observables/ViewObservable.java → ...x/android/observables/ViewObservable.java b/...x/android/observables/ViewObservable.java → ...x/android/observables/ViewObservable.java
diff --git a/...ators/OperatorAdapterViewOnItemClick.java → ...ators/OperatorAdapterViewOnItemClick.java b/...ators/OperatorAdapterViewOnItemClick.java → ...ators/OperatorAdapterViewOnItemClick.java
diff --git a/.../operators/OperatorBroadcastRegister.java → .../operators/OperatorBroadcastRegister.java b/.../operators/OperatorBroadcastRegister.java → .../operators/OperatorBroadcastRegister.java
diff --git a/...perators/OperatorCompoundButtonInput.java → ...perators/OperatorCompoundButtonInput.java b/...perators/OperatorCompoundButtonInput.java → ...perators/OperatorCompoundButtonInput.java
diff --git a/...operators/OperatorConditionalBinding.java → ...operators/OperatorConditionalBinding.java b/...operators/OperatorConditionalBinding.java → ...operators/OperatorConditionalBinding.java
diff --git a/...ators/OperatorLocalBroadcastRegister.java → ...ators/OperatorLocalBroadcastRegister.java b/...ators/OperatorLocalBroadcastRegister.java → ...ators/OperatorLocalBroadcastRegister.java
diff --git a/...ators/OperatorSharedPreferenceChange.java → ...ators/OperatorSharedPreferenceChange.java b/...ators/OperatorSharedPreferenceChange.java → ...ators/OperatorSharedPreferenceChange.java
diff --git a/...roid/operators/OperatorTextViewInput.java → ...roid/operators/OperatorTextViewInput.java b/...roid/operators/OperatorTextViewInput.java → ...roid/operators/OperatorTextViewInput.java
diff --git a/.../android/operators/OperatorViewClick.java → .../android/operators/OperatorViewClick.java b/.../android/operators/OperatorViewClick.java → .../android/operators/OperatorViewClick.java
diff --git a/...android/schedulers/AndroidSchedulers.java → ...android/schedulers/AndroidSchedulers.java b/...android/schedulers/AndroidSchedulers.java → ...android/schedulers/AndroidSchedulers.java
diff --git a/...id/schedulers/HandlerThreadScheduler.java → ...id/schedulers/HandlerThreadScheduler.java b/...id/schedulers/HandlerThreadScheduler.java → ...id/schedulers/HandlerThreadScheduler.java
diff --git a/...d/subscriptions/AndroidSubscriptions.java → ...d/subscriptions/AndroidSubscriptions.java b/...d/subscriptions/AndroidSubscriptions.java → ...d/subscriptions/AndroidSubscriptions.java
diff --git a/...id/src/test/java/rx/android/TestUtil.java → ...ry/src/test/java/rx/android/TestUtil.java b/...id/src/test/java/rx/android/TestUtil.java → ...ry/src/test/java/rx/android/TestUtil.java
diff --git a/...rx/android/functions/ViewAction1Test.java → ...rx/android/functions/ViewAction1Test.java b/...rx/android/functions/ViewAction1Test.java → ...rx/android/functions/ViewAction1Test.java
diff --git a/...functions/ViewActionSetActivatedTest.java → ...functions/ViewActionSetActivatedTest.java b/...functions/ViewActionSetActivatedTest.java → ...functions/ViewActionSetActivatedTest.java
diff --git a/...functions/ViewActionSetClickableTest.java → ...functions/ViewActionSetClickableTest.java b/...functions/ViewActionSetClickableTest.java → ...functions/ViewActionSetClickableTest.java
diff --git a/...d/functions/ViewActionSetEnabledTest.java → ...d/functions/ViewActionSetEnabledTest.java b/...d/functions/ViewActionSetEnabledTest.java → ...d/functions/ViewActionSetEnabledTest.java
diff --git a/...functions/ViewActionSetFocusableTest.java → ...functions/ViewActionSetFocusableTest.java b/...functions/ViewActionSetFocusableTest.java → ...functions/ViewActionSetFocusableTest.java
diff --git a/.../functions/ViewActionSetSelectedTest.java → .../functions/ViewActionSetSelectedTest.java b/.../functions/ViewActionSetSelectedTest.java → .../functions/ViewActionSetSelectedTest.java
diff --git a/...unctions/ViewActionSetVisibilityTest.java → ...unctions/ViewActionSetVisibilityTest.java b/...unctions/ViewActionSetVisibilityTest.java → ...unctions/ViewActionSetVisibilityTest.java
diff --git a/...id/observables/AndroidObservableTest.java → ...id/observables/AndroidObservableTest.java b/...id/observables/AndroidObservableTest.java → ...id/observables/AndroidObservableTest.java
diff --git a/...s/OperatorAdapterViewOnItemClickTest.java → ...s/OperatorAdapterViewOnItemClickTest.java b/...s/OperatorAdapterViewOnItemClickTest.java → ...s/OperatorAdapterViewOnItemClickTest.java
diff --git a/...rators/OperatorBroadcastRegisterTest.java → ...rators/OperatorBroadcastRegisterTest.java b/...rators/OperatorBroadcastRegisterTest.java → ...rators/OperatorBroadcastRegisterTest.java
diff --git a/...tors/OperatorCompoundButtonInputTest.java → ...tors/OperatorCompoundButtonInputTest.java b/...tors/OperatorCompoundButtonInputTest.java → ...tors/OperatorCompoundButtonInputTest.java
diff --git a/...ators/OperatorConditionalBindingTest.java → ...ators/OperatorConditionalBindingTest.java b/...ators/OperatorConditionalBindingTest.java → ...ators/OperatorConditionalBindingTest.java
diff --git a/...s/OperatorLocalBroadcastRegisterTest.java → ...s/OperatorLocalBroadcastRegisterTest.java b/...s/OperatorLocalBroadcastRegisterTest.java → ...s/OperatorLocalBroadcastRegisterTest.java
diff --git a/.../OperatorSharedPreferencesChangeTest.java → .../OperatorSharedPreferencesChangeTest.java b/.../OperatorSharedPreferencesChangeTest.java → .../OperatorSharedPreferencesChangeTest.java
diff --git a/.../operators/OperatorTextViewInputTest.java → .../operators/OperatorTextViewInputTest.java b/.../operators/OperatorTextViewInputTest.java → .../operators/OperatorTextViewInputTest.java
diff --git a/...roid/operators/OperatorViewClickTest.java → ...roid/operators/OperatorViewClickTest.java b/...roid/operators/OperatorViewClickTest.java → ...roid/operators/OperatorViewClickTest.java
diff --git a/...chedulers/HandlerThreadSchedulerTest.java → ...chedulers/HandlerThreadSchedulerTest.java b/...chedulers/HandlerThreadSchedulerTest.java → ...chedulers/HandlerThreadSchedulerTest.java
diff --git a/samples-build-wrapper/build.gradle b/samples-build-wrapper/build.gradle
@@ -1,7 +1,6 @@
 apply plugin: 'java'
-apply plugin: 'maven'
 
-tasks.install.doLast {
+tasks.assemble.doLast {
     def androidHome = System.getenv("ANDROID_HOME")
     if (androidHome) {
         println "Found ANDROID_HOME at $androidHome"

diff --git a/settings.gradle b/settings.gradle
@@ -1,2 +1,2 @@
-rootProject.name='rxandroid-project'
-include 'rxandroid', 'samples-build-wrapper'
+rootProject.name='rxandroid'
+include 'library', 'samples-build-wrapper'