Update Project to support version catalog with Gradle 8

actionChooser/build.gradle.kts

@@ -0,0 +1,39 @@
+plugins {
+  alias(libs.plugins.android.library)
+  alias(libs.plugins.android.kotlin)
+}
+
+android {
+  namespace = "codes.mina_mikhail.action_chooser"
+  compileSdk = 34
+
+  defaultConfig {
+    minSdk = 21
+  }
+
+  buildTypes {
+    release {
+      isMinifyEnabled = true
+      proguardFiles (getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+    }
+  }
+
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+  }
+
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_17.toString()
+  }
+
+  buildFeatures {
+    viewBinding = true
+  }
+
+}
+
+dependencies {
+  implementation(libs.lifecycle)
+  implementation(libs.materialDesign)
+}

actionChooser/proguard-rules.pro

@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html

actionChooser/src/main/AndroidManifest.xml

@@ -1,6 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="codes.mina_mikhail.action_chooser">
-
-  <application />
-
-</manifest>
+<manifest/>

app/build.gradle.kts

@@ -1,36 +1,38 @@
 import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
 
 plugins {
-  id(Config.Plugins.androidApplication)
-  id(Config.Plugins.kotlinAndroid)
-  id(Config.Plugins.kotlinKapt)
-  id(Config.Plugins.navigationSafeArgs)
-  id(Config.Plugins.hilt)
+  alias(libs.plugins.android.application)
+  alias(libs.plugins.android.kotlin)
+  alias(libs.plugins.kotlin.ksp)
+  alias(libs.plugins.navigation.safeargs)
+  alias(libs.plugins.dagger.hilt.android)
+  alias(libs.plugins.googleServices)
 }
 
 android {
-  compileSdk = Config.AppConfig.compileSdkVersion
+  namespace = "com.mina_mikhail.base_mvvm"
+  compileSdk = 34
 
   defaultConfig {
-    applicationId = Config.AppConfig.appId
-    minSdk = Config.AppConfig.minSdkVersion
-    targetSdk = Config.AppConfig.compileSdkVersion
-    versionCode = Config.AppConfig.versionCode
-    versionName = Config.AppConfig.versionName
+    applicationId = "com.mina_mikhail.base_mvvm"
+    minSdk = 21
+    targetSdk = 34
+    versionCode = 1
+    versionName = "1.0"
 
     vectorDrawables.useSupportLibrary = true
     multiDexEnabled = true
-    testInstrumentationRunner = Config.AppConfig.testRunner
+    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
 
   buildTypes {
-    getByName("debug") {
-      resValue("string", "google_api_key", gradleLocalProperties(rootDir).getProperty("GOOGLE_API_KEY"))
+    debug{
+//       resValue("string", "google_api_key", gradleLocalProperties(rootDir).getProperty("GOOGLE_API_KEY"))
       manifestPlaceholders["appName"] = "@string/app_name_debug"
       manifestPlaceholders["appIcon"] = "@mipmap/ic_launcher_debug"
       manifestPlaceholders["appRoundIcon"] = "@mipmap/ic_launcher_debug_round"
 
-      buildConfigField("String", "API_BASE_URL", Config.Environments.debugBaseUrl)
+      buildConfigField("String", "API_BASE_URL", "http://url.to.server/api/")
     }
 
     signingConfigs {
@@ -42,56 +44,54 @@ android {
       }
     }
 
-    getByName("release") {
+    release{
       signingConfig = signingConfigs.getByName("releaseConfig")
 
       isMinifyEnabled = true
       isShrinkResources = true
 
-      resValue("string", "google_api_key", gradleLocalProperties(rootDir).getProperty("GOOGLE_API_KEY"))
+//      resValue("string", "google_api_key", gradleLocalProperties(rootDir).getProperty("GOOGLE_API_KEY"))
       manifestPlaceholders["appName"] = "@string/app_name"
       manifestPlaceholders["appIcon"] = "@mipmap/ic_launcher"
       manifestPlaceholders["appRoundIcon"] = "@mipmap/ic_launcher_round"
 
-      buildConfigField("String", "API_BASE_URL", Config.Environments.releaseBaseUrl)
+      buildConfigField("String", "API_BASE_URL", "http://url.to.server/api/")
     }
   }
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
 
   kotlinOptions {
-    jvmTarget = "11"
+    jvmTarget = JavaVersion.VERSION_17.toString()
   }
 
-  dataBinding {
-    isEnabled = true
+  buildFeatures {
+    buildConfig = true
+    dataBinding = true
   }
 }
 
 dependencies {
   implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
 
   // Networking
-  implementation(Libraries.retrofit)
-  implementation(Libraries.retrofitConverter)
-  implementation(Libraries.gson)
-  implementation(Libraries.interceptor)
-  implementation(Libraries.chuckLogging)
+  implementation(libs.bundles.networking)
 
   // Utils
-  implementation(Libraries.playServices)
-  implementation(Libraries.localization)
-  implementation(Libraries.multidex)
+
+  implementation(libs.playServices)
+  implementation(libs.localization)
+  implementation(libs.multidex)
 
   // Hilt
-  implementation(Libraries.hilt)
-  kapt(Libraries.hiltDaggerCompiler)
+  implementation(libs.hilt)
+  ksp(libs.hiltDaggerCompiler)
 
   // Project Modules
-  implementation(project(Config.Modules.domain))
-  implementation(project(Config.Modules.data))
-  implementation(project(Config.Modules.presentation))
+  implementation(projects.domain)
+  implementation(projects.data)
+  implementation(projects.presentation)
 }

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.mina_mikhail.base_mvvm">
+    xmlns:tools="http://schemas.android.com/tools">
 
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

app/src/main/java/com/mina_mikhail/base_mvvm/core/MyApplication.kt

@@ -2,14 +2,8 @@ package com.mina_mikhail.base_mvvm.core
 
 import android.content.Context
 import androidx.multidex.MultiDex
-import com.google.android.gms.common.GooglePlayServicesNotAvailableException
-import com.google.android.gms.common.GooglePlayServicesRepairableException
-import com.google.android.gms.security.ProviderInstaller
 import com.zeugmasolutions.localehelper.LocaleAwareApplication
 import dagger.hilt.android.HiltAndroidApp
-import java.security.KeyManagementException
-import java.security.NoSuchAlgorithmException
-import javax.net.ssl.SSLContext
 
 @HiltAndroidApp
 class MyApplication : LocaleAwareApplication() {
@@ -20,30 +14,4 @@ class MyApplication : LocaleAwareApplication() {
 
     MultiDex.install(this)
   }
-
-  override
-  fun onCreate() {
-    super.onCreate()
-
-    updateAndroidSecurityProvider()
-  }
-
-  private fun updateAndroidSecurityProvider() {
-    // To fix the following issue, when run app in cellular data, Apis not working
-    // javax.net.ssl.SSLHandshakeException: SSL handshake aborted: ssl=0x7edfc49e08: I/O error during system call, Connection reset by peer
-    try {
-      ProviderInstaller.installIfNeeded(applicationContext)
-      val sslContext: SSLContext = SSLContext.getInstance("TLSv1.2")
-      sslContext.init(null, null, null)
-      sslContext.createSSLEngine()
-    } catch (e: GooglePlayServicesRepairableException) {
-      e.printStackTrace()
-    } catch (e: GooglePlayServicesNotAvailableException) {
-      e.printStackTrace()
-    } catch (e: NoSuchAlgorithmException) {
-      e.printStackTrace()
-    } catch (e: KeyManagementException) {
-      e.printStackTrace()
-    }
-  }
 }

appTutorial/build.gradle.kts

@@ -0,0 +1,42 @@
+plugins {
+  alias(libs.plugins.android.library)
+  alias(libs.plugins.android.kotlin)
+  alias(libs.plugins.kotlin.ksp)
+}
+
+android {
+  namespace = "codes.mina_mikhail.tutorial"
+  compileSdk = 34
+
+  defaultConfig {
+    minSdk = 21
+  }
+
+  buildTypes {
+    release {
+      isMinifyEnabled = true
+      proguardFiles (getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+    }
+  }
+
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+  }
+
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_17.toString()
+  }
+
+
+  buildFeatures {
+    viewBinding = true
+  }
+}
+
+dependencies {
+  implementation(libs.lifecycle)
+  implementation(libs.materialDesign)
+  implementation(libs.coroutinesCore)
+  implementation(libs.coroutinesAndroid)
+}

appTutorial/proguard-rules.pro

@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html

appTutorial/src/main/AndroidManifest.xml

@@ -1,6 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="codes.mina_mikhail.app_tutorial">
-
-  <application />
-
-</manifest>
+<manifest/>

appTutorial/src/main/java/codes/mina_mikhail/app_tutorial/AppTutorialHelper.kt

@@ -18,6 +18,7 @@ import androidx.lifecycle.OnLifecycleEvent
 import androidx.lifecycle.coroutineScope
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
+import codes.mina_mikhail.tutorial.R
 import kotlinx.coroutines.delay
 
 class AppTutorialHelper private constructor(builder: Builder) : LifecycleObserver {

appTutorial/src/main/java/codes/mina_mikhail/app_tutorial/TutorialAdapter.kt

@@ -6,7 +6,8 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import codes.mina_mikhail.app_tutorial.TutorialAdapter.ImagesSliderViewHolder
-import codes.mina_mikhail.app_tutorial.databinding.ItemTutorialBinding
+import codes.mina_mikhail.tutorial.R
+import codes.mina_mikhail.tutorial.databinding.ItemTutorialBinding
 
 internal class TutorialAdapter(
   private var titleColor: Int,