From 995e577d8a16237f5509b719b298917921c88570 Mon Sep 17 00:00:00 2001 From: Sagar Date: Thu, 20 Jan 2022 17:32:04 +0530 Subject: [PATCH] migrated androidx --- app/build.gradle | 19 +++++++++---------- app/src/main/AndroidManifest.xml | 6 ++++-- .../example/android/shushme/MainActivity.java | 8 ++++---- .../android/shushme/PlaceListAdapter.java | 6 +++--- .../provider/PlaceContentProvider.java | 2 +- app/src/main/res/layout/activity_main.xml | 4 ++-- app/src/main/res/xml/backup_descriptor.xml | 4 ++++ build.gradle | 8 +++++--- gradle.properties | 3 ++- gradle/wrapper/gradle-wrapper.properties | 6 +++--- 10 files changed, 37 insertions(+), 29 deletions(-) create mode 100644 app/src/main/res/xml/backup_descriptor.xml diff --git a/app/build.gradle b/app/build.gradle index 1913b202..ea0b4bd9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,15 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 31 defaultConfig { applicationId "com.example.android.shushme" - minSdkVersion 16 - targetSdkVersion 25 + minSdkVersion 23 + targetSdkVersion 31 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { release { @@ -20,11 +19,11 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:25.1.0' - compile 'com.android.support:recyclerview-v7:25.0.1' - testCompile 'junit:junit:4.12' + implementation 'androidx.appcompat:appcompat:1.4.1' + implementation 'androidx.recyclerview:recyclerview:1.2.1' + testImplementation 'junit:junit:4.13.2' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 89b2b127..608a35de 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -7,8 +7,10 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:supportsRtl="true" - android:theme="@style/AppTheme"> - + android:theme="@style/AppTheme" + android:fullBackupContent="@xml/backup_descriptor"> + diff --git a/app/src/main/java/com/example/android/shushme/MainActivity.java b/app/src/main/java/com/example/android/shushme/MainActivity.java index 102a5ab8..cced37ed 100644 --- a/app/src/main/java/com/example/android/shushme/MainActivity.java +++ b/app/src/main/java/com/example/android/shushme/MainActivity.java @@ -17,9 +17,9 @@ */ 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; public class MainActivity extends AppCompatActivity { @@ -41,7 +41,7 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_main); // Set up the recycler view - mRecyclerView = (RecyclerView) findViewById(R.id.places_list_recycler_view); + mRecyclerView =findViewById(R.id.places_list_recycler_view); mRecyclerView.setLayoutManager(new LinearLayoutManager(this)); mAdapter = new PlaceListAdapter(this); mRecyclerView.setAdapter(mAdapter); diff --git a/app/src/main/java/com/example/android/shushme/PlaceListAdapter.java b/app/src/main/java/com/example/android/shushme/PlaceListAdapter.java index 793ac1d5..2b56f249 100644 --- a/app/src/main/java/com/example/android/shushme/PlaceListAdapter.java +++ b/app/src/main/java/com/example/android/shushme/PlaceListAdapter.java @@ -17,7 +17,7 @@ */ 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; @@ -83,8 +83,8 @@ class PlaceViewHolder extends RecyclerView.ViewHolder { public PlaceViewHolder(View itemView) { super(itemView); - nameTextView = (TextView) itemView.findViewById(R.id.name_text_view); - addressTextView = (TextView) itemView.findViewById(R.id.address_text_view); + nameTextView = itemView.findViewById(R.id.name_text_view); + addressTextView = itemView.findViewById(R.id.address_text_view); } } diff --git a/app/src/main/java/com/example/android/shushme/provider/PlaceContentProvider.java b/app/src/main/java/com/example/android/shushme/provider/PlaceContentProvider.java index 21f0b3fb..be2e67cc 100644 --- a/app/src/main/java/com/example/android/shushme/provider/PlaceContentProvider.java +++ b/app/src/main/java/com/example/android/shushme/provider/PlaceContentProvider.java @@ -24,7 +24,7 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import static com.example.android.shushme.provider.PlaceContract.PlaceEntry; diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 3d6e2bf4..ffe0c42f 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -50,7 +50,7 @@ android:paddingTop="4dp" android:src="@drawable/ic_globe_primary_24dp" /> - - diff --git a/app/src/main/res/xml/backup_descriptor.xml b/app/src/main/res/xml/backup_descriptor.xml new file mode 100644 index 00000000..6fd6103a --- /dev/null +++ b/app/src/main/res/xml/backup_descriptor.xml @@ -0,0 +1,4 @@ + + + + diff --git a/build.gradle b/build.gradle index 74b2ab0d..01385d13 100644 --- a/build.gradle +++ b/build.gradle @@ -2,10 +2,11 @@ buildscript { repositories { - jcenter() + google() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:7.0.4' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -14,7 +15,8 @@ buildscript { allprojects { repositories { - jcenter() + google() + mavenCentral() } } diff --git a/gradle.properties b/gradle.properties index aac7c9b4..e001ff38 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,8 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. org.gradle.jvmargs=-Xmx1536m - +android.enableJetifier=true +android.useAndroidX=true # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 04e285f3..68835d3d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Thu Jan 20 17:04:55 IST 2022 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +zipStoreBase=GRADLE_USER_HOME