Gradle files improvements

NordicSemiconductor · Oct 6, 2022 · 01ae5ba · 01ae5ba
1 parent 14e3ca0
commit 01ae5ba
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 37 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-parcelize'
     id 'kotlin-kapt'
-    id 'dagger.hilt.android.plugin'
+    id 'com.google.dagger.hilt.android'
 }
 apply from: rootProject.file("gradle/git-tag-version.gradle")
 
@@ -43,16 +43,19 @@ android {
         }
     }
 
-    buildFeatures {
-        compose true
-    }
     composeOptions {
         kotlinCompilerExtensionVersion compose_compiler_version
     }
-    hilt {
-        enableExperimentalClasspathAggregation = true
+    buildFeatures {
+        compose true
     }
 }
+hilt {
+    enableAggregatingTask = true
+}
+kapt {
+    correctErrorTypes true
+}
 
 dependencies {
     implementation project(":lib_analytics")
@@ -67,5 +70,5 @@ dependencies {
     implementation "androidx.activity:activity-compose:1.6.0"
 
     implementation "com.google.dagger:hilt-android:$dagger_version"
-    kapt "com.google.dagger:hilt-compiler:$dagger_version"
+    kapt "com.google.dagger:hilt-android-compiler:$dagger_version"
 }
diff --git a/lib_analytics/build.gradle b/lib_analytics/build.gradle
@@ -1,7 +1,9 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'dagger.hilt.android.plugin'
-apply plugin: 'kotlin-kapt'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+    id 'com.google.dagger.hilt.android'
+}
 
 android {
     namespace 'no.nordicsemi.android.dfu.analytics'
@@ -20,15 +22,17 @@ android {
             consumerProguardFiles 'analytics-proguard-rules.pro'
         }
     }
-
-    hilt {
-        enableExperimentalClasspathAggregation = true
-    }
+}
+hilt {
+    enableAggregatingTask = true
+}
+kapt {
+    correctErrorTypes true
 }
 
 dependencies {
     implementation "no.nordicsemi.android.common:analytics:$nordic_common_version"
 
     implementation "com.google.dagger:hilt-android:$dagger_version"
-    kapt "com.google.dagger:hilt-compiler:$dagger_version"
+    kapt "com.google.dagger:hilt-android-compiler:$dagger_version"
 }
diff --git a/lib_dfu/build.gradle b/lib_dfu/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'com.android.library'
+plugins {
+    id 'com.android.library'
+}
 apply from: rootProject.file("gradle/git-tag-version.gradle")
 
 android {

diff --git a/lib_storage/build.gradle b/lib_storage/build.gradle
@@ -1,8 +1,9 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'dagger.hilt.android.plugin'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin-parcelize'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+    id 'com.google.dagger.hilt.android'
+}
 
 android {
     namespace 'no.nordicsemi.android.dfu.storage'
@@ -30,15 +31,17 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion compose_compiler_version
     }
-
-    hilt {
-        enableExperimentalClasspathAggregation = true
-    }
+}
+hilt {
+    enableAggregatingTask = true
+}
+kapt {
+    correctErrorTypes true
 }
 
 dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
 
     implementation "com.google.dagger:hilt-android:$dagger_version"
-    kapt "com.google.dagger:hilt-compiler:$dagger_version"
+    kapt "com.google.dagger:hilt-android-compiler:$dagger_version"
 }
diff --git a/profile_dfu/build.gradle b/profile_dfu/build.gradle
@@ -1,8 +1,10 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'dagger.hilt.android.plugin'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin-parcelize'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-parcelize'
+    id 'kotlin-kapt'
+    id 'com.google.dagger.hilt.android'
+}
 
 android {
     namespace 'no.nordicsemi.android.dfu.profile'
@@ -34,10 +36,12 @@ android {
     buildFeatures {
         compose true
     }
-
-    hilt {
-        enableExperimentalClasspathAggregation = true
-    }
+}
+hilt {
+    enableAggregatingTask = true
+}
+kapt {
+    correctErrorTypes true
 }
 
 dependencies {
@@ -63,6 +67,6 @@ dependencies {
     implementation "androidx.datastore:datastore-preferences:1.0.0"
 
     implementation "com.google.dagger:hilt-android:$dagger_version"
-    kapt "com.google.dagger:hilt-compiler:$dagger_version"
+    kapt "com.google.dagger:hilt-android-compiler:$dagger_version"
     implementation "androidx.hilt:hilt-navigation-compose:1.0.0"
 }