Skip to content

Commit 6516ca4

Browse files
mttkaymttkay
committed
Fix broken install task due to module renaming
We renamed the core library module to ‘library’, but since this becomes the artifact name, this broke everything horribly. I renamed the parent project to `rxandroid-project` and the library module back to `rxandroid`
1 parent 7e4b433 commit 6516ca4

File tree

49 files changed

+4
-3
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+4
-3
lines changed

‎library/build.gradle renamed to ‎rxandroid/build.gradle

File renamed without changes.

‎library/src/main/java/rx/android/concurrency/AndroidSchedulers.java renamed to ‎rxandroid/src/main/java/rx/android/concurrency/AndroidSchedulers.java

File renamed without changes.

‎library/src/main/java/rx/android/concurrency/HandlerThreadScheduler.java renamed to ‎rxandroid/src/main/java/rx/android/concurrency/HandlerThreadScheduler.java

File renamed without changes.

‎library/src/main/java/rx/android/events/OnCheckedChangeEvent.java renamed to ‎rxandroid/src/main/java/rx/android/events/OnCheckedChangeEvent.java

File renamed without changes.

‎library/src/main/java/rx/android/events/OnClickEvent.java renamed to ‎rxandroid/src/main/java/rx/android/events/OnClickEvent.java

File renamed without changes.

‎library/src/main/java/rx/android/events/OnItemClickEvent.java renamed to ‎rxandroid/src/main/java/rx/android/events/OnItemClickEvent.java

File renamed without changes.

‎library/src/main/java/rx/android/events/OnTextChangeEvent.java renamed to ‎rxandroid/src/main/java/rx/android/events/OnTextChangeEvent.java

File renamed without changes.

‎library/src/main/java/rx/android/functions/ViewAction1.java renamed to ‎rxandroid/src/main/java/rx/android/functions/ViewAction1.java

File renamed without changes.

‎library/src/main/java/rx/android/functions/ViewActionSetActivated.java renamed to ‎rxandroid/src/main/java/rx/android/functions/ViewActionSetActivated.java

File renamed without changes.

‎library/src/main/java/rx/android/functions/ViewActionSetClickable.java renamed to ‎rxandroid/src/main/java/rx/android/functions/ViewActionSetClickable.java

File renamed without changes.

‎library/src/main/java/rx/android/functions/ViewActionSetEnabled.java renamed to ‎rxandroid/src/main/java/rx/android/functions/ViewActionSetEnabled.java

File renamed without changes.

‎library/src/main/java/rx/android/functions/ViewActionSetFocusable.java renamed to ‎rxandroid/src/main/java/rx/android/functions/ViewActionSetFocusable.java

File renamed without changes.

‎library/src/main/java/rx/android/functions/ViewActionSetSelected.java renamed to ‎rxandroid/src/main/java/rx/android/functions/ViewActionSetSelected.java

File renamed without changes.

‎library/src/main/java/rx/android/functions/ViewActionSetVisibility.java renamed to ‎rxandroid/src/main/java/rx/android/functions/ViewActionSetVisibility.java

File renamed without changes.

‎library/src/main/java/rx/android/functions/ViewActions.java renamed to ‎rxandroid/src/main/java/rx/android/functions/ViewActions.java

File renamed without changes.

‎library/src/main/java/rx/android/observables/AndroidObservable.java renamed to ‎rxandroid/src/main/java/rx/android/observables/AndroidObservable.java

File renamed without changes.

‎library/src/main/java/rx/android/observables/Assertions.java renamed to ‎rxandroid/src/main/java/rx/android/observables/Assertions.java

File renamed without changes.

‎library/src/main/java/rx/android/observables/ViewObservable.java renamed to ‎rxandroid/src/main/java/rx/android/observables/ViewObservable.java

File renamed without changes.

‎library/src/main/java/rx/android/operators/OperatorAdapterViewOnItemClick.java renamed to ‎rxandroid/src/main/java/rx/android/operators/OperatorAdapterViewOnItemClick.java

File renamed without changes.

‎library/src/main/java/rx/android/operators/OperatorBroadcastRegister.java renamed to ‎rxandroid/src/main/java/rx/android/operators/OperatorBroadcastRegister.java

File renamed without changes.

‎library/src/main/java/rx/android/operators/OperatorCompoundButtonInput.java renamed to ‎rxandroid/src/main/java/rx/android/operators/OperatorCompoundButtonInput.java

File renamed without changes.

‎library/src/main/java/rx/android/operators/OperatorConditionalBinding.java renamed to ‎rxandroid/src/main/java/rx/android/operators/OperatorConditionalBinding.java

File renamed without changes.

‎library/src/main/java/rx/android/operators/OperatorLocalBroadcastRegister.java renamed to ‎rxandroid/src/main/java/rx/android/operators/OperatorLocalBroadcastRegister.java

File renamed without changes.

‎library/src/main/java/rx/android/operators/OperatorSharedPreferenceChange.java renamed to ‎rxandroid/src/main/java/rx/android/operators/OperatorSharedPreferenceChange.java

File renamed without changes.

‎library/src/main/java/rx/android/operators/OperatorTextViewInput.java renamed to ‎rxandroid/src/main/java/rx/android/operators/OperatorTextViewInput.java

