Skip to content

Commit

Permalink
Version 6.0.1.5 done
Browse files Browse the repository at this point in the history
chore: Upgrade dependencies and migrate to Kotlin 2.0

This commit upgrades several dependencies, including:

- AGP to 8.6.
0-rc01
- Coil to 2.7.0
- Coil Compose to 2.7.0
- Hilt to 2.52
- JetLime to 2.2.1
- Lottie Compose to 6.5.0
- Material 3 to
 1.3.0-beta05
- Navigation Compose to 2.8.0-beta07
- Paging Compose to 3.3.2
- Paging Runtime Ktx to 3.3.2

It also migrates the project to Kotlin 2.0 and updates the compile and target SDK versions to 35.

Additionally, the commit disables minification in release builds for chat, core, and syllabus modules to address potential issues.
  • Loading branch information
aiyu-ayaan committed Aug 10, 2024
1 parent 1520d2b commit a38e300
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 34 deletions.
1 change: 1 addition & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions bitapp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ plugins {

android {
namespace = "com.atech.bit"
compileSdk = 34
compileSdk = 35

defaultConfig {
applicationId = "com.atech.bit"
minSdk = 24
targetSdk = 34
versionCode = 82
versionName = "6.0.1.4.6"
targetSdk = 35
versionCode = 83
versionName = "6.0.1.5"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

Expand Down
4 changes: 2 additions & 2 deletions chat/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ plugins {

android {
namespace = "com.atech.chat"
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 24
Expand All @@ -28,7 +28,7 @@ android {

buildTypes {
release {
isMinifyEnabled = true
isMinifyEnabled = false
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
Expand Down
4 changes: 2 additions & 2 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ plugins {

android {
namespace = "com.atech.core"
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 24
Expand All @@ -42,7 +42,7 @@ android {

buildTypes {
release {
isMinifyEnabled = true
isMinifyEnabled = false
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
Expand Down
25 changes: 13 additions & 12 deletions core/src/main/java/com/atech/core/datasource/room/BitDatabase.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ package com.atech.core.datasource.room

import androidx.room.Database
import androidx.room.RoomDatabase
import androidx.room.RoomDatabase.Callback
import androidx.room.TypeConverters
import androidx.sqlite.db.SupportSQLiteDatabase
import com.atech.core.datasource.room.attendance.AttendanceDao
Expand Down Expand Up @@ -54,27 +55,27 @@ abstract class BitDatabase : RoomDatabase() {
companion object {
const val DATABASE_NAME = "bit_database"
}
}

class SyllabusCallback @Inject constructor(
private val database: Provider<BitDatabase>,
@BitAppScope private val appScope: CoroutineScope
) : Callback() {
class SyllabusCallback @Inject constructor(
private val database: Provider<BitDatabase>,
@BitAppScope private val appScope: CoroutineScope
) : Callback() {

override fun onCreate(db: SupportSQLiteDatabase) {
super.onCreate(db)
override fun onCreate(db: SupportSQLiteDatabase) {
super.onCreate(db)
// val dao = database.get().attendanceDao()
val syllabusDao = database.get().syllabusDao()
val syllabusDao = database.get().syllabusDao()
// appScope.launch {
// (1..100).toList().map { AttendanceModel("Subject $it") }
// .onEach {
// dao.insert(it)
// }
// }
appScope.launch {
val syllabus = SyllabusList.syllabus
syllabusDao.insertAll(syllabus)
syllabusDao.updateIsChecked()
}
appScope.launch {
val syllabus = SyllabusList.syllabus
syllabusDao.insertAll(syllabus)
syllabusDao.updateIsChecked()
}
}
}
3 changes: 2 additions & 1 deletion core/src/main/java/com/atech/core/module/RoomModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ package com.atech.core.module
import android.content.Context
import androidx.room.Room
import com.atech.core.datasource.room.BitDatabase
import com.atech.core.datasource.room.SyllabusCallback
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
Expand All @@ -25,7 +26,7 @@ object RoomModule {
@Provides
fun getDatabase(
@ApplicationContext context: Context,
callback: BitDatabase.SyllabusCallback
callback: SyllabusCallback
): BitDatabase =
Room.databaseBuilder(
context,
Expand Down
20 changes: 10 additions & 10 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
[versions]
accompanistPermissions = "0.34.0"
agp = "8.3.2"
agp = "8.6.0-rc01"
appUpdateKtx = "2.1.0"
coil = "2.5.0"
coilCompose = "2.6.0"
coilSvg = "2.6.0"
coilCompose = "2.7.0"
coilSvg = "2.7.0"
composeMarkdown = "0.3.7"
composeVideo = "1.2.0"
coreSplashscreen = "1.0.1"
datastorePreferences = "1.1.1"
hiltAndroid = "2.51.1"
hiltAndroid = "2.52"
hiltCompiler = "1.2.0"
hiltNavigationCompose = "1.2.0"
jetlime = "2.2.0"
jetlime = "2.2.1"
kotlin = "2.0.0"
coreKtx = "1.13.1"
lifecycleRuntimeKtx = "2.8.4"
activityCompose = "1.9.1"
composeBom = "2024.06.00"
logbackClassic = "1.2.3"
loggingInterceptorVersion = "4.12.0"
lottieCompose = "6.4.1"
lottieCompose = "6.5.0"
#noinspection GradleDependency
material3 = "1.3.0-beta02"
material3 = "1.3.0-beta05"
markdownviewAndroid = "1.1.1"
materialIconsExtended = "1.6.8"
media3Exoplayer = "1.4.0"
media3Session = "1.4.0"
media3UiVersion = "1.4.0"
pagingCompose = "3.3.1"
pagingRuntimeKtx = "3.3.1"
pagingCompose = "3.3.2"
pagingRuntimeKtx = "3.3.2"
richtextCommonmark = "0.20.0"
roomCompilerVersion = "2.6.1"
roomCompiler = "2.6.1"
roomKtx = "2.6.1"
roomPaging = "2.6.1"
roomRuntime = "2.6.1"
navigationCompose = "2.8.0-beta06"
navigationCompose = "2.8.0-beta07"
appcompat = "1.7.0"
material = "1.12.0"
gson-version = "2.11.0"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
#Sat Dec 16 21:47:50 IST 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions syllabus/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ plugins {

android {
namespace = "com.atech.syllabus"
compileSdk = 34
compileSdk = 35

defaultConfig {
minSdk = 24
Expand All @@ -36,7 +36,7 @@ android {

buildTypes {
release {
isMinifyEnabled = true
isMinifyEnabled = false
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
Expand Down

0 comments on commit a38e300

Please sign in to comment.