Skip to content

Commit

Permalink
Migrate to kotlin 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
atick-faisal committed Jul 14, 2024
1 parent 64b6c68 commit 9878964
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,7 @@ lint/tmp/
*.hprof

# Google Services
google-services.json
google-services.json

# kotlin 2.0
.kotlin
4 changes: 1 addition & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ plugins {
id("androidx.navigation.safeargs.kotlin")
id("com.google.gms.google-services")
id("com.google.firebase.crashlytics")
id("org.jetbrains.kotlin.plugin.compose")
}

android {
Expand Down Expand Up @@ -64,9 +65,6 @@ android {
compose true
buildConfig true
}
composeOptions {
kotlinCompilerExtensionVersion compose_compiler_version
}
packagingOptions {
resources {
excludes += '/META-INF/{AL2.0,LGPL2.1}'
Expand Down
15 changes: 6 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ buildscript {
app_compat_version = "1.7.0"
coroutines_version = "1.8.1"
compose_version = "1.6.8"
compose_compiler_version = "1.5.14"
activity_compose_version = "1.9.0"
material_version = "1.12.0"
lifecycle_version = "2.8.3"
Expand All @@ -36,17 +35,15 @@ buildscript {
rx_android_ble_version = "1.18.1"
gson_version = "2.11.0"
}

dependencies {
classpath("com.google.dagger:hilt-android-gradle-plugin:$hilt_version")
classpath("androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version")
classpath("com.google.gms:google-services:$google_services_version")
classpath("com.google.firebase:firebase-crashlytics-gradle:$crashlytics_version")
}
}

plugins {
id("com.android.application") version "$agp_version" apply false
id("com.android.library") version "$agp_version" apply false
id("com.android.application") version "$agp_version" apply false
id("org.jetbrains.kotlin.android") version "$kotlin_version" apply false
id("com.google.dagger.hilt.android") version "$hilt_version" apply false
id("androidx.navigation.safeargs") version "$nav_version" apply false
id("com.google.gms.google-services") version "$google_services_version" apply false
id("com.google.firebase.crashlytics") version "$crashlytics_version" apply false
id("org.jetbrains.kotlin.plugin.compose") version "$kotlin_version" apply false
}

0 comments on commit 9878964

Please sign in to comment.