From 078ff5fe0e62bfd0230e34611edcdcf86e1dd710 Mon Sep 17 00:00:00 2001
From: Yogesh Choudhary Paliyal <paliyalyogesh@gmail.com>
Date: Sat, 4 Mar 2023 15:54:31 +0530
Subject: [PATCH] AGP version bump (#358)

* version bump

* minor improvements
---
 .idea/gradle.xml                         | 2 +-
 app/build.gradle                         | 5 ++++-
 app/src/main/AndroidManifest.xml         | 3 +--
 build.gradle                             | 2 +-
 common/build.gradle                      | 2 +-
 common/src/main/AndroidManifest.xml      | 3 +--
 gradle.properties                        | 4 +---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 8 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5dd522d9..b08d648d 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Embedded JDK" />
+        <option name="gradleJvm" value="jbr-11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/app/build.gradle b/app/build.gradle
index 75b3517e..9a847f23 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,12 +7,14 @@ plugins {
     id("com.spotify.ruler")
 }
 
+def appPackageId = 'com.yogeshpaliyal.keypass'
+
 android {
     compileSdk 33
 
     defaultConfig {
 
-        applicationId "com.yogeshpaliyal.keypass"
+        applicationId appPackageId
         minSdk 22
         targetSdk 33
         versionCode 1409
@@ -85,6 +87,7 @@ android {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
         }
     }
+    namespace appPackageId
 
     /*sourceSets {
         main {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 24c76935..2f836b61 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/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="com.yogeshpaliyal.keypass">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
 
diff --git a/build.gradle b/build.gradle
index 706b868c..91bdbfdd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.15'
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"
diff --git a/common/build.gradle b/common/build.gradle
index 8bb6fcf3..09818f35 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -30,7 +30,7 @@ android {
         jvmTarget = '1.8'
     }
 
-   // namespace 'com.yogeshpaliyal.common'
+    namespace 'com.yogeshpaliyal.common'
 }
 
 dependencies {
diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml
index 2a06c41f..6fb2f783 100644
--- a/common/src/main/AndroidManifest.xml
+++ b/common/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="com.yogeshpaliyal.common">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application>
 
diff --git a/gradle.properties b/gradle.properties
index 0847b39a..fa84cf23 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,13 +10,11 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # 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
-# org.gradle.parallel=true
+org.gradle.parallel=true
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app"s APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 427252cb..7fcfb4cd 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sat May 22 13:20:40 IST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME