added parallelism: 3

android-sdk/build.gradle

@@ -46,7 +46,9 @@ android {
             testCoverageEnabled true
         }
     }
-
+    lintOptions {
+        abortOnError false
+    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
@@ -55,6 +57,7 @@ android {
     dexOptions {
         javaMaxHeapSize "4g"
     }
+    buildToolsVersion '26.0.2'
 }
 
 dependencies {

android-sdk/src/androidTest/java/com/optimizely/ab/android/sdk/OptimizelyClientEngineTest.java

@@ -20,7 +20,6 @@
 import android.content.Context;
 import android.content.res.Configuration;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
 import android.support.test.runner.AndroidJUnit4;
 
 import com.optimizely.ab.event.internal.payload.Event;
@@ -34,7 +33,7 @@
 
 @RunWith(AndroidJUnit4.class)
 public class OptimizelyClientEngineTest {
-    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB_MR2)
+    //@RequiresApi(api = Build.VERSION_CODES.HONEYCOMB_MR2)
     @Test
     public void testGetClientEngineFromContextAndroidTV() {
         Context context = mock(Context.class);
@@ -44,7 +43,7 @@ public void testGetClientEngineFromContextAndroidTV() {
         assertEquals(Event.ClientEngine.ANDROID_TV_SDK, OptimizelyClientEngine.getClientEngineFromContext(context));
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB_MR2)
+    //@RequiresApi(api = Build.VERSION_CODES.HONEYCOMB_MR2)
     @Test
     public void testGetClientEngineFromContextAndroid() {
         Context context = mock(Context.class);

android-sdk/src/androidTest/java/com/optimizely/ab/android/sdk/OptimizelyManagerBuilderTest.java

@@ -20,7 +20,6 @@
 import android.content.Context;
 import android.content.res.Configuration;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.espresso.core.deps.guava.util.concurrent.ListeningExecutorService;
 import android.support.test.runner.AndroidJUnit4;

android-sdk/src/androidTest/java/com/optimizely/ab/android/sdk/OptimizelyManagerTest.java

@@ -22,7 +22,6 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.espresso.core.deps.guava.util.concurrent.ListeningExecutorService;
 import android.support.test.espresso.core.deps.guava.util.concurrent.MoreExecutors;
@@ -255,7 +254,7 @@ public void stop() {
         assertNull(optimizelyManager.getOptimizelyStartListener());
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
+    //@RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
     @Test
     public void injectOptimizely() {
         Context context = mock(Context.class);
@@ -275,7 +274,7 @@ public void injectOptimizely() {
     }
 
     @Test
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    //@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     public void injectOptimizelyNullListener() {
         Context context = mock(Context.class);
         PackageManager packageManager = mock(PackageManager.class);
@@ -319,7 +318,7 @@ public void injectOptimizelyNullListener() {
         assertEquals(optimizelyManager.getProjectId(), intent2.getStringExtra(DatafileService.EXTRA_PROJECT_ID));
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
+    //@RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
     @Test
     public void injectOptimizelyHandlesInvalidDatafile() {
         Context context = mock(Context.class);
@@ -350,7 +349,7 @@ public void injectOptimizelyHandlesInvalidDatafile() {
 
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
+    //@RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
     @Test
     public void injectOptimizelyDoesNotDuplicateCallback() {
         Context context = mock(Context.class);

android-sdk/src/test/java/com/optimizely/ab/android/sdk/OptimizelyManagerDatafileServiceConnectionTest.java

@@ -18,7 +18,6 @@
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -54,7 +53,7 @@ public void setup() {
         datafileServiceConnection = new DatafileServiceConnection(optimizelyManager.getProjectId(), context, optimizelyManager.getDatafileLoadedListener(context,null));
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
+    //@RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
     @Test
     public void onServiceConnected() {
         DatafileService.LocalBinder binder = mock(DatafileService.LocalBinder.class);
@@ -70,7 +69,6 @@ public void onServiceConnected() {
         verify(service).getDatafile(same("1"), any(DatafileLoader.class), any(DatafileLoadedListener.class));
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
     @Test
     public void onServiceConnectedNullServiceFromBinder() {
         DatafileService.LocalBinder binder = mock(DatafileService.LocalBinder.class);

android-sdk/src/test/java/com/optimizely/ab/android/sdk/OptimizelyManagerOptlyActivityLifecycleCallbacksTest.java

@@ -18,7 +18,6 @@
 
 import android.app.Activity;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -38,13 +37,11 @@ public class OptimizelyManagerOptlyActivityLifecycleCallbacksTest {
     @Mock Activity activity;
     private OptimizelyManager.OptlyActivityLifecycleCallbacks optlyActivityLifecycleCallbacks;
 
-    @RequiresApi(api = Build.VERSION_CODES.ICE_CREAM_SANDWICH)
     @Before
     public void setup() {
         optlyActivityLifecycleCallbacks = new OptimizelyManager.OptlyActivityLifecycleCallbacks(optimizelyManager);
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.ICE_CREAM_SANDWICH)
     @Test
     public void onActivityStopped() {
         optlyActivityLifecycleCallbacks.onActivityStopped(activity);

build.gradle

@@ -31,9 +31,10 @@ buildscript {
     }
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -43,6 +44,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 

datafile-handler/build.gradle

@@ -33,6 +33,9 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         consumerProguardFiles '../proguard-rules.txt'
     }
+    lintOptions {
+        abortOnError false
+    }
     testOptions {
         unitTests.returnDefaultValues = true
     }
@@ -49,6 +52,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
     }
+    buildToolsVersion '26.0.2'
 }
 
 dependencies {

datafile-handler/src/androidTest/java/com/optimizely/ab/android/datafile_handler/DatafileLoaderTest.java

@@ -18,7 +18,7 @@
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+//import android.support.annotation.RequiresApi;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.espresso.core.deps.guava.util.concurrent.ListeningExecutorService;
 import android.support.test.espresso.core.deps.guava.util.concurrent.MoreExecutors;
@@ -53,7 +53,6 @@
 /**
  * Tests for {@link DatafileLoader}
  */
-@RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
 @RunWith(AndroidJUnit4.class)
 public class DatafileLoaderTest {
 

datafile-handler/src/androidTest/java/com/optimizely/ab/android/datafile_handler/DatafileServiceTest.java

@@ -21,7 +21,7 @@
 import android.content.Intent;
 import android.os.Build;
 import android.os.IBinder;
-import android.support.annotation.RequiresApi;
+//import android.support.annotation.RequiresApi;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.espresso.core.deps.guava.util.concurrent.ListeningExecutorService;
 import android.support.test.espresso.core.deps.guava.util.concurrent.MoreExecutors;
@@ -69,7 +69,7 @@ public void setup() {
         executor = MoreExecutors.newDirectExecutorService();
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
+    //@RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
     @Test
     public void testBinding() throws TimeoutException {
         Context context = InstrumentationRegistry.getTargetContext();
@@ -96,7 +96,7 @@ public void testBinding() throws TimeoutException {
         assertTrue(datafileService.isBound());
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
+    //@RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
     @Test
     public void testValidStart() throws TimeoutException {
         Context context = InstrumentationRegistry.getTargetContext();
@@ -116,7 +116,7 @@ public void testValidStart() throws TimeoutException {
         assertEquals(val, START_FLAG_REDELIVERY);
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
+    //@RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
     @Test
     public void testNullIntentStart() throws TimeoutException {
         Context context = InstrumentationRegistry.getTargetContext();
@@ -135,7 +135,7 @@ public void testNullIntentStart() throws TimeoutException {
         verify(logger).warn("Data file service received a null intent");
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
+    //@RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
     @Test
     public void testNoProjectIdIntentStart() throws TimeoutException {
         Context context = InstrumentationRegistry.getTargetContext();
@@ -154,7 +154,7 @@ public void testNoProjectIdIntentStart() throws TimeoutException {
         verify(logger).warn("Data file service received an intent with no project id extra");
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
+    //@RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
     @Test
     public void testUnbind() throws TimeoutException {
         Context context = InstrumentationRegistry.getTargetContext();
@@ -174,7 +174,7 @@ public void testUnbind() throws TimeoutException {
         verify(logger).info("All clients are unbound from data file service");
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
+    //@RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
     @Test
     @Ignore
     public void testIntentExtraData(){
@@ -203,7 +203,7 @@ public void testIntentExtraData(){
         assertTrue(intent2.getComponent().getShortClassName().contains("DatafileService"));
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
+    //@RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
     @Test
     public void testGetDatafileUrl(){
         // HARD-CODING link here to make sure we don't unintentionally mess up the datafile version

datafile-handler/src/main/java/com/optimizely/ab/android/datafile_handler/DatafileLoader.java

@@ -21,7 +21,6 @@
 import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
 
 import org.json.JSONObject;
 import org.slf4j.Logger;
@@ -58,7 +57,6 @@ public void onStop(Context context) {}
         });
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
     public void getDatafile(@NonNull String datafileUrl, @Nullable DatafileLoadedListener datafileLoadedListener) {
         RequestDatafileFromClientTask requestDatafileFromClientTask =
                 new RequestDatafileFromClientTask(datafileUrl,

datafile-handler/src/main/java/com/optimizely/ab/android/datafile_handler/DatafileService.java

@@ -24,7 +24,6 @@
 import android.os.IBinder;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
 
 import com.optimizely.ab.android.shared.Cache;
 import com.optimizely.ab.android.shared.Client;
@@ -57,7 +56,6 @@ public class DatafileService extends Service {
      * @hide
      * @see Service#onStartCommand(Intent, int, int)
      */
-    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         if (intent != null) {
@@ -117,7 +115,6 @@ public void stop() {
         stopSelf();
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
     public void getDatafile(String projectId, DatafileLoader datafileLoader, DatafileLoadedListener loadedListener) {
         String datafileUrl = getDatafileUrl(projectId);
         datafileLoader.getDatafile(datafileUrl, loadedListener);

datafile-handler/src/main/java/com/optimizely/ab/android/datafile_handler/DatafileServiceConnection.java

@@ -22,7 +22,6 @@
 import android.os.Build;
 import android.os.IBinder;
 import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
 
 import com.optimizely.ab.android.shared.Cache;
 import com.optimizely.ab.android.shared.Client;
@@ -61,7 +60,6 @@ public DatafileServiceConnection(@NonNull String projectId, @NonNull Context con
      *
      * @see ServiceConnection#onServiceConnected(ComponentName, IBinder)
      */
-    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
     @Override
     public void onServiceConnected(ComponentName className,
                                    IBinder service) {

datafile-handler/src/main/java/com/optimizely/ab/android/datafile_handler/DefaultDatafileHandler.java

@@ -20,7 +20,6 @@
 import android.content.Intent;
 import android.os.Build;
 import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
 
 import com.optimizely.ab.android.shared.Cache;
 import com.optimizely.ab.android.shared.Client;
@@ -70,7 +69,6 @@ public void downloadDatafile(final Context context, String projectId, final Data
         if (datafileServiceConnection == null) {
             this.datafileServiceConnection = new DatafileServiceConnection(projectId, context.getApplicationContext(),
                     new DatafileLoadedListener() {
-                        @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
                         @Override
                         public void onDatafileLoaded(@Nullable String dataFile) {
                             if (listener != null) {

event-handler/build.gradle

@@ -36,6 +36,9 @@ android {
     testOptions {
         unitTests.returnDefaultValues = true
     }
+    lintOptions {
+        abortOnError false
+    }
     buildTypes {
         release {
             minifyEnabled false
@@ -49,6 +52,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
     }
+    buildToolsVersion '26.0.2'
 }
 
 dependencies {

event-handler/src/androidTest/java/com/optimizely/ab/android/event_handler/DefaultEventHandlerTest.java

@@ -19,7 +19,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
 import android.util.Pair;

event-handler/src/androidTest/java/com/optimizely/ab/android/event_handler/EventClientTest.java

@@ -19,7 +19,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
 import android.util.Pair;

event-handler/src/androidTest/java/com/optimizely/ab/android/event_handler/EventDAOTest.java

@@ -18,7 +18,6 @@
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
 import android.util.Pair;
@@ -49,7 +48,6 @@ public class EventDAOTest {
     private Logger logger;
     private Context context;
 
-    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
     @Before
     public void setupEventDAO() {
         logger = mock(Logger.class);