Merge pull request #18 from cometchat-pro/v3

Kotlin and Gradle version upgrade

.gitignore

@@ -70,7 +70,6 @@ captures/
 .idea/
 
 
-
 # Keystore files
 # Uncomment the following lines if you do not want to check your keystore files in.
 #*.jks

app/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
+
 android {
     compileSdkVersion 33
     defaultConfig {
@@ -20,6 +20,7 @@ android {
             abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }
     }
+
     dataBinding {
         enabled = true
     }
@@ -28,20 +29,20 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
-
     }
+
     packagingOptions {
-        pickFirst  '**'
+        pickFirst '**'
     }
+
     lintOptions {
         checkReleaseBuilds false
-        // Or, if you prefer, you can continue to check for errors in release builds,
-        // but continue the build even when errors are found:
         abortOnError false
     }
 }
@@ -54,27 +55,25 @@ dependencies {
     implementation 'androidx.navigation:navigation-fragment:2.0.0'
     implementation 'androidx.navigation:navigation-ui:2.0.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
-    testImplementation 'junit:junit:4.12'
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
-
     implementation 'androidx.annotation:annotation:1.1.0'
+    testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.3.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     androidTestImplementation 'androidx.test.espresso:espresso-intents:3.3.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test:rules:1.3.0'
-
-    implementation project(path: ':uikit-kotlin')
-
     implementation 'com.google.android.material:material:1.2.0-alpha05'
     implementation 'com.facebook.shimmer:shimmer:0.4.0'
-//
-    implementation 'com.cometchat:pro-android-chat-sdk:3.0.14'
-    implementation 'com.cometchat:pro-android-calls-sdk:2.3.0'
 
     api 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0'
     api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.0'
+
+    implementation project(path: ':uikit-kotlin')
+    implementation 'com.cometchat:pro-android-chat-sdk:3.0.14'
+    implementation 'com.cometchat:pro-android-calls-sdk:2.3.0'
 }
+
 configurations.all {
     resolutionStrategy {
         force 'androidx.appcompat:appcompat:1.3.0'

build.gradle

@@ -1,30 +1,23 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
-    ext.kotlin_version = '1.5.20'
+    ext.kotlin_version = '1.8.20'
     repositories {
         google()
         mavenCentral()
-
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
     }
 }
 
 allprojects {
     repositories {
         google()
         mavenCentral()
-
+        maven { url "https://jitpack.io" }
         maven {
             url "https://dl.cloudsmith.io/public/cometchat/cometchat-pro-android/maven/"
         }
-        maven { url "https://jitpack.io" }
-
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Wed Apr 12 22:04:46 IST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists