*Project Upgrades.

Author: HarshAndroid

Diff for: android/app/build.gradle

@@ -4,7 +4,6 @@ plugins {
     id 'com.google.gms.google-services'
     // END: FlutterFire Configuration
     id "kotlin-android"
-<<<<<<< HEAD
     // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
     id "dev.flutter.flutter-gradle-plugin"
 }
@@ -29,73 +28,15 @@ android {
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
         versionName = flutter.versionName
-=======
-    id "dev.flutter.flutter-gradle-plugin"
-}
-
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
-
-android {
-    namespace "com.harshRajpurohit.we_chat"
-    compileSdk 34
-    ndkVersion flutter.ndkVersion
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
-
-    defaultConfig {
-        applicationId "com.harshRajpurohit.we_chat"
-        minSdkVersion 23
-        targetSdkVersion flutter.targetSdkVersion
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
->>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
     }
 
     buildTypes {
         release {
-<<<<<<< HEAD
             signingConfig = signingConfigs.debug
-=======
-            signingConfig signingConfigs.debug
->>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
         }
     }
 }
 
 flutter {
-<<<<<<< HEAD
     source = "../.."
 }
-=======
-    source '../..'
-}
-
-dependencies {}
->>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee

Diff for: android/app/google-services.json

@@ -14,7 +14,6 @@
       },
       "oauth_client": [
         {
-<<<<<<< HEAD
           "client_id": "288842837392-gse3j6u9fferoav9leh2ik3468asfeup.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
@@ -23,8 +22,6 @@
           }
         },
         {
-=======
->>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
           "client_id": "288842837392-gvt1l790g0t1fmnurc5pmko3oss8b1tq.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {

Diff for: android/app/src/main/AndroidManifest.xml

@@ -1,16 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-<<<<<<< HEAD
 
     <!-- internet permission -->
     <uses-permission android:name="android.permission.INTERNET" />
 
-=======
-
-     <!-- internet permission -->
-    <uses-permission android:name="android.permission.INTERNET" />
-
-
->>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
     <application
         android:label="Apna Chat"
         android:name="${applicationName}"
@@ -19,46 +11,27 @@
             android:name=".MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
-<<<<<<< HEAD
             android:taskAffinity=""
-=======
->>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
 
-<<<<<<< HEAD
-=======
-            
->>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
             <meta-data
               android:name="io.flutter.embedding.android.NormalTheme"
               android:resource="@style/NormalTheme"
               />
-<<<<<<< HEAD
-=======
-            
->>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-<<<<<<< HEAD
 
-=======
-       
->>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
     </application>
-<<<<<<< HEAD
 
-=======
-  
->>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
     <queries>
         <intent>
             <action android:name="android.intent.action.PROCESS_TEXT"/>

Diff for: android/build.gradle

@@ -5,20 +5,12 @@ allprojects {
     }
 }
 
-<<<<<<< HEAD
 rootProject.buildDir = "../build"
-=======
-rootProject.buildDir = '../build'
->>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
 subprojects {
-<<<<<<< HEAD
     project.evaluationDependsOn(":app")
-=======
-    project.evaluationDependsOn(':app')
->>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
 }
 
 tasks.register("clean", Delete) {

Diff for: firebase.json

@@ -1 +1,23 @@
-{"flutter":{"platforms":{"android":{"default":{"projectId":"we-chat-75f13","appId":"1:288842837392:android:1353619813061d867a5715","fileOutput":"android/app/google-services.json"}},"dart":{"lib/firebase_options.dart":{"projectId":"we-chat-75f13","configurations":{"android":"1:288842837392:android:1353619813061d867a5715","ios":"1:288842837392:ios:f39c8dc31525a6687a5715","web":"1:288842837392:web:6ae5bafc6d7d4f407a5715"}}}}}}
+{
+    "flutter": {
+        "platforms": {
+            "android": {
+                "default": {
+                    "projectId": "we-chat-75f13",
+                    "appId": "1:288842837392:android:1353619813061d867a5715",
+                    "fileOutput": "android/app/google-services.json"
+                }
+            },
+            "dart": {
+                "lib/firebase_options.dart": {
+                    "projectId": "we-chat-75f13",
+                    "configurations": {
+                        "android": "1:288842837392:android:1353619813061d867a5715",
+                        "ios": "1:288842837392:ios:f39c8dc31525a6687a5715",
+                        "web": "1:288842837392:web:6ae5bafc6d7d4f407a5715"
+                    }
+                }
+            }
+        }
+    }
+}

Diff for: ios/Runner/Info.plist

@@ -13,11 +13,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-<<<<<<< HEAD
 	<string>Apna Chat</string>
-=======
-	<string>we_chat</string>
->>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>