From 8be9863cff1afaf00d91bbf2f91d624fc6006887 Mon Sep 17 00:00:00 2001
From: Ryan Conway <ryan@nimblehq.co>
Date: Tue, 22 Aug 2023 10:49:14 +0700
Subject: [PATCH] [#423] Remove build warnings when generating new project

---
 template-compose/app/build.gradle.kts                       | 2 ++
 template-compose/app/src/debug/AndroidManifest.xml          | 3 +--
 template-compose/app/src/main/AndroidManifest.xml           | 3 +--
 template-compose/data/build.gradle.kts                      | 6 +++---
 template-compose/data/src/main/AndroidManifest.xml          | 2 +-
 .../compose/data/repository/AppPreferencesRepositoryImpl.kt | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/template-compose/app/build.gradle.kts b/template-compose/app/build.gradle.kts
index 028198533..5e1dfc3aa 100644
--- a/template-compose/app/build.gradle.kts
+++ b/template-compose/app/build.gradle.kts
@@ -19,6 +19,8 @@ val getVersionCode: () -> Int = {
 }
 
 android {
+    namespace = "co.nimblehq.template.compose"
+
     signingConfigs {
         create(BuildType.RELEASE) {
             // Remember to edit signing.properties to have the correct info for release build.
diff --git a/template-compose/app/src/debug/AndroidManifest.xml b/template-compose/app/src/debug/AndroidManifest.xml
index c10e37a53..95ab02920 100644
--- a/template-compose/app/src/debug/AndroidManifest.xml
+++ b/template-compose/app/src/debug/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="co.nimblehq.template.compose">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!--For Chucker in debug build only-->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
diff --git a/template-compose/app/src/main/AndroidManifest.xml b/template-compose/app/src/main/AndroidManifest.xml
index 1bae8bf99..42327e885 100644
--- a/template-compose/app/src/main/AndroidManifest.xml
+++ b/template-compose/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="co.nimblehq.template.compose">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
diff --git a/template-compose/data/build.gradle.kts b/template-compose/data/build.gradle.kts
index 1ef1f1921..80738796f 100644
--- a/template-compose/data/build.gradle.kts
+++ b/template-compose/data/build.gradle.kts
@@ -6,10 +6,10 @@ plugins {
 }
 
 android {
+    namespace = "co.nimblehq.template.compose.data"
     compileSdk = Versions.ANDROID_COMPILE_SDK_VERSION
     defaultConfig {
         minSdk = Versions.ANDROID_MIN_SDK_VERSION
-        targetSdk = Versions.ANDROID_TARGET_SDK_VERSION
 
         consumerProguardFiles("consumer-rules.pro")
     }
@@ -36,8 +36,8 @@ android {
         jvmTarget = JavaVersion.VERSION_11.toString()
     }
 
-    lintOptions {
-        isCheckDependencies = true
+    lint {
+        checkDependencies = true
         xmlReport = true
         xmlOutput = file("build/reports/lint/lint-result.xml")
     }
diff --git a/template-compose/data/src/main/AndroidManifest.xml b/template-compose/data/src/main/AndroidManifest.xml
index 1e37650d4..8072ee00d 100644
--- a/template-compose/data/src/main/AndroidManifest.xml
+++ b/template-compose/data/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="co.nimblehq.template.compose.data" />
+<manifest />
diff --git a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/repository/AppPreferencesRepositoryImpl.kt b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/repository/AppPreferencesRepositoryImpl.kt
index bcda37b0e..6815f2568 100644
--- a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/repository/AppPreferencesRepositoryImpl.kt
+++ b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/repository/AppPreferencesRepositoryImpl.kt
@@ -32,9 +32,9 @@ class AppPreferencesRepositoryImpl @Inject constructor(
             preferences[PreferencesKeys.APP_PREFERENCE] ?: true
         }
 
-    override suspend fun updateAppPreference(appPreferenceValue: Boolean) {
+    override suspend fun updateAppPreference(appPreferencesValue: Boolean) {
         appPreferencesDataStore.edit { preferences ->
-            preferences[PreferencesKeys.APP_PREFERENCE] = appPreferenceValue
+            preferences[PreferencesKeys.APP_PREFERENCE] = appPreferencesValue
         }
     }
 }