Update project to build for Android SDK 33

This also includes migrating to AndroidX
brarcher · Dec 10, 2022 · d9a3add · d9a3add
1 parent 700f52c
commit d9a3add
Show file tree

Hide file tree

Showing 35 changed files with 138 additions and 177 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,20 +1,14 @@
 apply plugin: 'com.android.application'
-apply plugin: 'findbugs'
-
-findbugs {
-    sourceSets = []
-    ignoreFailures = false
-}
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "protect.budgetwatch"
         minSdkVersion 14
-        targetSdkVersion 27
+        targetSdkVersion 33
         versionCode 29
-        versionName "0.21.5"
+        versionName "0.21.6"
     }
     buildTypes {
         release {
@@ -27,14 +21,6 @@ android {
         }
     }
 
-   lintOptions {
-      disable "GoogleAppIndexingWarning"
-      disable "ButtonStyle"
-      disable "IconDipSize"
-      disable "AlwaysShowAction"
-      disable "InflateParams"
-      disable "MissingTranslation"
-   }
 
     // Starting with Android Studio 3 Robolectric is unable to find resources.
     // The following allows it to find the resources.
@@ -43,35 +29,20 @@ android {
             includeAndroidResources = true
         }
     }
+    namespace 'protect.budgetwatch'
+    lint {
+        disable 'GoogleAppIndexingWarning', 'ButtonStyle', 'IconDipSize', 'AlwaysShowAction', 'InflateParams', 'MissingTranslation'
+    }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:27.0.2'
-    compile 'com.android.support:design:27.0.2'
-    compile 'org.apache.commons:commons-csv:1.5'
-    compile group: 'com.google.guava', name: 'guava', version: '20.0'
-    compile 'com.github.apl-devs:appintro:v4.2.0'
-    testCompile 'junit:junit:4.12'
-    testCompile "org.robolectric:robolectric:3.7"
-    testCompile group: 'org.javatuples', name: 'javatuples', version: '1.2'
-}
-
-task findbugs(type: FindBugs, dependsOn: 'assembleDebug') {
-
-    description 'Run findbugs'
-    group 'verification'
-
-    classes = fileTree('build/intermediates/javac/debug/compileDebugJavaWithJavac/classes')
-    source = fileTree('src/main/java')
-    classpath = files()
-
-    effort = 'max'
-
-    excludeFilter = file("./config/findbugs/exclude.xml")
-
-    reports {
-        xml.enabled = false
-        html.enabled = true
-    }
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'org.apache.commons:commons-csv:1.5'
+    implementation group: 'com.google.guava', name: 'guava', version: '20.0'
+    implementation 'com.github.apl-devs:appintro:v4.2.0'
+    testImplementation 'junit:junit:4.12'
+    testImplementation "org.robolectric:robolectric:3.7"
+    testImplementation group: 'org.javatuples', name: 'javatuples', version: '1.2'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="protect.budgetwatch">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.CAMERA"/>
@@ -16,7 +15,8 @@
             android:name=".MainActivity"
             android:label="@string/app_name"
             android:configChanges="orientation|screenSize"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppTheme.NoActionBar"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -37,7 +37,8 @@
             android:name=".TransactionActivity"
             android:label="@string/transactionsTitle"
             android:theme="@style/AppTheme.NoActionBar"
-            android:launchMode="singleTop">
+            android:launchMode="singleTop"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -71,20 +72,22 @@
         <activity
             android:name=".ShortcutConfigure"
             android:label="@string/addShortcutsTitle"
-            android:configChanges="orientation|screenSize">
+            android:configChanges="orientation|screenSize"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
-        <receiver android:label="@string/app_name" android:name="TransactionExpenseWidget">
+        <receiver android:label="@string/app_name" android:name="TransactionExpenseWidget"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
             </intent-filter>
             <meta-data android:name="android.appwidget.provider" android:resource="@xml/widget_provider"/>
         </receiver>
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:grantUriPermissions="true"
             android:exported="false"
             android:authorities="${applicationId}">

diff --git a/app/src/main/java/protect/budgetwatch/BudgetActivity.java b/app/src/main/java/protect/budgetwatch/BudgetActivity.java
@@ -1,25 +1,21 @@
 package protect.budgetwatch;
 
 
-import android.app.AlertDialog;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
-import android.widget.DatePicker;
 import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import java.text.DateFormat;
 import java.util.Calendar;

diff --git a/app/src/main/java/protect/budgetwatch/BudgetViewActivity.java b/app/src/main/java/protect/budgetwatch/BudgetViewActivity.java
@@ -4,16 +4,15 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 

diff --git a/app/src/main/java/protect/budgetwatch/ImportExportActivity.java b/app/src/main/java/protect/budgetwatch/ImportExportActivity.java
@@ -13,14 +13,14 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.FileProvider;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.core.content.FileProvider;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;

diff --git a/app/src/main/java/protect/budgetwatch/MainActivity.java b/app/src/main/java/protect/budgetwatch/MainActivity.java
@@ -7,9 +7,9 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -22,12 +22,10 @@
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.google.common.collect.ImmutableMap;
 
 import java.util.Calendar;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;

diff --git a/app/src/main/java/protect/budgetwatch/ReceiptViewActivity.java b/app/src/main/java/protect/budgetwatch/ReceiptViewActivity.java
@@ -5,12 +5,12 @@
 import android.graphics.Point;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.content.FileProvider;
-import android.support.v4.view.MenuItemCompat;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.ShareActionProvider;
-import android.support.v7.widget.Toolbar;
+import androidx.core.content.FileProvider;
+import androidx.core.view.MenuItemCompat;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.ShareActionProvider;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.Display;
 import android.view.Menu;

diff --git a/app/src/main/java/protect/budgetwatch/SettingsActivity.java b/app/src/main/java/protect/budgetwatch/SettingsActivity.java
@@ -2,9 +2,9 @@
 
 import android.os.Bundle;
 import android.preference.PreferenceFragment;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 
 public class SettingsActivity extends AppCompatActivity

diff --git a/app/src/main/java/protect/budgetwatch/ShortcutConfigure.java b/app/src/main/java/protect/budgetwatch/ShortcutConfigure.java
@@ -4,8 +4,8 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/app/src/main/java/protect/budgetwatch/TransactionActivity.java b/app/src/main/java/protect/budgetwatch/TransactionActivity.java
@@ -7,13 +7,13 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.support.v7.widget.SearchView;
+import com.google.android.material.tabs.TabLayout;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.appcompat.widget.SearchView;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;

diff --git a/app/src/main/java/protect/budgetwatch/TransactionFragment.java b/app/src/main/java/protect/budgetwatch/TransactionFragment.java
@@ -3,17 +3,12 @@
 import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.util.Log;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.view.LayoutInflater;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
-import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.ListView;
 import android.widget.TextView;
 

diff --git a/app/src/main/java/protect/budgetwatch/TransactionPagerAdapter.java b/app/src/main/java/protect/budgetwatch/TransactionPagerAdapter.java
@@ -1,9 +1,9 @@
 package protect.budgetwatch;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
 
 class TransactionPagerAdapter extends FragmentStatePagerAdapter
 {

diff --git a/app/src/main/java/protect/budgetwatch/TransactionViewActivity.java b/app/src/main/java/protect/budgetwatch/TransactionViewActivity.java
@@ -17,15 +17,15 @@
 import android.os.Environment;
 import android.preference.PreferenceManager;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.FileProvider;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.core.content.FileProvider;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;

diff --git a/app/src/main/java/protect/budgetwatch/intro/IntroActivity.java b/app/src/main/java/protect/budgetwatch/intro/IntroActivity.java
@@ -1,13 +1,11 @@
 package protect.budgetwatch.intro;
 
 import android.os.Bundle;
-import android.support.annotation.LayoutRes;
-import android.support.v4.app.Fragment;
+import androidx.annotation.LayoutRes;
+import androidx.fragment.app.Fragment;
 
 import com.github.paolorotolo.appintro.AppIntro;
 
-import protect.budgetwatch.R;
-
 public class IntroActivity extends AppIntro
 {
     @Override

diff --git a/app/src/main/java/protect/budgetwatch/intro/IntroSlide1.java b/app/src/main/java/protect/budgetwatch/intro/IntroSlide1.java
@@ -1,7 +1,7 @@
 package protect.budgetwatch.intro;
 
 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/protect/budgetwatch/intro/IntroSlide2.java b/app/src/main/java/protect/budgetwatch/intro/IntroSlide2.java
@@ -1,7 +1,7 @@
 package protect.budgetwatch.intro;
 
 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;