Skip to content

Commit

Permalink
Renamed base package from com.trello.rxlifecycle2 -> com.trello.rxlif…
Browse files Browse the repository at this point in the history
…ecycle3

We're doing a major version bump due to AndroidX, so we're bumping the
package as well.
  • Loading branch information
dlew committed Oct 25, 2018
1 parent 06f060a commit 5531d56
Show file tree
Hide file tree
Showing 69 changed files with 203 additions and 203 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* limitations under the License.
*/

package com.trello.rxlifecycle2.android.lifecycle.kotlin
package com.trello.rxlifecycle3.android.lifecycle.kotlin

import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleOwner
Expand Down
2 changes: 1 addition & 1 deletion rxlifecycle-android-lifecycle/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<manifest package="com.trello.rxlifecycle2.android.lifecycle" />
<manifest package="com.trello.rxlifecycle3.android.lifecycle" />

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.trello.lifecycle2.android.lifecycle;

import com.trello.rxlifecycle2.LifecycleProvider;
import com.trello.rxlifecycle2.LifecycleTransformer;
import com.trello.rxlifecycle2.RxLifecycle;
import com.trello.rxlifecycle3.LifecycleProvider;
import com.trello.rxlifecycle3.LifecycleTransformer;
import com.trello.rxlifecycle3.RxLifecycle;

import androidx.annotation.CheckResult;
import androidx.annotation.NonNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.trello.lifecycle2.android.lifecycle;

import com.trello.rxlifecycle2.LifecycleTransformer;
import com.trello.rxlifecycle2.OutsideLifecycleException;
import com.trello.rxlifecycle3.LifecycleTransformer;
import com.trello.rxlifecycle3.OutsideLifecycleException;

import androidx.annotation.CheckResult;
import androidx.annotation.NonNull;
import androidx.lifecycle.Lifecycle;
import io.reactivex.Observable;
import io.reactivex.functions.Function;

import static com.trello.rxlifecycle2.RxLifecycle.bind;
import static com.trello.rxlifecycle3.RxLifecycle.bind;

