Upgraded few dependencies. * Upgraded kotlin to to make it compatible…

… with gradle . * Upgraded dagger to to make it compatible with gradle . * Removed from project since it is not maintained from 2020 and new gradle is not compatible with this library, so we have changed the it with binding.
kiwix · Nov 23, 2023 · 77a9a1a · 77a9a1a
1 parent a1e8ab8
commit 77a9a1a
Show file tree

Hide file tree

Showing 6 changed files with 130 additions and 127 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -12,7 +12,7 @@ repositories {
 
 dependencies {
   implementation("com.android.tools.build:gradle:8.1.3")
-  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0")
+  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20")
   implementation("org.jacoco:org.jacoco.core:0.8.8")
   implementation("org.jlleitschuh.gradle:ktlint-gradle:10.3.0")
   implementation("com.google.apis:google-api-services-androidpublisher:v3-rev20230406-2.0.0") {

diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt
@@ -138,23 +138,6 @@ object Libs {
   const val dagger_compiler: String = "com.google.dagger:dagger-compiler:" +
     Versions.com_google_dagger
 
-  /**
-   * https://github.com/JakeWharton/butterknife/
-   */
-  const val butterknife: String = "com.jakewharton:butterknife:" + Versions.com_jakewharton
-
-  /**
-   * https://github.com/JakeWharton/butterknife/
-   */
-  const val butterknife_compiler: String = "com.jakewharton:butterknife-compiler:" +
-    Versions.com_jakewharton
-
-  /**
-   * https://github.com/JakeWharton/butterknife/
-   */
-  const val butterknife_gradle_plugin: String = "com.jakewharton:butterknife-gradle-plugin:" +
-    Versions.com_jakewharton
-
   /**
    * https://developer.android.com/testing
    */

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -22,13 +22,13 @@ object Versions {
 
   const val com_squareup_okhttp3: String = "4.9.0"
 
-  const val org_jetbrains_kotlin: String = "1.7.0"
+  const val org_jetbrains_kotlin: String = "1.9.20"
 
   const val androidx_navigation: String = "2.5.3"
 
   const val navigation_ui_ktx: String = "2.4.1"
 
-  const val com_google_dagger: String = "2.42"
+  const val com_google_dagger: String = "2.48.1"
 
   const val com_jakewharton: String = "10.2.3"
 

diff --git a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
@@ -219,8 +219,6 @@ class AllProjectConfigurer {
       implementation(Libs.core_ktx)
       implementation(Libs.fragment_ktx)
       implementation(Libs.collection_ktx)
-      implementation(Libs.butterknife)
-      kapt(Libs.butterknife_compiler)
       implementation(Libs.fetch)
       implementation(Libs.rxandroid)
       implementation(Libs.rxjava)

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/base/BaseActivity.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/base/BaseActivity.kt
@@ -18,10 +18,7 @@
 package org.kiwix.kiwixmobile.core.base
 
 import android.os.Bundle
-import androidx.annotation.LayoutRes
 import androidx.appcompat.app.AppCompatActivity
-import butterknife.ButterKnife
-import butterknife.Unbinder
 import org.kiwix.kiwixmobile.core.CoreApp
 import org.kiwix.kiwixmobile.core.di.components.CoreComponent
 import org.kiwix.kiwixmobile.core.utils.LanguageUtils
@@ -33,23 +30,11 @@ abstract class BaseActivity : AppCompatActivity() {
   @Inject
   lateinit var sharedPreferenceUtil: SharedPreferenceUtil
 
-  private var unbinder: Unbinder? = null
-
   protected abstract fun injection(coreComponent: CoreComponent)
 
   override fun onCreate(savedInstanceState: Bundle?) {
     injection(CoreApp.coreComponent)
     super.onCreate(savedInstanceState)
     LanguageUtils.handleLocaleChange(this, sharedPreferenceUtil)
   }
-
-  override fun setContentView(@LayoutRes layoutResID: Int) {
-    super.setContentView(layoutResID)
-    unbinder = ButterKnife.bind(this)
-  }
-
-  override fun onDestroy() {
-    super.onDestroy()
-    unbinder?.unbind()
-  }
 }