Rolled back AndroidX migration

vndly · Oct 1, 2018 · f4e1d9a · f4e1d9a
1 parent 6540e69
commit f4e1d9a
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 24 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -17,7 +17,7 @@ android
         targetSdkVersion 27
         versionCode 1
         versionName '3.3.0'
-        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+        testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
     }
 
     compileOptions
@@ -29,10 +29,10 @@ android
 
 dependencies
 {
-    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
 
-    androidTestImplementation 'androidx.annotation:annotation:1.0.0'
-    androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
-    androidTestImplementation 'androidx.test:rules:1.1.0-alpha4'
-    androidTestImplementation 'com.mauriciotogneri:greencoffee:3.4.0'
+    androidTestImplementation 'com.android.support:support-annotations:28.0.0'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test:rules:1.0.2'
+    androidTestImplementation 'com.mauriciotogneri:greencoffee:3.5.0'
 }
diff --git a/...est/java/com/mauriciotogneri/greencoffeeexample/test/features/ContactListFeatureTest.java b/...est/java/com/mauriciotogneri/greencoffeeexample/test/features/ContactListFeatureTest.java
@@ -1,6 +1,6 @@
 package com.mauriciotogneri.greencoffeeexample.test.features;
 
-import androidx.test.rule.ActivityTestRule;
+import android.support.test.rule.ActivityTestRule;
 
 import com.mauriciotogneri.greencoffee.GreenCoffeeConfig;
 import com.mauriciotogneri.greencoffee.GreenCoffeeTest;

diff --git a/...oidTest/java/com/mauriciotogneri/greencoffeeexample/test/features/DetailsFeatureTest.java b/...oidTest/java/com/mauriciotogneri/greencoffeeexample/test/features/DetailsFeatureTest.java
@@ -1,6 +1,6 @@
 package com.mauriciotogneri.greencoffeeexample.test.features;
 
-import androidx.test.rule.ActivityTestRule;
+import android.support.test.rule.ActivityTestRule;
 
 import com.mauriciotogneri.greencoffee.GreenCoffeeConfig;
 import com.mauriciotogneri.greencoffee.GreenCoffeeTest;

diff --git a/...droidTest/java/com/mauriciotogneri/greencoffeeexample/test/features/LoginFeatureTest.java b/...droidTest/java/com/mauriciotogneri/greencoffeeexample/test/features/LoginFeatureTest.java
@@ -1,6 +1,6 @@
 package com.mauriciotogneri.greencoffeeexample.test.features;
 
-import androidx.test.rule.ActivityTestRule;
+import android.support.test.rule.ActivityTestRule;
 
 import com.mauriciotogneri.greencoffee.GreenCoffeeConfig;
 import com.mauriciotogneri.greencoffee.GreenCoffeeTest;

diff --git a/...c/androidTest/java/com/mauriciotogneri/greencoffeeexample/test/steps/ScreenshotSteps.java b/...c/androidTest/java/com/mauriciotogneri/greencoffeeexample/test/steps/ScreenshotSteps.java
@@ -1,6 +1,6 @@
 package com.mauriciotogneri.greencoffeeexample.test.steps;
 
-import androidx.test.InstrumentationRegistry;
+import android.support.test.InstrumentationRegistry;
 
 import com.mauriciotogneri.greencoffee.GreenCoffeeSteps;
 import com.mauriciotogneri.greencoffee.annotations.Then;

diff --git a/app/src/main/java/com/mauriciotogneri/greencoffeeexample/activities/ContactListActivity.java b/app/src/main/java/com/mauriciotogneri/greencoffeeexample/activities/ContactListActivity.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -46,10 +46,10 @@ protected void onCreate(Bundle savedInstanceState)
         {
             listView.setAdapter(new ContactAdapter(this, contacts));
             listView.setOnItemClickListener((parent, view, position, id) ->
-            {
-                Contact contact = (Contact) parent.getItemAtPosition(position);
-                onContactSelected(contact);
-            });
+                                            {
+                                                Contact contact = (Contact) parent.getItemAtPosition(position);
+                                                onContactSelected(contact);
+                                            });
         }
         else
         {

diff --git a/app/src/main/java/com/mauriciotogneri/greencoffeeexample/activities/DetailsActivity.java b/app/src/main/java/com/mauriciotogneri/greencoffeeexample/activities/DetailsActivity.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.widget.TextView;
 
 import com.mauriciotogneri.greencoffeeexample.R;

diff --git a/app/src/main/java/com/mauriciotogneri/greencoffeeexample/activities/LoginActivity.java b/app/src/main/java/com/mauriciotogneri/greencoffeeexample/activities/LoginActivity.java
@@ -1,8 +1,8 @@
 package com.mauriciotogneri.greencoffeeexample.activities;
 
 import android.os.Bundle;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.widget.EditText;
 
@@ -20,12 +20,12 @@ protected void onCreate(Bundle savedInstanceState)
         setTitle(R.string.login_title);
 
         findViewById(R.id.login_button_doLogin).setOnClickListener(view ->
-        {
-            EditText username = findViewById(R.id.login_input_username);
-            EditText password = findViewById(R.id.login_input_password);
+                                                                   {
+                                                                       EditText username = findViewById(R.id.login_input_username);
+                                                                       EditText password = findViewById(R.id.login_input_password);
 
-            login(username.getText().toString(), password.getText().toString());
-        });
+                                                                       login(username.getText().toString(), password.getText().toString());
+                                                                   });
     }
 
     private void login(String username, String password)

diff --git a/app/src/main/java/com/mauriciotogneri/greencoffeeexample/adapters/ContactAdapter.java b/app/src/main/java/com/mauriciotogneri/greencoffeeexample/adapters/ContactAdapter.java
@@ -1,7 +1,7 @@
 package com.mauriciotogneri.greencoffeeexample.adapters;
 
 import android.content.Context;
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;