public final class RxLifecycleAndroidLifecycle {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.trello.rxlifecycle2;
package com.trello.rxlifecycle3;

import com.trello.lifecycle2.android.lifecycle.RxLifecycleAndroidLifecycle;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.trello.rxlifecycle2.android.lifecycle;
package com.trello.rxlifecycle3.android.lifecycle;

import com.trello.lifecycle2.android.lifecycle.AndroidLifecycle;
import com.trello.rxlifecycle2.LifecycleProvider;
import com.trello.rxlifecycle3.LifecycleProvider;

import org.junit.Before;
import org.junit.Test;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.trello.rxlifecycle2.android.lifecycle;
package com.trello.rxlifecycle3.android.lifecycle;

import com.trello.lifecycle2.android.lifecycle.AndroidLifecycle;
import com.trello.rxlifecycle2.LifecycleProvider;
import com.trello.rxlifecycle3.LifecycleProvider;

import org.junit.Before;
import org.junit.Test;
Expand Down
2 changes: 1 addition & 1 deletion rxlifecycle-android/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<manifest package="com.trello.rxlifecycle2.android" />
<manifest package="com.trello.rxlifecycle3.android" />
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* limitations under the License.
*/

package com.trello.rxlifecycle2.android;
package com.trello.rxlifecycle3.android;

/**
* Lifecycle events that can be emitted by Activities.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* limitations under the License.
*/

package com.trello.rxlifecycle2.android;
package com.trello.rxlifecycle3.android;

/**
* Lifecycle events that can be emitted by Fragments.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@
* limitations under the License.
*/

package com.trello.rxlifecycle2.android;
package com.trello.rxlifecycle3.android;

import android.view.View;

import com.trello.rxlifecycle2.LifecycleTransformer;
import com.trello.rxlifecycle2.OutsideLifecycleException;
import com.trello.rxlifecycle3.LifecycleTransformer;
import com.trello.rxlifecycle3.OutsideLifecycleException;

import androidx.annotation.CheckResult;
import androidx.annotation.NonNull;
import io.reactivex.Observable;
import io.reactivex.functions.Function;

import static com.trello.rxlifecycle2.RxLifecycle.bind;
import static com.trello.rxlifecycle2.internal.Preconditions.checkNotNull;
import static com.trello.rxlifecycle3.RxLifecycle.bind;
import static com.trello.rxlifecycle3.internal.Preconditions.checkNotNull;

public class RxLifecycleAndroid {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* limitations under the License.
*/

package com.trello.rxlifecycle2.android;
package com.trello.rxlifecycle3.android;

import android.view.View;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
* limitations under the License.
*/

package com.trello.rxlifecycle2;
package com.trello.rxlifecycle3;

import android.app.Activity;
import android.view.View;

import com.trello.rxlifecycle2.android.ActivityEvent;
import com.trello.rxlifecycle2.android.FragmentEvent;
import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
import com.trello.rxlifecycle3.android.ActivityEvent;
import com.trello.rxlifecycle3.android.FragmentEvent;
import com.trello.rxlifecycle3.android.RxLifecycleAndroid;

import org.junit.Before;
import org.junit.Test;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* limitations under the License.
*/

package com.trello.rxlifecycle2;
package com.trello.rxlifecycle3;

import android.view.View;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<manifest package="com.trello.rxlifecycle2.components.preference" />
<manifest package="com.trello.rxlifecycle3.components.preference" />
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
* limitations under the License.
*/

package com.trello.rxlifecycle2.components.preference;
package com.trello.rxlifecycle3.components.preference;

import android.os.Bundle;
import android.view.View;

import com.trello.rxlifecycle2.LifecycleProvider;
import com.trello.rxlifecycle2.LifecycleTransformer;
import com.trello.rxlifecycle2.RxLifecycle;
import com.trello.rxlifecycle2.android.FragmentEvent;
import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
import com.trello.rxlifecycle3.LifecycleProvider;
import com.trello.rxlifecycle3.LifecycleTransformer;
import com.trello.rxlifecycle3.RxLifecycle;
import com.trello.rxlifecycle3.android.FragmentEvent;
import com.trello.rxlifecycle3.android.RxLifecycleAndroid;

import androidx.annotation.CallSuper;
import androidx.annotation.CheckResult;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
* limitations under the License.
*/

package com.trello.rxlifecycle2.components.preference;
package com.trello.rxlifecycle3.components.preference;

import android.os.Bundle;
import android.view.View;

import com.trello.rxlifecycle2.LifecycleProvider;
import com.trello.rxlifecycle2.LifecycleTransformer;
import com.trello.rxlifecycle2.RxLifecycle;
import com.trello.rxlifecycle2.android.FragmentEvent;
import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
import com.trello.rxlifecycle3.LifecycleProvider;
import com.trello.rxlifecycle3.LifecycleTransformer;
import com.trello.rxlifecycle3.RxLifecycle;
import com.trello.rxlifecycle3.android.FragmentEvent;
import com.trello.rxlifecycle3.android.RxLifecycleAndroid;

import androidx.annotation.CallSuper;
import androidx.annotation.CheckResult;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
* limitations under the License.
*/

package com.trello.rxlifecycle2.components.preference;
package com.trello.rxlifecycle3.components.preference;

import android.os.Bundle;
import android.view.View;

import com.trello.rxlifecycle2.LifecycleProvider;
import com.trello.rxlifecycle2.LifecycleTransformer;
import com.trello.rxlifecycle2.RxLifecycle;
import com.trello.rxlifecycle2.android.FragmentEvent;
import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
import com.trello.rxlifecycle3.LifecycleProvider;
import com.trello.rxlifecycle3.LifecycleTransformer;
import com.trello.rxlifecycle3.RxLifecycle;
import com.trello.rxlifecycle3.android.FragmentEvent;
import com.trello.rxlifecycle3.android.RxLifecycleAndroid;

import androidx.annotation.CallSuper;
import androidx.annotation.CheckResult;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
* limitations under the License.
*/

package com.trello.rxlifecycle2.components.preference;
package com.trello.rxlifecycle3.components.preference;

import android.os.Bundle;
import android.view.View;

import com.trello.rxlifecycle2.LifecycleProvider;
import com.trello.rxlifecycle2.LifecycleTransformer;
import com.trello.rxlifecycle2.RxLifecycle;
import com.trello.rxlifecycle2.android.FragmentEvent;
import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
import com.trello.rxlifecycle3.LifecycleProvider;
import com.trello.rxlifecycle3.LifecycleTransformer;
import com.trello.rxlifecycle3.RxLifecycle;
import com.trello.rxlifecycle3.android.FragmentEvent;
import com.trello.rxlifecycle3.android.RxLifecycleAndroid;

import androidx.annotation.CallSuper;
import androidx.annotation.CheckResult;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
* limitations under the License.
*/

package com.trello.rxlifecycle2.components.preference;
package com.trello.rxlifecycle3.components.preference;

import android.os.Bundle;

import com.trello.rxlifecycle2.LifecycleProvider;
import com.trello.rxlifecycle2.android.FragmentEvent;
import com.trello.rxlifecycle3.LifecycleProvider;
import com.trello.rxlifecycle3.android.FragmentEvent;

import org.junit.Before;
import org.junit.Test;
Expand All @@ -32,7 +32,7 @@
import io.reactivex.observers.TestObserver;
import io.reactivex.subjects.PublishSubject;

import static com.trello.rxlifecycle2.android.FragmentEvent.STOP;
import static com.trello.rxlifecycle3.android.FragmentEvent.STOP;

@RunWith(RobolectricTestRunner.class)
@Config(manifest = Config.NONE)
Expand Down
2 changes: 1 addition & 1 deletion rxlifecycle-components/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<manifest package="com.trello.rxlifecycle2.components" />
<manifest package="com.trello.rxlifecycle3.components" />
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
* limitations under the License.
*/

package com.trello.rxlifecycle2.components;
package com.trello.rxlifecycle3.components;

import android.app.Activity;
import android.os.Bundle;

import com.trello.rxlifecycle2.LifecycleProvider;
import com.trello.rxlifecycle2.LifecycleTransformer;
import com.trello.rxlifecycle2.RxLifecycle;
import com.trello.rxlifecycle2.android.ActivityEvent;
import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
import com.trello.rxlifecycle3.LifecycleProvider;
import com.trello.rxlifecycle3.LifecycleTransformer;
import com.trello.rxlifecycle3.RxLifecycle;
import com.trello.rxlifecycle3.android.ActivityEvent;
import com.trello.rxlifecycle3.android.RxLifecycleAndroid;

import androidx.annotation.CallSuper;
import androidx.annotation.CheckResult;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
* limitations under the License.
*/

package com.trello.rxlifecycle2.components;
package com.trello.rxlifecycle3.components;

import android.app.DialogFragment;
import android.os.Bundle;
import android.view.View;

import com.trello.rxlifecycle2.LifecycleProvider;
import com.trello.rxlifecycle2.LifecycleTransformer;
import com.trello.rxlifecycle2.RxLifecycle;
import com.trello.rxlifecycle2.android.FragmentEvent;
import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
import com.trello.rxlifecycle3.LifecycleProvider;
import com.trello.rxlifecycle3.LifecycleTransformer;
import com.trello.rxlifecycle3.RxLifecycle;
import com.trello.rxlifecycle3.android.FragmentEvent;
import com.trello.rxlifecycle3.android.RxLifecycleAndroid;

import androidx.annotation.CallSuper;
import androidx.annotation.CheckResult;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
* limitations under the License.
*/

package com.trello.rxlifecycle2.components;
package com.trello.rxlifecycle3.components;

import android.app.Fragment;
import android.os.Bundle;
import android.view.View;

import com.trello.rxlifecycle2.LifecycleProvider;
import com.trello.rxlifecycle2.LifecycleTransformer;
import com.trello.rxlifecycle2.RxLifecycle;
import com.trello.rxlifecycle2.android.FragmentEvent;
import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
import com.trello.rxlifecycle3.LifecycleProvider;
import com.trello.rxlifecycle3.LifecycleTransformer;
import com.trello.rxlifecycle3.RxLifecycle;
import com.trello.rxlifecycle3.android.FragmentEvent;
import com.trello.rxlifecycle3.android.RxLifecycleAndroid;

import androidx.annotation.CallSuper;
import androidx.annotation.CheckResult;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
* limitations under the License.
*/

package com.trello.rxlifecycle2.components;
package com.trello.rxlifecycle3.components;

import android.os.Bundle;
import android.preference.PreferenceFragment;
import android.view.View;

import com.trello.rxlifecycle2.LifecycleProvider;
import com.trello.rxlifecycle2.LifecycleTransformer;
import com.trello.rxlifecycle2.RxLifecycle;
import com.trello.rxlifecycle2.android.FragmentEvent;
import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
import com.trello.rxlifecycle3.LifecycleProvider;
import com.trello.rxlifecycle3.LifecycleTransformer;
import com.trello.rxlifecycle3.RxLifecycle;
import com.trello.rxlifecycle3.android.FragmentEvent;
import com.trello.rxlifecycle3.android.RxLifecycleAndroid;

import androidx.annotation.CallSuper;
import androidx.annotation.CheckResult;
Expand Down
Loading

0 comments on commit 5531d56

Please sign in to comment.