Skip to content

Commit

Permalink
Upgrade gradle and dependencies
Browse files Browse the repository at this point in the history
Move ksp plugin to root build.gradle and apply in module.
google/dagger#3965
  • Loading branch information
lneugebauer committed Oct 1, 2023
1 parent a4563ff commit 27a1927
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

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

16 changes: 8 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'com.android.application'
id 'com.google.devtools.ksp' version '1.8.21-1.0.11'
id 'com.google.devtools.ksp'
id 'com.mikepenz.aboutlibraries.plugin'
id 'dagger.hilt.android.plugin'
id 'kotlin-android'
Expand Down Expand Up @@ -132,17 +132,17 @@ dependencies {

coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'

implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.core:core-ktx:1.12.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1"
implementation "androidx.navigation:navigation-compose:2.7.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2"
implementation "androidx.navigation:navigation-compose:2.7.3"
implementation 'androidx.hilt:hilt-navigation-compose:1.0.0'
implementation 'androidx.activity:activity-compose:1.7.2'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
implementation 'androidx.datastore:datastore-preferences:1.0.0'
implementation 'androidx.core:core-splashscreen:1.0.1'

implementation platform('androidx.compose:compose-bom:2023.08.00')
implementation platform('androidx.compose:compose-bom:2023.09.02')
implementation 'androidx.compose.ui:ui'
implementation 'androidx.compose.ui:ui-tooling-preview'
implementation 'androidx.compose.material:material'
Expand Down Expand Up @@ -179,12 +179,12 @@ dependencies {
implementation "com.mikepenz:aboutlibraries-core:$aboutlibs_version"
implementation "com.mikepenz:aboutlibraries-compose:$aboutlibs_version"

implementation 'io.github.dokar3:chiptextfield:0.4.9'
implementation 'io.github.dokar3:chiptextfield:0.6.1'

testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.5.0'
androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.5.2'

debugImplementation 'androidx.compose.ui:ui-tooling'
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
Expand Down
16 changes: 9 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext {
aboutlibs_version = '10.8.3'
aboutlibs_version = '10.9.1'
accompanist_version = '0.30.1'
compose_compiler_version = '1.4.7'
compose_destinations_version = '1.9.52'
compose_settings_version = '0.27.0'
hilt_version = '2.46.1'
kotlin_version = '1.8.21'
compose_compiler_version = '1.5.3'
compose_destinations_version = '1.9.53'
compose_settings_version = '1.0.2'
hilt_version = '2.48'
kotlin_version = '1.9.10'
ksp_version = '1.0.13'
retrofit_version = '2.9.0'
store_version = '4.0.5'
}
Expand All @@ -18,7 +19,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.1.1'
classpath 'com.android.tools.build:gradle:8.1.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"

Expand All @@ -28,6 +29,7 @@ buildscript {
}

plugins {
id 'com.google.devtools.ksp' version "$kotlin_version-$ksp_version"
id "com.mikepenz.aboutlibraries.plugin" version "$aboutlibs_version"
}

Expand Down
4 changes: 3 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,6 @@ android.enableJetifier=false
kotlin.code.style=official
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=true
android.nonFinalResIds=true
android.nonFinalResIds=true
# https://youtrack.jetbrains.com/issue/KT-58226
kapt.use.jvm.ir=false

0 comments on commit 27a1927

Please sign in to comment.