Merge pull request #41 from webex/3.5.0-GA

Fixed build.gradle and other gradle related version upgrades/dependencies

Author: lasharm2

app/build.gradle

@@ -63,7 +63,7 @@ android {
 }
 
 dependencies {
-    mplementation 'com.ciscowebex:androidsdk:3.5.0@aar'
+    implementation 'com.ciscowebex:androidsdk:3.5.0@aar'
 
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation Dependencies.kotlinStdLib
@@ -101,5 +101,6 @@ dependencies {
     implementation Dependencies.firebaseAnalytics
     implementation Dependencies.firebaseCrashlytics
     implementation Dependencies.gson
+    implementation Dependencies.glide
 
 }

build.gradle

@@ -6,15 +6,15 @@ buildscript {
     ext.dokka_version = Versions.dokka
     repositories {
         google()
-        jcenter()
+//        jcenter()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:7.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
         classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${Versions.dokka}"
-        classpath 'com.google.gms:google-services:4.3.4'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2'
+        classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -23,7 +23,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+//        jcenter()
         mavenCentral()
         mavenLocal()
         maven {

buildSrc/src/main/java/com/ciscowebex/androidsdk/build/Dependencies.kt

@@ -1,13 +1,13 @@
 package com.ciscowebex.androidsdk.build
 
 object Versions {
-    const val kotlin = "1.3.72"
-    const val koin= "2.1.3"
+    const val kotlin = "1.6.10"
+    const val koin= "2.2.3"
 
     const val ndkVersion = "21.3.6528147"
-    const val buildTools = "29.0.3"
+    const val buildTools = "30.0.3"
 
-    const val compileSdk = 29
+    const val compileSdk = 30
     const val targetSdk = 29
     const val minSdk = 24
 
@@ -17,8 +17,8 @@ object Versions {
 
 object Dependencies {
     const val kotlinStdLib = "org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}"
-    const val koin = "org.koin:koin-android:${Versions.koin}"
-    const val koinViewModel = "org.koin:koin-android-viewmodel:${Versions.koin}"
+    const val koin = "io.insert-koin:koin-core:${Versions.koin}"
+    const val koinViewModel = "io.insert-koin:koin-androidx-viewmodel:${Versions.koin}"
     const val rxjava = "io.reactivex.rxjava2:rxjava:2.2.11"
     const val rxandroid = "io.reactivex.rxjava2:rxandroid:2.1.1"
     const val rxkotlin = "io.reactivex.rxjava2:rxkotlin:2.4.0"
@@ -40,6 +40,7 @@ object Dependencies {
     const val firebaseAnalytics = "com.google.firebase:firebase-analytics-ktx"
     const val firebaseCrashlytics = "com.google.firebase:firebase-crashlytics-ktx"
     const val gson = "com.google.code.gson:gson:2.8.6"
+    const val glide = "com.github.bumptech.glide:glide:4.12.0"
 
     object Test {
         const val junit = "junit:junit:4.12"
@@ -51,6 +52,6 @@ object Dependencies {
         const val fragmentScenerio = "androidx.fragment:fragment-testing:1.2.5"
         const val rules = "androidx.test:rules:1.3.0"
         const val testExt = "androidx.test:core-ktx:1.3.0"
-        const val mockk = "io.mockk:mockk-android:1.10.6"
+        const val mockk = "io.mockk:mockk-android:1.12.1"
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip