WIP: make everything build again

maxtroy · Jul 14, 2019 · 4a7b990 · 4a7b990
1 parent 04045cc
commit 4a7b990
Show file tree

Hide file tree

Showing 129 changed files with 306 additions and 287 deletions.
diff --git a/agera/build.gradle b/agera/build.gradle
@@ -35,6 +35,8 @@ publish {
     groupId = gradle.group
     artifactId = 'agera'
     version = gradle.versionName
+    publishVersion = gradle.versionName
+    desc = gradle.description
     autoPublish = false
 }
 

diff --git a/agera/src/main/java/com/google/android/agera/ActivationHandler.java b/agera/src/main/java/com/google/android/agera/ActivationHandler.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.agera;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Receives events of the {@link UpdateDispatcher} created with

diff --git a/agera/src/main/java/com/google/android/agera/BaseObservable.java b/agera/src/main/java/com/google/android/agera/BaseObservable.java
@@ -24,7 +24,7 @@
 
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import java.util.Arrays;
 
 /**

diff --git a/agera/src/main/java/com/google/android/agera/Binder.java b/agera/src/main/java/com/google/android/agera/Binder.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.agera;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * A receiver of two input objects.

diff --git a/agera/src/main/java/com/google/android/agera/Binders.java b/agera/src/main/java/com/google/android/agera/Binders.java
@@ -17,7 +17,7 @@
 
 import static com.google.android.agera.Common.NULL_OPERATOR;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Utility methods for obtaining {@link Binder} instances.

diff --git a/agera/src/main/java/com/google/android/agera/Common.java b/agera/src/main/java/com/google/android/agera/Common.java
@@ -18,7 +18,7 @@
 import static com.google.android.agera.Preconditions.checkNotNull;
 import static com.google.android.agera.Result.failure;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 final class Common {
   static final Function<Throwable, ? extends Result<?>> FAILED_RESULT = new FailedResult<>();

diff --git a/agera/src/main/java/com/google/android/agera/CompiledRepository.java b/agera/src/main/java/com/google/android/agera/CompiledRepository.java
@@ -27,9 +27,9 @@
 import static com.google.android.agera.WorkerHandler.workerHandler;
 import static java.lang.Thread.currentThread;
 
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.List;

diff --git a/agera/src/main/java/com/google/android/agera/Conditions.java b/agera/src/main/java/com/google/android/agera/Conditions.java
@@ -19,7 +19,7 @@
 import static com.google.android.agera.Common.TRUE_CONDICATE;
 import static com.google.android.agera.Preconditions.checkNotNull;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Utility methods for obtaining {@link Condition} instances.

diff --git a/agera/src/main/java/com/google/android/agera/FailedResultException.java b/agera/src/main/java/com/google/android/agera/FailedResultException.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.agera;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * The exception thrown by {@link Result#get()} on a failed result. The cause of the failure can be

diff --git a/agera/src/main/java/com/google/android/agera/Function.java b/agera/src/main/java/com/google/android/agera/Function.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.agera;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Determines an output value based on an input value.

diff --git a/agera/src/main/java/com/google/android/agera/FunctionCompiler.java b/agera/src/main/java/com/google/android/agera/FunctionCompiler.java
@@ -20,7 +20,7 @@
 import static com.google.android.agera.Preconditions.checkNotNull;
 import static java.util.Collections.emptyList;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.google.android.agera.FunctionCompilerStates.FItem;
 import com.google.android.agera.FunctionCompilerStates.FList;
 import java.util.ArrayList;

diff --git a/agera/src/main/java/com/google/android/agera/FunctionCompilerStates.java b/agera/src/main/java/com/google/android/agera/FunctionCompilerStates.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.agera;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import java.util.Comparator;
 import java.util.List;
 

diff --git a/agera/src/main/java/com/google/android/agera/Functions.java b/agera/src/main/java/com/google/android/agera/Functions.java
@@ -21,8 +21,8 @@
 import static com.google.android.agera.Preconditions.checkNotNull;
 import static java.util.Collections.singletonList;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.google.android.agera.Common.StaticProducer;
 import com.google.android.agera.FunctionCompilerStates.FItem;
 import com.google.android.agera.FunctionCompilerStates.FList;

diff --git a/agera/src/main/java/com/google/android/agera/IdentityMultimap.java b/agera/src/main/java/com/google/android/agera/IdentityMultimap.java
@@ -1,6 +1,6 @@
 package com.google.android.agera;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import java.util.Arrays;
 
 final class IdentityMultimap<K, V> {

diff --git a/agera/src/main/java/com/google/android/agera/Merger.java b/agera/src/main/java/com/google/android/agera/Merger.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.agera;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Takes two inputs and merges them into one output.

diff --git a/agera/src/main/java/com/google/android/agera/Mergers.java b/agera/src/main/java/com/google/android/agera/Mergers.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.agera;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.google.android.agera.Common.StaticProducer;
 
 /**

diff --git a/agera/src/main/java/com/google/android/agera/Observable.java b/agera/src/main/java/com/google/android/agera/Observable.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.agera;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Notifies added {@link Updatable}s when something happens.

diff --git a/agera/src/main/java/com/google/android/agera/Observables.java b/agera/src/main/java/com/google/android/agera/Observables.java
@@ -18,8 +18,8 @@
 import static com.google.android.agera.Preconditions.checkNotNull;
 
 import android.os.Looper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/agera/src/main/java/com/google/android/agera/Preconditions.java b/agera/src/main/java/com/google/android/agera/Preconditions.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.agera;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Precondition checks.

diff --git a/agera/src/main/java/com/google/android/agera/Predicate.java b/agera/src/main/java/com/google/android/agera/Predicate.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.agera;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Determines a true or false value for a given input.

diff --git a/agera/src/main/java/com/google/android/agera/Predicates.java b/agera/src/main/java/com/google/android/agera/Predicates.java
@@ -19,7 +19,7 @@
 import static com.google.android.agera.Common.TRUE_CONDICATE;
 import static com.google.android.agera.Preconditions.checkNotNull;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Utility methods for obtaining {@link Predicate} instances.

diff --git a/agera/src/main/java/com/google/android/agera/Receiver.java b/agera/src/main/java/com/google/android/agera/Receiver.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.agera;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * A receiver of objects.

diff --git a/agera/src/main/java/com/google/android/agera/Receivers.java b/agera/src/main/java/com/google/android/agera/Receivers.java
@@ -17,7 +17,7 @@
 
 import static com.google.android.agera.Common.NULL_OPERATOR;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Utility methods for obtaining {@link Receiver} instances.

diff --git a/agera/src/main/java/com/google/android/agera/Repositories.java b/agera/src/main/java/com/google/android/agera/Repositories.java
@@ -18,7 +18,7 @@
 import static com.google.android.agera.Preconditions.checkNotNull;
 
 import android.os.Looper;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.google.android.agera.RepositoryCompilerStates.REventSource;
 
 /**

diff --git a/agera/src/main/java/com/google/android/agera/RepositoryCompiler.java b/agera/src/main/java/com/google/android/agera/RepositoryCompiler.java
@@ -34,9 +34,9 @@
 import static com.google.android.agera.Preconditions.checkState;
 
 import android.os.Looper;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;

diff --git a/agera/src/main/java/com/google/android/agera/RepositoryCompilerStates.java b/agera/src/main/java/com/google/android/agera/RepositoryCompilerStates.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.agera;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import java.io.Closeable;
 import java.util.concurrent.Executor;
 import java.util.concurrent.RejectedExecutionException;

diff --git a/agera/src/main/java/com/google/android/agera/RepositoryConfig.java b/agera/src/main/java/com/google/android/agera/RepositoryConfig.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.agera;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 

diff --git a/agera/src/main/java/com/google/android/agera/Reservoirs.java b/agera/src/main/java/com/google/android/agera/Reservoirs.java
@@ -19,8 +19,8 @@
 import static com.google.android.agera.Result.absentIfNull;
 
 import android.os.Looper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import java.util.ArrayDeque;
 import java.util.PriorityQueue;
 import java.util.Queue;

diff --git a/agera/src/main/java/com/google/android/agera/Result.java b/agera/src/main/java/com/google/android/agera/Result.java
@@ -20,8 +20,8 @@
 import static com.google.android.agera.Preconditions.checkState;
 import static java.util.Collections.singletonList;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import java.util.Collections;
 import java.util.List;
 

diff --git a/agera/src/main/java/com/google/android/agera/Supplier.java b/agera/src/main/java/com/google/android/agera/Supplier.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.agera;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * A supplier of data. Semantically, this could be a factory, generator, builder, or something else

diff --git a/agera/src/main/java/com/google/android/agera/Suppliers.java b/agera/src/main/java/com/google/android/agera/Suppliers.java
@@ -17,7 +17,7 @@
 
 import static com.google.android.agera.Preconditions.checkNotNull;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.google.android.agera.Common.StaticProducer;
 
 /**

diff --git a/agera/src/main/java/com/google/android/agera/WorkerHandler.java b/agera/src/main/java/com/google/android/agera/WorkerHandler.java
@@ -2,7 +2,7 @@
 
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import java.lang.ref.WeakReference;
 
 /**

diff --git a/agera/src/test/java/com/google/android/agera/FunctionsTest.java b/agera/src/test/java/com/google/android/agera/FunctionsTest.java
@@ -39,7 +39,7 @@
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;

diff --git a/agera/src/test/java/com/google/android/agera/ObservablesTest.java b/agera/src/test/java/com/google/android/agera/ObservablesTest.java
@@ -44,7 +44,7 @@
 import static org.robolectric.shadows.ShadowLooper.idleMainLooper;
 import static org.robolectric.shadows.ShadowLooper.runUiThreadTasksIncludingDelayedTasks;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.google.android.agera.test.mocks.MockUpdatable;
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/agera/src/test/java/com/google/android/agera/RepositoriesTest.java b/agera/src/test/java/com/google/android/agera/RepositoriesTest.java
@@ -37,7 +37,7 @@
 import static org.mockito.MockitoAnnotations.initMocks;
 import static org.robolectric.annotation.Config.NONE;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.google.android.agera.test.mocks.MockUpdatable;
 import java.util.ArrayList;
 import java.util.List;

diff --git a/agera/src/test/java/com/google/android/agera/RepositoryConfigTest.java b/agera/src/test/java/com/google/android/agera/RepositoryConfigTest.java
@@ -36,7 +36,7 @@
 import static org.robolectric.annotation.Config.NONE;
 import static org.robolectric.shadows.ShadowLooper.getShadowMainLooper;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.google.android.agera.test.SingleSlotDelayedExecutor;
 import com.google.android.agera.test.mocks.MockUpdatable;
 import org.junit.After;

diff --git a/agera/src/test/java/com/google/android/agera/ReservoirsTest.java b/agera/src/test/java/com/google/android/agera/ReservoirsTest.java
@@ -27,8 +27,8 @@
 import static org.robolectric.Robolectric.flushForegroundThreadScheduler;
 import static org.robolectric.annotation.Config.NONE;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.google.android.agera.test.mocks.MockUpdatable;
 import java.util.ArrayDeque;
 import java.util.Collection;

diff --git a/agera/src/test/java/com/google/android/agera/test/SingleSlotDelayedExecutor.java b/agera/src/test/java/com/google/android/agera/test/SingleSlotDelayedExecutor.java
@@ -20,8 +20,8 @@
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import java.util.concurrent.Executor;
 
 public final class SingleSlotDelayedExecutor implements Executor {

diff --git a/agera/src/test/java/com/google/android/agera/test/matchers/ConditionApplies.java b/agera/src/test/java/com/google/android/agera/test/matchers/ConditionApplies.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.agera.test.matchers;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.google.android.agera.Condition;
 import org.hamcrest.Description;
 import org.hamcrest.Factory;

diff --git a/agera/src/test/java/com/google/android/agera/test/matchers/HasPrivateConstructor.java b/agera/src/test/java/com/google/android/agera/test/matchers/HasPrivateConstructor.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.agera.test.matchers;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Modifier;
 import org.hamcrest.Description;

diff --git a/agera/src/test/java/com/google/android/agera/test/matchers/PredicateApply.java b/agera/src/test/java/com/google/android/agera/test/matchers/PredicateApply.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.agera.test.matchers;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.google.android.agera.Predicate;
 import org.hamcrest.Description;
 import org.hamcrest.Factory;

diff --git a/agera/src/test/java/com/google/android/agera/test/matchers/ReservoirGives.java b/agera/src/test/java/com/google/android/agera/test/matchers/ReservoirGives.java
@@ -17,8 +17,8 @@
 
 import static com.google.android.agera.Result.present;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.google.android.agera.Reservoir;
 import com.google.android.agera.Result;
 import org.hamcrest.Description;