diff --git a/app/build.gradle b/app/build.gradle index 622c273..4463bc3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,14 +1,14 @@ plugins { - id "kotlin-android" - id "kotlin-kapt" - id "com.android.application" - id "androidx.navigation.safeargs.kotlin" - id "dagger.hilt.android.plugin" - id "org.jetbrains.kotlin.plugin.serialization" - id "com.google.gms.google-services" - id "com.google.firebase.crashlytics" - id "com.guardsquare.appsweep" version "$appsweep_version" - id "com.google.protobuf" version "$protobuf_plugin_version" + id("kotlin-android") + id("kotlin-kapt") + id("com.android.application") + id("androidx.navigation.safeargs.kotlin") + id("dagger.hilt.android.plugin") + id("org.jetbrains.kotlin.plugin.serialization") + id("com.google.gms.google-services") + id("com.google.firebase.crashlytics") + id("com.guardsquare.appsweep") version "$appsweep_version" + id("com.google.protobuf") version "$protobuf_plugin_version" } android { @@ -100,91 +100,91 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { } dependencies { - coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$desugar_version" + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:$desugar_version") - implementation "com.google.android.material:material:$material_version" + implementation("com.google.android.material:material:$material_version") - implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" - implementation "androidx.navigation:navigation-runtime-ktx:$nav_version" - implementation "androidx.navigation:navigation-ui-ktx:$nav_version" + implementation("androidx.navigation:navigation-fragment-ktx:$nav_version") + implementation("androidx.navigation:navigation-runtime-ktx:$nav_version") + implementation("androidx.navigation:navigation-ui-ktx:$nav_version") - implementation "androidx.core:core-ktx:$core_ktx_version" + implementation("androidx.core:core-ktx:$core_ktx_version") - implementation "androidx.appcompat:appcompat:$appcompat_version" + implementation("androidx.appcompat:appcompat:$appcompat_version") - implementation "androidx.constraintlayout:constraintlayout:$contraint_layout_version" + implementation("androidx.constraintlayout:constraintlayout:$contraint_layout_version") - implementation "androidx.swiperefreshlayout:swiperefreshlayout:$swipe_refresh_layout_version" + implementation("androidx.swiperefreshlayout:swiperefreshlayout:$swipe_refresh_layout_version") - implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" + implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version") + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version") - implementation "com.google.dagger:hilt-android:$hilt_version" - kapt "com.google.dagger:hilt-compiler:$hilt_version" - kaptTest "com.google.dagger:hilt-android-compiler:$hilt_version" - testImplementation "com.google.dagger:hilt-android-testing:$hilt_version" + implementation("com.google.dagger:hilt-android:$hilt_version") + kapt("com.google.dagger:hilt-compiler:$hilt_version") + kaptTest("com.google.dagger:hilt-android-compiler:$hilt_version") + testImplementation("com.google.dagger:hilt-android-testing:$hilt_version") - implementation "com.squareup.retrofit2:retrofit:$retrofit_version" + implementation("com.squareup.retrofit2:retrofit:$retrofit_version") - implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:$retrofit_kotlinx_serialization_version" + implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:$retrofit_kotlinx_serialization_version") implementation platform("com.squareup.okhttp3:okhttp-bom:$okhttp_version") - implementation "com.squareup.okhttp3:okhttp" - debugImplementation "com.squareup.okhttp3:logging-interceptor" + implementation("com.squareup.okhttp3:okhttp") + debugImplementation("com.squareup.okhttp3:logging-interceptor") - implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinx_serialization_version" + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinx_serialization_version") - implementation "com.jakewharton.timber:timber:$timber_version" + implementation("com.jakewharton.timber:timber:$timber_version") - implementation "androidx.paging:paging-runtime-ktx:$paging_version" - testImplementation "androidx.paging:paging-common-ktx:$paging_version" + implementation("androidx.paging:paging-runtime-ktx:$paging_version") + testImplementation("androidx.paging:paging-common-ktx:$paging_version") - implementation "androidx.room:room-runtime:$room_version" - implementation "androidx.room:room-ktx:$room_version" - implementation "androidx.room:room-paging:$room_version" - kapt "androidx.room:room-compiler:$room_version" - testImplementation "androidx.room:room-testing:$room_version" + implementation("androidx.room:room-runtime:$room_version") + implementation("androidx.room:room-ktx:$room_version") + implementation("androidx.room:room-paging:$room_version") + kapt("androidx.room:room-compiler:$room_version") + testImplementation("androidx.room:room-testing:$room_version") - implementation "org.jetbrains.kotlinx:kotlinx-datetime:$kotlinx_datetime_version" + implementation("org.jetbrains.kotlinx:kotlinx-datetime:$kotlinx_datetime_version") - implementation "com.github.bumptech.glide:glide:$glide_version" - implementation "com.github.bumptech.glide:okhttp3-integration:$glide_version" + implementation("com.github.bumptech.glide:glide:$glide_version") + implementation("com.github.bumptech.glide:okhttp3-integration:$glide_version") implementation("com.github.bumptech.glide:recyclerview-integration:$glide_version") { // Excludes the support library because it's already included by Glide. transitive = false } - kapt "com.github.bumptech.glide:compiler:$glide_version" + kapt("com.github.bumptech.glide:compiler:$glide_version") - implementation "com.github.kirich1409:viewbindingpropertydelegate-noreflection:$view_binding_delegate_version" + implementation("com.github.kirich1409:viewbindingpropertydelegate-noreflection:$view_binding_delegate_version") - implementation "androidx.datastore:datastore-preferences:$datastore_version" - implementation "androidx.datastore:datastore:$datastore_version" + implementation("androidx.datastore:datastore-preferences:$datastore_version") + implementation("androidx.datastore:datastore:$datastore_version") - implementation "com.google.protobuf:protobuf-javalite:$protobuf_version" + implementation("com.google.protobuf:protobuf-javalite:$protobuf_version") - implementation "androidx.security:security-crypto:$security_version" + implementation("androidx.security:security-crypto:$security_version") implementation platform("com.google.firebase:firebase-bom:$firebase_version") - implementation "com.google.firebase:firebase-analytics-ktx" - implementation "com.google.firebase:firebase-crashlytics-ktx" + implementation("com.google.firebase:firebase-analytics-ktx") + implementation("com.google.firebase:firebase-crashlytics-ktx") - testImplementation "junit:junit:$junit_version" + testImplementation("junit:junit:$junit_version") - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" - testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version" + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version") + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version") - testImplementation "org.robolectric:robolectric:$robolectric_version" + testImplementation("org.robolectric:robolectric:$robolectric_version") - testImplementation "androidx.test.ext:junit-ktx:$junit_ktx_version" + testImplementation("androidx.test.ext:junit-ktx:$junit_ktx_version") - testImplementation "com.google.truth:truth:$truth_version" + testImplementation("com.google.truth:truth:$truth_version") - testImplementation "io.mockk:mockk:$mockk_version" + testImplementation("io.mockk:mockk:$mockk_version") - debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanary_version" + debugImplementation("com.squareup.leakcanary:leakcanary-android:$leakcanary_version") // https://github.com/ChuckerTeam/chucker/releases - debugImplementation "com.github.chuckerteam.chucker:library:$chucker_version" + debugImplementation("com.github.chuckerteam.chucker:library:$chucker_version") } protobuf { diff --git a/build.gradle b/build.gradle index 6fbc4c8..576e867 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,8 @@ buildscript { - apply from: "./gradle/versions.gradle" + apply { + from "./gradle/versions.gradle" + } repositories { google() @@ -8,19 +10,19 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:$android_plugin_version" - classpath "com.google.gms:google-services:$google_services_version" - classpath "com.google.firebase:firebase-crashlytics-gradle:$crashlytics_version" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" - classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version" - classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version" + classpath("com.android.tools.build:gradle:$android_plugin_version") + classpath("com.google.gms:google-services:$google_services_version") + classpath("com.google.firebase:firebase-crashlytics-gradle:$crashlytics_version") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version") + classpath("org.jetbrains.kotlin:kotlin-serialization:$kotlin_version") + classpath("androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version") + classpath("com.google.dagger:hilt-android-gradle-plugin:$hilt_version") } } plugins { - id "org.sonarqube" version "$sonarqube_version" - id "nl.neotech.plugin.rootcoverage" version "$root_coverage_version" + id("org.sonarqube") version "$sonarqube_version" + id("nl.neotech.plugin.rootcoverage") version "$root_coverage_version" } task clean(type: Delete) { diff --git a/settings.gradle b/settings.gradle index 6a044a9..944ee62 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,4 +6,4 @@ dependencyResolutionManagement { } } rootProject.name = "Mealient" -include ":app" +include(":app")