File renamed without changes.

‎library/src/main/java/rx/android/operators/OperatorViewClick.java renamed to ‎rxandroid/src/main/java/rx/android/operators/OperatorViewClick.java

File renamed without changes.

‎library/src/main/java/rx/android/schedulers/AndroidSchedulers.java renamed to ‎rxandroid/src/main/java/rx/android/schedulers/AndroidSchedulers.java

File renamed without changes.

‎library/src/main/java/rx/android/schedulers/HandlerThreadScheduler.java renamed to ‎rxandroid/src/main/java/rx/android/schedulers/HandlerThreadScheduler.java

File renamed without changes.

‎library/src/main/java/rx/android/subscriptions/AndroidSubscriptions.java renamed to ‎rxandroid/src/main/java/rx/android/subscriptions/AndroidSubscriptions.java

File renamed without changes.

‎library/src/test/java/rx/android/TestUtil.java renamed to ‎rxandroid/src/test/java/rx/android/TestUtil.java

File renamed without changes.

‎library/src/test/java/rx/android/functions/ViewAction1Test.java renamed to ‎rxandroid/src/test/java/rx/android/functions/ViewAction1Test.java

File renamed without changes.

‎library/src/test/java/rx/android/functions/ViewActionSetActivatedTest.java renamed to ‎rxandroid/src/test/java/rx/android/functions/ViewActionSetActivatedTest.java

File renamed without changes.

‎library/src/test/java/rx/android/functions/ViewActionSetClickableTest.java renamed to ‎rxandroid/src/test/java/rx/android/functions/ViewActionSetClickableTest.java

File renamed without changes.

‎library/src/test/java/rx/android/functions/ViewActionSetEnabledTest.java renamed to ‎rxandroid/src/test/java/rx/android/functions/ViewActionSetEnabledTest.java

File renamed without changes.

‎library/src/test/java/rx/android/functions/ViewActionSetFocusableTest.java renamed to ‎rxandroid/src/test/java/rx/android/functions/ViewActionSetFocusableTest.java

File renamed without changes.

‎library/src/test/java/rx/android/functions/ViewActionSetSelectedTest.java renamed to ‎rxandroid/src/test/java/rx/android/functions/ViewActionSetSelectedTest.java

File renamed without changes.

‎library/src/test/java/rx/android/functions/ViewActionSetVisibilityTest.java renamed to ‎rxandroid/src/test/java/rx/android/functions/ViewActionSetVisibilityTest.java

File renamed without changes.

‎library/src/test/java/rx/android/observables/AndroidObservableTest.java renamed to ‎rxandroid/src/test/java/rx/android/observables/AndroidObservableTest.java

File renamed without changes.

‎library/src/test/java/rx/android/operators/OperatorAdapterViewOnItemClickTest.java renamed to ‎rxandroid/src/test/java/rx/android/operators/OperatorAdapterViewOnItemClickTest.java

File renamed without changes.

‎library/src/test/java/rx/android/operators/OperatorBroadcastRegisterTest.java renamed to ‎rxandroid/src/test/java/rx/android/operators/OperatorBroadcastRegisterTest.java

File renamed without changes.

‎library/src/test/java/rx/android/operators/OperatorCompoundButtonInputTest.java renamed to ‎rxandroid/src/test/java/rx/android/operators/OperatorCompoundButtonInputTest.java

File renamed without changes.

‎library/src/test/java/rx/android/operators/OperatorConditionalBindingTest.java renamed to ‎rxandroid/src/test/java/rx/android/operators/OperatorConditionalBindingTest.java

File renamed without changes.

‎library/src/test/java/rx/android/operators/OperatorLocalBroadcastRegisterTest.java renamed to ‎rxandroid/src/test/java/rx/android/operators/OperatorLocalBroadcastRegisterTest.java

File renamed without changes.

‎library/src/test/java/rx/android/operators/OperatorSharedPreferencesChangeTest.java renamed to ‎rxandroid/src/test/java/rx/android/operators/OperatorSharedPreferencesChangeTest.java

File renamed without changes.

‎library/src/test/java/rx/android/operators/OperatorTextViewInputTest.java renamed to ‎rxandroid/src/test/java/rx/android/operators/OperatorTextViewInputTest.java

File renamed without changes.

‎library/src/test/java/rx/android/operators/OperatorViewClickTest.java renamed to ‎rxandroid/src/test/java/rx/android/operators/OperatorViewClickTest.java

File renamed without changes.

‎library/src/test/java/rx/android/schedulers/HandlerThreadSchedulerTest.java renamed to ‎rxandroid/src/test/java/rx/android/schedulers/HandlerThreadSchedulerTest.java

File renamed without changes.

‎samples-build-wrapper/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
apply plugin: 'java'
2+
apply plugin: 'maven'
23

3-
tasks.assemble.doLast {
4+
tasks.install.doLast {
45
def androidHome = System.getenv("ANDROID_HOME")
56
if (androidHome) {
67
println "Found ANDROID_HOME at $androidHome"

‎settings.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
rootProject.name='rxandroid'
2-
include 'library', 'samples-build-wrapper'
1+
rootProject.name='rxandroid-project'
2+
include 'rxandroid', 'samples-build-wrapper'

0 commit comments

Comments
 (0)