From a9e93b7b9857e9b4fdf49cba6c6b7a5e7a0d5ccd Mon Sep 17 00:00:00 2001 From: Akshay Viswanathan Date: Sun, 10 May 2020 23:07:05 +0530 Subject: [PATCH 1/2] TCFM.00-FixBuild: Fixing build issues by updating all the dependencies to the latest androidx libraries --- app/build.gradle | 35 ++++++++----------- .../example/com/squawker/MainActivity.java | 17 ++++----- .../example/com/squawker/SquawkAdapter.java | 3 +- .../FollowingPreferenceActivity.java | 7 ++-- .../FollowingPreferenceFragment.java | 8 +++-- app/src/main/res/layout/activity_main.xml | 2 +- build.gradle | 12 +++++-- gradle.properties | 1 + gradle/wrapper/gradle-wrapper.properties | 4 +-- 9 files changed, 48 insertions(+), 41 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 725fb1c8..7203d8e8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' -apply plugin: 'android-apt' +apply plugin: 'com.google.gms.google-services' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 29 + buildToolsVersion "29.0.3" defaultConfig { applicationId "android.example.com.squawker" - minSdkVersion 16 - targetSdkVersion 25 + minSdkVersion 19 + targetSdkVersion 29 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -21,26 +21,21 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { - exclude group: 'com.android.support', module: 'support-annotations' - }) - compile 'com.android.support:appcompat-v7:25.1.0' - testCompile 'junit:junit:4.12' - + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.1.0' + testImplementation 'junit:junit:4.13' // RecyclerView - compile 'com.android.support:recyclerview-v7:25.1.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0' // Schematic dependencies for ContentProvider - apt 'net.simonvt.schematic:schematic-compiler:0.6.3' - compile 'net.simonvt.schematic:schematic:0.6.3' + annotationProcessor 'net.simonvt.schematic:schematic-compiler:0.6.3' + implementation 'net.simonvt.schematic:schematic:0.6.3' // Preferences Dependencies - compile 'com.android.support:preference-v7:25.1.0' + implementation "androidx.preference:preference:1.1.1" + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' // Firebase dependency - compile 'com.google.firebase:firebase-messaging:10.0.1' + implementation 'com.google.firebase:firebase-messaging:20.1.7' } -// Apply the Google Services plugin. Make sure to add the google-services.json file in the app -// folder. You download it from the Firebase console -apply plugin: 'com.google.gms.google-services' diff --git a/app/src/main/java/android/example/com/squawker/MainActivity.java b/app/src/main/java/android/example/com/squawker/MainActivity.java index afe130d3..fbb607ef 100644 --- a/app/src/main/java/android/example/com/squawker/MainActivity.java +++ b/app/src/main/java/android/example/com/squawker/MainActivity.java @@ -22,19 +22,20 @@ import android.example.com.squawker.provider.SquawkContract; import android.example.com.squawker.provider.SquawkProvider; import android.os.Bundle; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.CursorLoader; -import android.support.v4.content.Loader; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.widget.DividerItemDecoration; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.appcompat.app.AppCompatActivity; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.CursorLoader; +import androidx.loader.content.Loader; +import androidx.preference.PreferenceManager; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.google.firebase.iid.FirebaseInstanceId; public class MainActivity extends AppCompatActivity implements diff --git a/app/src/main/java/android/example/com/squawker/SquawkAdapter.java b/app/src/main/java/android/example/com/squawker/SquawkAdapter.java index 89eb58dd..c6aa453f 100644 --- a/app/src/main/java/android/example/com/squawker/SquawkAdapter.java +++ b/app/src/main/java/android/example/com/squawker/SquawkAdapter.java @@ -18,13 +18,14 @@ import android.database.Cursor; import android.example.com.squawker.provider.SquawkContract; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; + import java.text.SimpleDateFormat; import java.util.Date; diff --git a/app/src/main/java/android/example/com/squawker/following/FollowingPreferenceActivity.java b/app/src/main/java/android/example/com/squawker/following/FollowingPreferenceActivity.java index 72769779..00b72623 100644 --- a/app/src/main/java/android/example/com/squawker/following/FollowingPreferenceActivity.java +++ b/app/src/main/java/android/example/com/squawker/following/FollowingPreferenceActivity.java @@ -17,11 +17,12 @@ import android.example.com.squawker.R; import android.os.Bundle; -import android.support.v4.app.NavUtils; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; import android.view.MenuItem; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.app.NavUtils; + /** * Displays an activity for who you are following */ diff --git a/app/src/main/java/android/example/com/squawker/following/FollowingPreferenceFragment.java b/app/src/main/java/android/example/com/squawker/following/FollowingPreferenceFragment.java index 9ad56e01..2e84bc35 100644 --- a/app/src/main/java/android/example/com/squawker/following/FollowingPreferenceFragment.java +++ b/app/src/main/java/android/example/com/squawker/following/FollowingPreferenceFragment.java @@ -18,11 +18,13 @@ import android.content.SharedPreferences; import android.example.com.squawker.R; import android.os.Bundle; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceFragmentCompat; -import android.support.v7.preference.SwitchPreferenceCompat; import android.util.Log; + +import androidx.preference.Preference; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.SwitchPreferenceCompat; + import com.google.firebase.messaging.FirebaseMessaging; diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4f8500c1..805c739a 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -16,7 +16,7 @@ android:layout_height="match_parent" tools:context="android.example.com.squawker.MainActivity"> - Date: Mon, 11 May 2020 12:43:11 +0530 Subject: [PATCH 2/2] TCFM.00-FixBuild: fixing imports --- .../fcm/SquawkFirebaseInstanceIdService.java | 14 ++++++++------ .../squawker/fcm/SquawkFirebaseMessageService.java | 3 ++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/android/example/com/squawker/fcm/SquawkFirebaseInstanceIdService.java b/app/src/main/java/android/example/com/squawker/fcm/SquawkFirebaseInstanceIdService.java index 1d2f90f9..581dd49a 100644 --- a/app/src/main/java/android/example/com/squawker/fcm/SquawkFirebaseInstanceIdService.java +++ b/app/src/main/java/android/example/com/squawker/fcm/SquawkFirebaseInstanceIdService.java @@ -17,13 +17,15 @@ import android.util.Log; +import androidx.annotation.NonNull; + import com.google.firebase.iid.FirebaseInstanceId; -import com.google.firebase.iid.FirebaseInstanceIdService; +import com.google.firebase.messaging.FirebaseMessagingService; /** * Listens for changes in the InstanceID */ -public class SquawkFirebaseInstanceIdService extends FirebaseInstanceIdService { +public class SquawkFirebaseInstanceIdService extends FirebaseMessagingService { private static String LOG_TAG = SquawkFirebaseInstanceIdService.class.getSimpleName(); @@ -33,15 +35,15 @@ public class SquawkFirebaseInstanceIdService extends FirebaseInstanceIdService { * is initially generated so this is where you would retrieve the token. */ @Override - public void onTokenRefresh() { + public void onNewToken(@NonNull String newToken) { + super.onNewToken(newToken); // Get updated InstanceID token. - String refreshedToken = FirebaseInstanceId.getInstance().getToken(); - Log.d(LOG_TAG, "Refreshed token: " + refreshedToken); + Log.d(LOG_TAG, "Refreshed token: " + newToken); // If you want to send messages to this application instance or // manage this apps subscriptions on the server side, send the // Instance ID token to your app server. - sendRegistrationToServer(refreshedToken); + sendRegistrationToServer(newToken); } /** diff --git a/app/src/main/java/android/example/com/squawker/fcm/SquawkFirebaseMessageService.java b/app/src/main/java/android/example/com/squawker/fcm/SquawkFirebaseMessageService.java index 9c868dbe..e51ea135 100644 --- a/app/src/main/java/android/example/com/squawker/fcm/SquawkFirebaseMessageService.java +++ b/app/src/main/java/android/example/com/squawker/fcm/SquawkFirebaseMessageService.java @@ -27,9 +27,10 @@ import android.media.RingtoneManager; import android.net.Uri; import android.os.AsyncTask; -import android.support.v4.app.NotificationCompat; import android.util.Log; +import androidx.core.app.NotificationCompat; + import com.google.firebase.messaging.FirebaseMessagingService; import com.google.firebase.messaging.RemoteMessage;