Skip to content

Commit

Permalink
Updated Kotlin, dagger and test libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
ivancea committed Sep 20, 2024
1 parent 5b58509 commit e068f12
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 11 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.

19 changes: 12 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ plugins {
id 'com.google.gms.google-services'
id 'com.google.firebase.firebase-perf'
id 'com.google.firebase.crashlytics'
id 'com.google.devtools.ksp'
id 'org.jetbrains.kotlin.android'
id 'org.jetbrains.kotlin.kapt'
id 'org.jetbrains.kotlin.plugin.serialization'
id 'org.jetbrains.kotlin.plugin.compose'
id 'com.google.dagger.hilt.android'
id 'de.mannodermaus.android-junit5' version "1.8.2.1"
id 'de.mannodermaus.android-junit5'
}

android {
Expand Down Expand Up @@ -70,9 +71,8 @@ dependencies {
testImplementation "org.junit.jupiter:junit-jupiter:$jupiter_version"

implementation "com.google.dagger:hilt-android:$dagger_version"
kapt "com.google.dagger:hilt-android-compiler:$dagger_version"
annotationProcessor "com.google.dagger:hilt-android-compiler:$dagger_version"
kapt "androidx.hilt:hilt-compiler:$hilt_version"
ksp "com.google.dagger:hilt-android-compiler:$dagger_version"
ksp "androidx.hilt:hilt-compiler:$hilt_version"
implementation "androidx.hilt:hilt-navigation-compose:$hilt_version"

implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
Expand All @@ -90,10 +90,15 @@ dependencies {
androidTestImplementation "org.junit.jupiter:junit-jupiter-api:$jupiter_version"
androidTestImplementation "org.junit.jupiter:junit-jupiter-params:$jupiter_version"
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
androidTestImplementation 'de.mannodermaus.junit5:android-test-core:1.3.0'
androidTestRuntimeOnly 'de.mannodermaus.junit5:android-test-runner:1.3.0'

testImplementation "org.junit.jupiter:junit-jupiter-api:$jupiter_version"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$jupiter_version"
testImplementation "org.junit.jupiter:junit-jupiter-params:$jupiter_version"
}

configurations {
configureEach {
// To use only JUnit 5
exclude group: 'junit', module: 'junit'
}
}
8 changes: 5 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

buildscript {
ext {
kotlin_version = '1.8.10'
kotlin_version = '2.0.20'
compose_version = '1.6.8'
jupiter_version = '5.10.0'
dagger_version = '2.52'
Expand All @@ -19,6 +19,7 @@ buildscript {
classpath 'com.google.firebase:perf-plugin:1.4.2'
classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.2'
classpath "com.google.dagger:hilt-android-gradle-plugin:$dagger_version"
classpath "de.mannodermaus.gradle.plugins:android-junit5:1.11.0.0"

// To prevent Hilt dependency error
classpath "com.squareup:javapoet:1.13.0"
Expand All @@ -28,8 +29,9 @@ buildscript {

plugins {
id 'org.jetbrains.kotlin.android' version "${kotlin_version}" apply false
id 'org.jetbrains.kotlin.kapt' version "${kotlin_version}" apply false
id 'com.google.devtools.ksp' version '2.0.20-1.0.25' apply false
id 'org.jetbrains.kotlin.plugin.serialization' version "${kotlin_version}" apply false
id 'org.jetbrains.kotlin.plugin.compose' version "${kotlin_version}" apply false
id 'com.google.dagger.hilt.android' version '2.45' apply false
}

Expand All @@ -48,4 +50,4 @@ allprojects {

tasks.register('clean', Delete) {
delete rootProject.buildDir
}
}

0 comments on commit e068f12

Please sign in to comment.