diff --git a/app/build.gradle b/app/build.gradle index 94573fe..2a5cdf5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,17 +1,17 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 - buildToolsVersion '26.0.3' + compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { applicationId "com.google.android.perftesting" minSdkVersion 14 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testHandleProfiling true testFunctionalTest true } @@ -32,20 +32,20 @@ android { } dependencies { - String supportLibVersion = "27.0.2" - compile fileTree(include: ['*.jar'], dir: 'libs') - compile "com.android.support:appcompat-v7:${supportLibVersion}" - compile "com.android.support:recyclerview-v7:${supportLibVersion}" - compile "com.android.support:support-v4:${supportLibVersion}" - compile 'com.github.bumptech.glide:glide:3.8.0' - // TODO(developer): Comment in the following dependencies to enable Espresso and related libraries in this project. - // Force the use of a specific version of the annotations library because the app compile - // dependencies require this version transitively, but an androidTestCompile dependency - // requires a different version. See http://goo.gl/iH4WDq for more info. - // androidTestCompile "com.android.support:support-annotations:${supportLibVersion}" - // androidTestCompile 'com.android.support.test:runner:0.5' - // androidTestCompile 'com.android.support.test:rules:0.5' - // androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1' + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation "androidx.appcompat:appcompat:1.0.2" + implementation "androidx.recyclerview:recyclerview:1.0.0" + implementation "androidx.legacy:legacy-support-v4:1.0.0" + implementation 'com.github.bumptech.glide:glide:4.8.0' +// TODO(developer): Comment in the following dependencies to enable Espresso and related libraries in this project. +// Force the use of a specific version of the annotations library because the app compile +// dependencies require this version transitively, but an androidTestCompile dependency +// requires a different version. See http://goo.gl/iH4WDq for more info. + + androidTestImplementation "androidx.annotation:annotation:1.0.0" + androidTestImplementation 'androidx.test:runner:1.1.0' + androidTestImplementation 'androidx.test:rules:1.1.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0' } // Create performance testing tasks for all connected Android devices using a Gradle plugin defined diff --git a/app/src/androidTest/java/com/google/android/perftesting/TestListener.java b/app/src/androidTest/java/com/google/android/perftesting/TestListener.java index 2b1c522..7937580 100644 --- a/app/src/androidTest/java/com/google/android/perftesting/TestListener.java +++ b/app/src/androidTest/java/com/google/android/perftesting/TestListener.java @@ -17,7 +17,7 @@ package com.google.android.perftesting; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import com.google.android.perftesting.common.PerfTestingUtils; diff --git a/app/src/main/java/com/google/android/perftesting/MainActivity.java b/app/src/main/java/com/google/android/perftesting/MainActivity.java index 00e9136..11327be 100644 --- a/app/src/main/java/com/google/android/perftesting/MainActivity.java +++ b/app/src/main/java/com/google/android/perftesting/MainActivity.java @@ -18,7 +18,7 @@ import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; public class MainActivity extends AppCompatActivity { diff --git a/app/src/main/java/com/google/android/perftesting/MainActivityFragment.java b/app/src/main/java/com/google/android/perftesting/MainActivityFragment.java index d3039ec..02ce02c 100644 --- a/app/src/main/java/com/google/android/perftesting/MainActivityFragment.java +++ b/app/src/main/java/com/google/android/perftesting/MainActivityFragment.java @@ -17,7 +17,7 @@ package com.google.android.perftesting; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/google/android/perftesting/RecyclerViewActivity.java b/app/src/main/java/com/google/android/perftesting/RecyclerViewActivity.java index 29743e4..d92d6aa 100644 --- a/app/src/main/java/com/google/android/perftesting/RecyclerViewActivity.java +++ b/app/src/main/java/com/google/android/perftesting/RecyclerViewActivity.java @@ -17,9 +17,9 @@ package com.google.android.perftesting; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import com.google.android.perftesting.contacts.Contact; import com.google.android.perftesting.contacts.ContactsRecyclerAdapter; diff --git a/app/src/main/java/com/google/android/perftesting/SimpleListActivity.java b/app/src/main/java/com/google/android/perftesting/SimpleListActivity.java index 7830776..aad16e1 100644 --- a/app/src/main/java/com/google/android/perftesting/SimpleListActivity.java +++ b/app/src/main/java/com/google/android/perftesting/SimpleListActivity.java @@ -17,7 +17,7 @@ package com.google.android.perftesting; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.widget.ListView; import com.google.android.perftesting.contacts.Contact; diff --git a/app/src/main/java/com/google/android/perftesting/contacts/ContactsArrayAdapterFixed.java b/app/src/main/java/com/google/android/perftesting/contacts/ContactsArrayAdapterFixed.java index 7956b4e..f68c72b 100644 --- a/app/src/main/java/com/google/android/perftesting/contacts/ContactsArrayAdapterFixed.java +++ b/app/src/main/java/com/google/android/perftesting/contacts/ContactsArrayAdapterFixed.java @@ -24,6 +24,7 @@ import android.widget.ImageView; import android.widget.TextView; +import com.bumptech.glide.request.RequestOptions; import com.google.android.perftesting.R; import com.bumptech.glide.Glide; @@ -41,8 +42,8 @@ public ContactsArrayAdapterFixed(Context context, List contacts) { super(context, 0, contacts); } - @ Override - public View getView(int position, View convertView, ViewGroup parent ) { + @Override + public View getView(int position, View convertView, ViewGroup parent) { Contact contact = getItem(position); LayoutInflater inflater = LayoutInflater.from(getContext()); @@ -56,7 +57,8 @@ public View getView(int position, View convertView, ViewGroup parent ) { Glide.with(contactImage.getContext()) .load(R.drawable.bbq) - .fitCenter() + .apply(new RequestOptions() + .fitCenter()) .into(contactImage); contactName.setText(contact.getName()); diff --git a/app/src/main/java/com/google/android/perftesting/contacts/ContactsRecyclerAdapter.java b/app/src/main/java/com/google/android/perftesting/contacts/ContactsRecyclerAdapter.java index 590d394..b0922d6 100644 --- a/app/src/main/java/com/google/android/perftesting/contacts/ContactsRecyclerAdapter.java +++ b/app/src/main/java/com/google/android/perftesting/contacts/ContactsRecyclerAdapter.java @@ -17,13 +17,14 @@ package com.google.android.perftesting.contacts; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import com.bumptech.glide.request.RequestOptions; import com.google.android.perftesting.R; import com.bumptech.glide.Glide; @@ -63,7 +64,8 @@ public void onBindViewHolder(ViewHolder holder, int position) { textView.setText(contact.getName()); Glide.with(contactPic.getContext()) .load(R.drawable.bbq) - .fitCenter() + .apply(new RequestOptions() + .fitCenter()) .into(contactPic); } diff --git a/app/src/main/res/layout/activity_recyclerview.xml b/app/src/main/res/layout/activity_recyclerview.xml index c8b56ad..6725108 100644 --- a/app/src/main/res/layout/activity_recyclerview.xml +++ b/app/src/main/res/layout/activity_recyclerview.xml @@ -17,7 +17,7 @@ xmlns:tools="http://schemas.android.com/tools" tools:context=".RecyclerViewActivity"> - diff --git a/build.gradle b/build.gradle index d70a671..4c7f82b 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.4.0-alpha05' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 22867f9..5316812 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jan 19 15:00:17 WET 2018 +#Tue Nov 27 12:59:21 EET 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-rc-1-all.zip