diff options
| author | narko <6020peaks@gmail.com> | 2022-07-18 23:30:11 +0200 |
|---|---|---|
| committer | Antonio J. Roa-Valverde <antonio.roa@droidhood.org> | 2022-07-18 22:17:15 +0000 |
| commit | d77a32e6638210b036b89bc445f466209f6dbb5f (patch) | |
| tree | bed5a3dbf04682eb47555062cbeb5412a0957e12 | |
| parent | e6263ed070cd17e1988f41f2d712bce06ff0fbb1 (diff) | |
| download | Templates-d77a32e6638210b036b89bc445f466209f6dbb5f.tar.gz | |
Update Hilt and Gradle versions
These changes make the project compile in Android Studio Chipmunk (2021.2.1)
Test: Existing unit tests still pass.
Change-Id: I8d7557d8fc0ffede1f5e10c945db57a0a4f01485
| -rw-r--r-- | Host/app/build.gradle | 4 | ||||
| -rw-r--r-- | Host/app/src/main/java/com/android/car/templates/host/TemplatesHostApplication.java | 5 | ||||
| -rw-r--r-- | Host/build.gradle | 6 | ||||
| -rw-r--r-- | Host/gradle/wrapper/gradle-wrapper.properties | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/Host/app/build.gradle b/Host/app/build.gradle index 139ef01..34fd856 100644 --- a/Host/app/build.gradle +++ b/Host/app/build.gradle @@ -56,8 +56,8 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0") - implementation "com.google.dagger:hilt-android:2.40.5" - kapt 'com.google.dagger:hilt-compiler:2.40.5' + implementation "com.google.dagger:hilt-android:2.42" + kapt 'com.google.dagger:hilt-compiler:2.42' runtimeOnly 'androidx.asynclayoutinflater:asynclayoutinflater:1.0.0' } diff --git a/Host/app/src/main/java/com/android/car/templates/host/TemplatesHostApplication.java b/Host/app/src/main/java/com/android/car/templates/host/TemplatesHostApplication.java index debca84..c7cf7e4 100644 --- a/Host/app/src/main/java/com/android/car/templates/host/TemplatesHostApplication.java +++ b/Host/app/src/main/java/com/android/car/templates/host/TemplatesHostApplication.java @@ -16,8 +16,9 @@ package com.android.car.templates.host; import android.app.Application; + import dagger.hilt.android.HiltAndroidApp; /** This application class mark the whole application as Hilt application */ -@HiltAndroidApp(Application.class) -public class TemplatesHostApplication extends Hilt_TemplatesHostApplication {} +@HiltAndroidApp +public class TemplatesHostApplication extends Application {} diff --git a/Host/build.gradle b/Host/build.gradle index 3ec9f3b..6701560 100644 --- a/Host/build.gradle +++ b/Host/build.gradle @@ -2,14 +2,14 @@ buildscript { dependencies { - classpath 'com.google.dagger:hilt-android-gradle-plugin:2.38.1' + classpath 'com.google.dagger:hilt-android-gradle-plugin:2.42' classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' } } plugins { - id 'com.android.application' version '7.2.0-alpha06' apply false - id 'com.android.library' version '7.2.0-alpha06' apply false + id 'com.android.application' version '7.2.1' apply false + id 'com.android.library' version '7.2.1' apply false id 'org.jetbrains.kotlin.android' version '1.6.0' apply false } diff --git a/Host/gradle/wrapper/gradle-wrapper.properties b/Host/gradle/wrapper/gradle-wrapper.properties index d681304..d177b14 100644 --- a/Host/gradle/wrapper/gradle-wrapper.properties +++ b/Host/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Feb 08 16:11:22 PST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME |