Upgrade AGP

Author: DeweyReed

app/build.gradle

@@ -6,6 +6,7 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'de.timfreiheit.resourceplaceholders.plugin'
 
 android {
+    namespace 'io.github.deweyreed.clipboardcleaner'
     compileSdk 33
     defaultConfig {
         applicationId "io.github.deweyreed.clipboardcleaner"
@@ -24,17 +25,14 @@ android {
         release {
             minifyEnabled true
             shrinkResources true
-            // TODO: (2021-07-13): proguard-android-optimize.txt removes used resources
-            // https://issuetracker.google.com/issues/170709331
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
 
     buildFeatures {
         viewBinding true
     }
-
-    lintOptions {
+    lint {
         abortOnError false
     }
 }

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="io.github.deweyreed.clipboardcleaner">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Restart BootService -->
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -113,4 +112,4 @@
         </service>
     </application>
 
-</manifest>
+</manifest>

app/src/main/java/io/github/deweyreed/clipboardcleaner/ClipboardCleaner.kt

@@ -1,5 +1,6 @@
 package io.github.deweyreed.clipboardcleaner
 
+import android.annotation.SuppressLint
 import android.app.Application
 import android.content.Context
 import android.os.Build
@@ -49,6 +50,7 @@ class ClipboardCleaner : Application() {
     }
 
     companion object {
+        @SuppressLint("StaticFieldLeak")
         lateinit var app: ClipboardCleaner
     }
 }

app/src/main/java/io/github/deweyreed/clipboardcleaner/MainActivity.kt

@@ -106,7 +106,7 @@ class MainActivity : AppCompatActivity() {
                         Uri.parse("https://github.com/DeweyReed/ClipboardCleaner")
                     )
                 )
-            } catch (e: Exception) {
+            } catch (_: Exception) {
             }
             true
         }

build.gradle

@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.6.21'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         gradlePluginPortal()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'de.timfreiheit.resourceplaceholders:placeholders:0.4'
 

gradle.properties

@@ -13,5 +13,5 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 #Wed Mar 07 21:24:28 CST 2018
-android.enableJetifier=true
+android.nonTransitiveRClass=true
 android.useAndroidX=true