From 12d4498c0e98bfaf64e1168576606c7de55a4f5e Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Sat, 18 Jun 2022 09:39:18 +0200 Subject: [PATCH 01/13] Remove Flipper --- app/build.gradle | 6 --- .../debug/java/gq/kirmanak/mealient/App.kt | 18 ------- .../gq/kirmanak/mealient/di/DebugModule.kt | 52 ------------------- gradle/versions.gradle | 5 -- 4 files changed, 81 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c3cdf07..bc87e05 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -181,12 +181,6 @@ dependencies { testImplementation "io.mockk:mockk:$mockk_version" - debugImplementation "com.facebook.flipper:flipper:$flipper_version" - debugImplementation "com.facebook.flipper:flipper-leakcanary2-plugin:$flipper_version" - debugImplementation "com.facebook.flipper:flipper-network-plugin:$flipper_version" - - debugImplementation "com.facebook.soloader:soloader:$soloader_version" - debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanary_version" // https://github.com/ChuckerTeam/chucker/releases diff --git a/app/src/debug/java/gq/kirmanak/mealient/App.kt b/app/src/debug/java/gq/kirmanak/mealient/App.kt index eb4f24f..a1575c6 100644 --- a/app/src/debug/java/gq/kirmanak/mealient/App.kt +++ b/app/src/debug/java/gq/kirmanak/mealient/App.kt @@ -1,33 +1,15 @@ package gq.kirmanak.mealient import android.app.Application -import com.facebook.flipper.android.AndroidFlipperClient -import com.facebook.flipper.android.utils.FlipperUtils -import com.facebook.flipper.core.FlipperPlugin -import com.facebook.soloader.SoLoader import dagger.hilt.android.HiltAndroidApp import timber.log.Timber -import javax.inject.Inject @HiltAndroidApp class App : Application() { - // Use @JvmSuppressWildcards because otherwise dagger can't inject it (https://stackoverflow.com/a/43149382) - @Inject - lateinit var flipperPlugins: Set<@JvmSuppressWildcards FlipperPlugin> override fun onCreate() { super.onCreate() Timber.plant(Timber.DebugTree()) Timber.v("onCreate() called") - setupFlipper() - } - - private fun setupFlipper() { - if (FlipperUtils.shouldEnableFlipper(this)) { - SoLoader.init(this, false) - val flipperClient = AndroidFlipperClient.getInstance(this) - for (flipperPlugin in flipperPlugins) flipperClient.addPlugin(flipperPlugin) - flipperClient.start() - } } } diff --git a/app/src/debug/java/gq/kirmanak/mealient/di/DebugModule.kt b/app/src/debug/java/gq/kirmanak/mealient/di/DebugModule.kt index 680e2a4..126ff17 100644 --- a/app/src/debug/java/gq/kirmanak/mealient/di/DebugModule.kt +++ b/app/src/debug/java/gq/kirmanak/mealient/di/DebugModule.kt @@ -4,15 +4,6 @@ import android.content.Context import com.chuckerteam.chucker.api.ChuckerCollector import com.chuckerteam.chucker.api.ChuckerInterceptor import com.chuckerteam.chucker.api.RetentionManager -import com.facebook.flipper.core.FlipperPlugin -import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin -import com.facebook.flipper.plugins.inspector.DescriptorMapping -import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin -import com.facebook.flipper.plugins.leakcanary2.FlipperLeakListener -import com.facebook.flipper.plugins.leakcanary2.LeakCanary2FlipperPlugin -import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor -import com.facebook.flipper.plugins.network.NetworkFlipperPlugin -import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin import dagger.Module import dagger.Provides import dagger.hilt.InstallIn @@ -20,7 +11,6 @@ import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent import dagger.multibindings.IntoSet import gq.kirmanak.mealient.BuildConfig -import leakcanary.LeakCanary import okhttp3.Interceptor import okhttp3.logging.HttpLoggingInterceptor import timber.log.Timber @@ -55,46 +45,4 @@ object DebugModule { .alwaysReadResponseBody(true) .build() } - - @Provides - @Singleton - @IntoSet - fun provideFlipperInterceptor(networkFlipperPlugin: NetworkFlipperPlugin): Interceptor { - return FlipperOkhttpInterceptor(networkFlipperPlugin) - } - - @Provides - @Singleton - fun networkFlipperPlugin() = NetworkFlipperPlugin() - - @Provides - @Singleton - @IntoSet - fun bindNetworkFlipperPlugin(plugin: NetworkFlipperPlugin): FlipperPlugin = plugin - - @Provides - @Singleton - @IntoSet - fun sharedPreferencesPlugin(@ApplicationContext context: Context): FlipperPlugin = - SharedPreferencesFlipperPlugin(context) - - @Provides - @Singleton - @IntoSet - fun leakCanaryPlugin(): FlipperPlugin { - LeakCanary.config = LeakCanary.config.copy(onHeapAnalyzedListener = FlipperLeakListener()) - return LeakCanary2FlipperPlugin() - } - - @Provides - @Singleton - @IntoSet - fun databasesPlugin(@ApplicationContext context: Context): FlipperPlugin = - DatabasesFlipperPlugin(context) - - @Provides - @Singleton - @IntoSet - fun inspectorPlugin(@ApplicationContext context: Context): FlipperPlugin = - InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()) } diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 95e1eac..c2dcf25 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -107,11 +107,6 @@ ext { // https://mockk.io/ mockk_version = "1.12.4" - // https://github.com/facebook/flipper/releases - flipper_version = "0.149.0" - // https://github.com/facebook/SoLoader/releases - soloader_version = "0.10.3" - // https://github.com/square/leakcanary/releases leakcanary_version = "2.9.1" From cdcad620ad407a42a8d752375c0424a19a3f6a2c Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Sat, 9 Jul 2022 10:08:03 +0200 Subject: [PATCH 02/13] Update versions of dependencies --- gradle/versions.gradle | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gradle/versions.gradle b/gradle/versions.gradle index c2dcf25..dcfdee8 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -1,11 +1,11 @@ ext { // https://github.com/protocolbuffers/protobuf/releases - protobuf_version = "3.21.1" + protobuf_version = "3.21.2" // https://github.com/google/protobuf-gradle-plugin/releases - protobuf_plugin_version = "0.8.18" + protobuf_plugin_version = "0.8.19" // https://developer.android.com/jetpack/androidx/releases/navigation - nav_version = "2.4.2" + nav_version = "2.5.0" // https://dagger.dev/hilt/gradle-setup hilt_version = "2.42" @@ -17,19 +17,19 @@ ext { android_plugin_version = "7.2.1" // https://developers.google.com/android/guides/google-services-plugin - google_services_version = "4.3.10" + google_services_version = "4.3.13" // https://mvnrepository.com/artifact/com.google.firebase/firebase-crashlytics-gradle - crashlytics_version = "2.9.0" + crashlytics_version = "2.9.1" // https://plugins.gradle.org/plugin/org.sonarqube sonarqube_version = "3.4.0.2513" // https://plugins.gradle.org/plugin/nl.neotech.plugin.rootcoverage - root_coverage_version = "1.5.2" + root_coverage_version = "1.5.3" // https://plugins.gradle.org/plugin/com.guardsquare.appsweep - appsweep_version = "1.0.0" + appsweep_version = "1.1.0" compile_sdk_version = 32 min_sdk_version = 23 @@ -51,7 +51,7 @@ ext { swipe_refresh_layout_version = "1.1.0" // https://developer.android.com/jetpack/androidx/releases/lifecycle - lifecycle_version = "2.4.1" + lifecycle_version = "2.5.0" // https://github.com/square/retrofit/tags retrofit_version = "2.9.0" @@ -73,7 +73,7 @@ ext { room_version = "2.4.2" // https://github.com/Kotlin/kotlinx-datetime/releases - kotlinx_datetime_version = "0.3.3" + kotlinx_datetime_version = "0.4.0" // https://github.com/bumptech/glide/releases glide_version = "4.13.2" @@ -88,7 +88,7 @@ ext { security_version = "1.0.0" // https://mvnrepository.com/artifact/com.google.firebase/firebase-bom?repo=google - firebase_version = "30.1.0" + firebase_version = "30.2.0" // https://github.com/junit-team/junit4/releases junit_version = "4.13.2" @@ -96,7 +96,7 @@ ext { junit_ktx_version = "1.1.3" // https://github.com/Kotlin/kotlinx.coroutines/releases - coroutines_version = "1.6.2" + coroutines_version = "1.6.3" // https://github.com/robolectric/robolectric/releases robolectric_version = "4.8.1" From aa02afb997642b07a25eb79029f2e628b0da6cee Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Sat, 9 Jul 2022 10:11:57 +0200 Subject: [PATCH 03/13] Downgrade Kotlin to match AS plugin version --- gradle/versions.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/versions.gradle b/gradle/versions.gradle index dcfdee8..38de884 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -11,7 +11,7 @@ ext { hilt_version = "2.42" // https://kotlinlang.org/docs/gradle.html - kotlin_version = "1.6.21" + kotlin_version = "1.6.10" // https://maven.google.com/web/index.html?q=com.android.tools.build#com.android.tools.build:gradle android_plugin_version = "7.2.1" From bd21947c08edc668c7e83556229c3950028e8f38 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Sat, 9 Jul 2022 10:17:02 +0200 Subject: [PATCH 04/13] Use double quotes in Gradle scripts --- app/build.gradle | 38 +++++++++++++++++++------------------- settings.gradle | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bc87e05..622c273 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,12 @@ 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 "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" } @@ -37,12 +37,12 @@ android { def keystoreProperties = new Properties() keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) - keyAlias keystoreProperties['keyAlias'] - keyPassword keystoreProperties['keyPassword'] - storeFile file(keystoreProperties['storeFile']) - storePassword keystoreProperties['storePassword'] + keyAlias keystoreProperties["keyAlias"] + keyPassword keystoreProperties["keyPassword"] + storeFile file(keystoreProperties["storeFile"]) + storePassword keystoreProperties["storePassword"] } else { - println 'Unable to read keystore.properties' + println "Unable to read keystore.properties" } } } @@ -56,7 +56,7 @@ android { release { minifyEnabled true shrinkResources true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" signingConfig signingConfigs.release } } @@ -71,18 +71,18 @@ android { all { jacoco { includeNoLocationClasses = true - excludes = ['jdk.internal.*'] + excludes = ["jdk.internal.*"] } } } } lint { - disable 'ObsoleteLintCustomCheck', 'IconMissingDensityFolder' - enable 'ConvertToWebp', 'DuplicateStrings', 'EasterEgg', 'ExpensiveAssertion', 'IconExpectedSize', 'ImplicitSamInstance', 'InvalidPackage', 'KotlinPropertyAccess', 'LambdaLast', 'MinSdkTooLow', 'NegativeMargin', 'NoHardKeywords', 'Registered', 'RequiredSize', 'UnknownNullness', 'WrongThreadInterprocedural' + disable "ObsoleteLintCustomCheck", "IconMissingDensityFolder" + enable "ConvertToWebp", "DuplicateStrings", "EasterEgg", "ExpensiveAssertion", "IconExpectedSize", "ImplicitSamInstance", "InvalidPackage", "KotlinPropertyAccess", "LambdaLast", "MinSdkTooLow", "NegativeMargin", "NoHardKeywords", "Registered", "RequiredSize", "UnknownNullness", "WrongThreadInterprocedural" } - namespace 'gq.kirmanak.mealient' + namespace "gq.kirmanak.mealient" packagingOptions { resources.excludes += "DebugProbesKt.bin" @@ -196,7 +196,7 @@ protobuf { all().each { task -> task.builtins { java { - option 'lite' + option "lite" } } } diff --git a/settings.gradle b/settings.gradle index c4fe835..6a044a9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,4 +6,4 @@ dependencyResolutionManagement { } } rootProject.name = "Mealient" -include ':app' +include ":app" From 33bd8ba8200d6ed4a2d6ec425a570a999bf1b953 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Fri, 29 Jul 2022 19:50:32 +0200 Subject: [PATCH 05/13] Use brackets for all function calls --- app/build.gradle | 116 +++++++++++++++++++++++------------------------ build.gradle | 22 +++++---- settings.gradle | 2 +- 3 files changed, 71 insertions(+), 69 deletions(-) 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") From 8193db94989fa5f1757faf3445d744fbfaad9279 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Fri, 29 Jul 2022 21:43:07 +0200 Subject: [PATCH 06/13] Migrate to Kotlin DSL --- app/build.gradle | 204 -------------------- app/build.gradle.kts | 235 +++++++++++++++++++++++ build.gradle | 44 ----- build.gradle.kts | 37 ++++ buildSrc/.gitignore | 1 + buildSrc/build.gradle.kts | 7 + buildSrc/src/main/kotlin/Dependencies.kt | 122 ++++++++++++ settings.gradle => settings.gradle.kts | 2 + 8 files changed, 404 insertions(+), 248 deletions(-) delete mode 100644 app/build.gradle create mode 100644 app/build.gradle.kts delete mode 100644 build.gradle create mode 100644 build.gradle.kts create mode 100644 buildSrc/.gitignore create mode 100644 buildSrc/build.gradle.kts create mode 100644 buildSrc/src/main/kotlin/Dependencies.kt rename settings.gradle => settings.gradle.kts (85%) diff --git a/app/build.gradle b/app/build.gradle deleted file mode 100644 index 4463bc3..0000000 --- a/app/build.gradle +++ /dev/null @@ -1,204 +0,0 @@ -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" -} - -android { - compileSdk compile_sdk_version - - defaultConfig { - applicationId "gq.kirmanak.mealient" - minSdk min_sdk_version - targetSdk target_sdk_version - versionCode 13 - versionName "0.2.4" - - javaCompileOptions { - annotationProcessorOptions { - arguments += ["room.schemaLocation": "$projectDir/schemas".toString()] - } - } - - buildConfigField "Boolean", "LOG_NETWORK", "false" - } - - signingConfigs { - release { - rootProject.file("keystore.properties").with { keystorePropertiesFile -> - if (keystorePropertiesFile.canRead()) { - def keystoreProperties = new Properties() - keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) - - keyAlias keystoreProperties["keyAlias"] - keyPassword keystoreProperties["keyPassword"] - storeFile file(keystoreProperties["storeFile"]) - storePassword keystoreProperties["storePassword"] - } else { - println "Unable to read keystore.properties" - } - } - } - } - - buildTypes { - debug { - ext.enableCrashlytics = false - testCoverageEnabled true - } - release { - minifyEnabled true - shrinkResources true - proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" - signingConfig signingConfigs.release - } - } - - buildFeatures { - viewBinding true - } - - testOptions { - unitTests { - includeAndroidResources = true - all { - jacoco { - includeNoLocationClasses = true - excludes = ["jdk.internal.*"] - } - } - } - } - - lint { - disable "ObsoleteLintCustomCheck", "IconMissingDensityFolder" - enable "ConvertToWebp", "DuplicateStrings", "EasterEgg", "ExpensiveAssertion", "IconExpectedSize", "ImplicitSamInstance", "InvalidPackage", "KotlinPropertyAccess", "LambdaLast", "MinSdkTooLow", "NegativeMargin", "NoHardKeywords", "Registered", "RequiredSize", "UnknownNullness", "WrongThreadInterprocedural" - } - - namespace "gq.kirmanak.mealient" - - packagingOptions { - resources.excludes += "DebugProbesKt.bin" - } - - compileOptions { - coreLibraryDesugaringEnabled true - } -} - -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { - kotlinOptions { - freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn" - } -} - -dependencies { - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:$desugar_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.core:core-ktx:$core_ktx_version") - - implementation("androidx.appcompat:appcompat:$appcompat_version") - - implementation("androidx.constraintlayout:constraintlayout:$contraint_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("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.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("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinx_serialization_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.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("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") - - implementation("com.github.kirich1409:viewbindingpropertydelegate-noreflection:$view_binding_delegate_version") - - implementation("androidx.datastore:datastore-preferences:$datastore_version") - implementation("androidx.datastore:datastore:$datastore_version") - - implementation("com.google.protobuf:protobuf-javalite:$protobuf_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") - - testImplementation("junit:junit:$junit_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("androidx.test.ext:junit-ktx:$junit_ktx_version") - - testImplementation("com.google.truth:truth:$truth_version") - - testImplementation("io.mockk:mockk:$mockk_version") - - debugImplementation("com.squareup.leakcanary:leakcanary-android:$leakcanary_version") - - // https://github.com/ChuckerTeam/chucker/releases - debugImplementation("com.github.chuckerteam.chucker:library:$chucker_version") -} - -protobuf { - protoc { - artifact = "com.google.protobuf:protoc:$protobuf_version" - } - - generateProtoTasks { - all().each { task -> - task.builtins { - java { - option "lite" - } - } - } - } -} \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..624534c --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,235 @@ +@file:Suppress("UnstableApiUsage") + +import com.google.protobuf.gradle.builtins +import com.google.protobuf.gradle.generateProtoTasks +import com.google.protobuf.gradle.protobuf +import com.google.protobuf.gradle.protoc +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile +import java.io.FileInputStream +import java.util.* + +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 Dependencies.appsweep_version + id("com.google.protobuf") version Dependencies.protobuf_plugin_version +} + +android { + compileSdk = Dependencies.compile_sdk_version + + defaultConfig { + applicationId = "gq.kirmanak.mealient" + minSdk = Dependencies.min_sdk_version + targetSdk = Dependencies.target_sdk_version + versionCode = 13 + versionName = "0.2.4" + + javaCompileOptions { + annotationProcessorOptions { + arguments += mapOf("room.schemaLocation" to "$projectDir/schemas") + } + } + + buildConfigField("Boolean", "LOG_NETWORK", "false") + } + + signingConfigs { + create("release") { + rootProject.file("keystore.properties").also { keystorePropertiesFile -> + if (keystorePropertiesFile.canRead()) { + val keystoreProperties = Properties() + keystoreProperties.load(FileInputStream(keystorePropertiesFile)) + + keyAlias = keystoreProperties.getProperty("keyAlias") + keyPassword = keystoreProperties.getProperty("keyPassword") + storeFile = file(keystoreProperties.getProperty("storeFile")) + storePassword = keystoreProperties.getProperty("storePassword") + } else { + println("Unable to read keystore.properties") + } + } + } + } + + buildTypes { + getByName("debug") { + ext["enableCrashlytics"] = false + isTestCoverageEnabled = true + } + getByName("release") { + isMinifyEnabled = true + isShrinkResources = true + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + signingConfig = signingConfigs.getByName("release") + } + } + + buildFeatures { + viewBinding = true + } + + testOptions { + unitTests { + isIncludeAndroidResources = true + } + } + + lint { + disable += listOf("ObsoleteLintCustomCheck", "IconMissingDensityFolder") + enable += listOf( + "ConvertToWebp", + "DuplicateStrings", + "EasterEgg", + "ExpensiveAssertion", + "IconExpectedSize", + "ImplicitSamInstance", + "InvalidPackage", + "KotlinPropertyAccess", + "LambdaLast", + "MinSdkTooLow", + "NegativeMargin", + "NoHardKeywords", + "Registered", + "RequiredSize", + "UnknownNullness", + "WrongThreadInterprocedural" + ) + } + + namespace = "gq.kirmanak.mealient" + + packagingOptions { + resources.excludes += "DebugProbesKt.bin" + } + + compileOptions { + isCoreLibraryDesugaringEnabled = true + } +} + +tasks.withType().configureEach { + configure { + isIncludeNoLocationClasses = true + excludes = listOf("jdk.internal.*") + } +} + +tasks.withType { + kotlinOptions { + freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn") + } +} + +dependencies { + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:${Dependencies.desugar_version}") + + implementation("com.google.android.material:material:${Dependencies.material_version}") + + implementation("androidx.navigation:navigation-fragment-ktx:${Dependencies.nav_version}") + implementation("androidx.navigation:navigation-runtime-ktx:${Dependencies.nav_version}") + implementation("androidx.navigation:navigation-ui-ktx:${Dependencies.nav_version}") + + implementation("androidx.core:core-ktx:${Dependencies.core_ktx_version}") + + implementation("androidx.appcompat:appcompat:${Dependencies.appcompat_version}") + + implementation("androidx.constraintlayout:constraintlayout:${Dependencies.contraint_layout_version}") + + implementation("androidx.swiperefreshlayout:swiperefreshlayout:${Dependencies.swipe_refresh_layout_version}") + + implementation("androidx.lifecycle:lifecycle-livedata-ktx:${Dependencies.lifecycle_version}") + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:${Dependencies.lifecycle_version}") + + implementation("com.google.dagger:hilt-android:${Dependencies.hilt_version}") + kapt("com.google.dagger:hilt-compiler:${Dependencies.hilt_version}") + kaptTest("com.google.dagger:hilt-android-compiler:${Dependencies.hilt_version}") + testImplementation("com.google.dagger:hilt-android-testing:${Dependencies.hilt_version}") + + implementation("com.squareup.retrofit2:retrofit:${Dependencies.retrofit_version}") + + implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:${Dependencies.retrofit_kotlinx_serialization_version}") + + implementation(platform("com.squareup.okhttp3:okhttp-bom:${Dependencies.okhttp_version}")) + implementation("com.squareup.okhttp3:okhttp") + debugImplementation("com.squareup.okhttp3:logging-interceptor") + + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:${Dependencies.kotlinx_serialization_version}") + + implementation("com.jakewharton.timber:timber:${Dependencies.timber_version}") + + implementation("androidx.paging:paging-runtime-ktx:${Dependencies.paging_version}") + testImplementation("androidx.paging:paging-common-ktx:${Dependencies.paging_version}") + + implementation("androidx.room:room-runtime:${Dependencies.room_version}") + implementation("androidx.room:room-ktx:${Dependencies.room_version}") + implementation("androidx.room:room-paging:${Dependencies.room_version}") + kapt("androidx.room:room-compiler:${Dependencies.room_version}") + testImplementation("androidx.room:room-testing:${Dependencies.room_version}") + + implementation("org.jetbrains.kotlinx:kotlinx-datetime:${Dependencies.kotlinx_datetime_version}") + + implementation("com.github.bumptech.glide:glide:${Dependencies.glide_version}") + implementation("com.github.bumptech.glide:okhttp3-integration:${Dependencies.glide_version}") + implementation("com.github.bumptech.glide:recyclerview-integration:${Dependencies.glide_version}") { + // Excludes the support library because it's already included by Glide. + isTransitive = false + } + kapt("com.github.bumptech.glide:compiler:${Dependencies.glide_version}") + + implementation("com.github.kirich1409:viewbindingpropertydelegate-noreflection:${Dependencies.view_binding_delegate_version}") + + implementation("androidx.datastore:datastore-preferences:${Dependencies.datastore_version}") + implementation("androidx.datastore:datastore:${Dependencies.datastore_version}") + + implementation("com.google.protobuf:protobuf-javalite:${Dependencies.protobuf_version}") + + implementation("androidx.security:security-crypto:${Dependencies.security_version}") + + implementation(platform("com.google.firebase:firebase-bom:${Dependencies.firebase_version}")) + implementation("com.google.firebase:firebase-analytics-ktx") + implementation("com.google.firebase:firebase-crashlytics-ktx") + + testImplementation("junit:junit:${Dependencies.junit_version}") + + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:${Dependencies.coroutines_version}") + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:${Dependencies.coroutines_version}") + + testImplementation("org.robolectric:robolectric:${Dependencies.robolectric_version}") + + testImplementation("androidx.test.ext:junit-ktx:${Dependencies.junit_ktx_version}") + + testImplementation("com.google.truth:truth:${Dependencies.truth_version}") + + testImplementation("io.mockk:mockk:${Dependencies.mockk_version}") + + debugImplementation("com.squareup.leakcanary:leakcanary-android:${Dependencies.leakcanary_version}") + + // https://github.com/ChuckerTeam/chucker/releases + debugImplementation("com.github.chuckerteam.chucker:library:${Dependencies.chucker_version}") +} + +protobuf { + protoc { + artifact = "com.google.protobuf:protoc:${Dependencies.protobuf_version}" + } + + generateProtoTasks { + all().forEach { task -> + task.builtins { + val java by registering { + option("lite") + } + } + } + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 576e867..0000000 --- a/build.gradle +++ /dev/null @@ -1,44 +0,0 @@ -buildscript { - - apply { - from "./gradle/versions.gradle" - } - - repositories { - google() - mavenCentral() - } - - 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") - } -} - -plugins { - id("org.sonarqube") version "$sonarqube_version" - id("nl.neotech.plugin.rootcoverage") version "$root_coverage_version" -} - -task clean(type: Delete) { - delete rootProject.buildDir -} - -sonarqube { - properties { - property "sonar.projectKey", "kirmanak_Mealient" - property "sonar.organization", "kirmanak" - property "sonar.host.url", "https://sonarcloud.io" - property "sonar.androidLint.reportPaths", "build/reports/lint-results-debug.xml" - property "sonar.coverage.jacoco.xmlReportPaths", "build/reports/jacoco.xml" - } -} - -rootCoverage { - generateXml true -} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..cd31534 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,37 @@ +buildscript { + + repositories { + google() + mavenCentral() + } + + dependencies { + classpath("com.android.tools.build:gradle:${Dependencies.android_plugin_version}") + classpath("com.google.gms:google-services:${Dependencies.google_services_version}") + classpath("com.google.firebase:firebase-crashlytics-gradle:${Dependencies.crashlytics_version}") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Dependencies.kotlin_version}") + classpath("org.jetbrains.kotlin:kotlin-serialization:${Dependencies.kotlin_version}") + classpath("androidx.navigation:navigation-safe-args-gradle-plugin:${Dependencies.nav_version}") + classpath("com.google.dagger:hilt-android-gradle-plugin:${Dependencies.hilt_version}") + } +} + +plugins { + id("org.sonarqube") version "${Dependencies.sonarqube_version}" + id("nl.neotech.plugin.rootcoverage") version "${Dependencies.root_coverage_version}" + kotlin("jvm") version "1.7.10" +} + +sonarqube { + properties { + property("sonar.projectKey", "kirmanak_Mealient") + property("sonar.organization", "kirmanak") + property("sonar.host.url", "https://sonarcloud.io") + property("sonar.androidLint.reportPaths", "build/reports/lint-results-debug.xml") + property("sonar.coverage.jacoco.xmlReportPaths", "build/reports/jacoco.xml") + } +} + +rootCoverage { + generateXml = true +} \ No newline at end of file diff --git a/buildSrc/.gitignore b/buildSrc/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/buildSrc/.gitignore @@ -0,0 +1 @@ +/build diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts new file mode 100644 index 0000000..f155244 --- /dev/null +++ b/buildSrc/build.gradle.kts @@ -0,0 +1,7 @@ +repositories { + mavenCentral() +} + +plugins { + `kotlin-dsl` +} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt new file mode 100644 index 0000000..df850db --- /dev/null +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -0,0 +1,122 @@ +object Dependencies { + // https://github.com/protocolbuffers/protobuf/releases + const val protobuf_version = "3.21.2" + + // https://github.com/google/protobuf-gradle-plugin/releases + const val protobuf_plugin_version = "0.8.19" + + // https://developer.android.com/jetpack/androidx/releases/navigation + const val nav_version = "2.5.0" + + // https://dagger.dev/hilt/gradle-setup + const val hilt_version = "2.42" + + // https://kotlinlang.org/docs/gradle.html + const val kotlin_version = "1.6.10" + + // https://maven.google.com/web/index.html?q=com.android.tools.build#com.android.tools.build:gradle + const val android_plugin_version = "7.2.1" + + // https://developers.google.com/android/guides/google-services-plugin + const val google_services_version = "4.3.13" + + // https://mvnrepository.com/artifact/com.google.firebase/firebase-crashlytics-gradle + const val crashlytics_version = "2.9.1" + + // https://plugins.gradle.org/plugin/org.sonarqube + const val sonarqube_version = "3.4.0.2513" + + // https://plugins.gradle.org/plugin/nl.neotech.plugin.rootcoverage + const val root_coverage_version = "1.5.3" + + // https://plugins.gradle.org/plugin/com.guardsquare.appsweep + const val appsweep_version = "1.1.0" + + const val compile_sdk_version = 32 + const val min_sdk_version = 23 + const val target_sdk_version = 32 + + // https://github.com/material-components/material-components-android/releases + const val material_version = "1.6.1" + + // https://developer.android.com/kotlin/ktx#core + const val core_ktx_version = "1.8.0" + + // https://developer.android.com/jetpack/androidx/releases/appcompat + const val appcompat_version = "1.4.2" + + // https://developer.android.com/jetpack/androidx/releases/constraintlayout + const val contraint_layout_version = "2.1.4" + + // https://developer.android.com/jetpack/androidx/releases/swiperefreshlayout + const val swipe_refresh_layout_version = "1.1.0" + + // https://developer.android.com/jetpack/androidx/releases/lifecycle + const val lifecycle_version = "2.5.0" + + // https://github.com/square/retrofit/tags + const val retrofit_version = "2.9.0" + + // https://github.com/JakeWharton/retrofit2-kotlinx-serialization-converter/tags + const val retrofit_kotlinx_serialization_version = "0.8.0" + + // https://github.com/Kotlin/kotlinx.serialization/releases + const val kotlinx_serialization_version = "1.3.3" + + // https://github.com/square/okhttp/tags + const val okhttp_version = "4.10.0" + + // https://github.com/JakeWharton/timber/releases + const val timber_version = "5.0.1" + + // https://developer.android.com/jetpack/androidx/releases/paging + const val paging_version = "3.1.1" + + // https://developer.android.com/jetpack/androidx/releases/room + const val room_version = "2.4.2" + + // https://github.com/Kotlin/kotlinx-datetime/releases + const val kotlinx_datetime_version = "0.4.0" + + // https://github.com/bumptech/glide/releases + const val glide_version = "4.13.2" + + // https://github.com/androidbroadcast/ViewBindingPropertyDelegate/releases + const val view_binding_delegate_version = "1.5.6" + + // https://developer.android.com/jetpack/androidx/releases/datastore + const val datastore_version = "1.0.0" + + // https://developer.android.com/jetpack/androidx/releases/security + const val security_version = "1.0.0" + + // https://mvnrepository.com/artifact/com.google.firebase/firebase-bom?repo=google + const val firebase_version = "30.2.0" + + // https://github.com/junit-team/junit4/releases + const val junit_version = "4.13.2" + + // https://developer.android.com/jetpack/androidx/releases/test + const val junit_ktx_version = "1.1.3" + + // https://github.com/Kotlin/kotlinx.coroutines/releases + const val coroutines_version = "1.6.3" + + // https://github.com/robolectric/robolectric/releases + const val robolectric_version = "4.8.1" + + // https://mvnrepository.com/artifact/com.google.truth/truth + const val truth_version = "1.1.3" + + // https://mockk.io/ + const val mockk_version = "1.12.4" + + // https://github.com/square/leakcanary/releases + const val leakcanary_version = "2.9.1" + + // https://github.com/ChuckerTeam/chucker/releases + const val chucker_version = "3.5.2" + + // https://developer.android.com/studio/write/java8-support#library-desugaring + const val desugar_version = "1.1.5" +} diff --git a/settings.gradle b/settings.gradle.kts similarity index 85% rename from settings.gradle rename to settings.gradle.kts index 944ee62..b8588e0 100644 --- a/settings.gradle +++ b/settings.gradle.kts @@ -1,3 +1,5 @@ +@file:Suppress("UnstableApiUsage") + dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { From 957e62eef7da7c7f24d6f8ad6d76f9faa9507ced Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Fri, 29 Jul 2022 21:46:32 +0200 Subject: [PATCH 07/13] Fix NonExistent class build errors --- app/build.gradle.kts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 624534c..78e5c1d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -232,4 +232,8 @@ protobuf { } } } +} + +kapt { + correctErrorTypes = true } \ No newline at end of file From cdd4e58b4e59d2e01213bfab9ff05d820c44a6ff Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Fri, 29 Jul 2022 21:50:25 +0200 Subject: [PATCH 08/13] Remove redundant braces --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index cd31534..abb8494 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,8 +17,8 @@ buildscript { } plugins { - id("org.sonarqube") version "${Dependencies.sonarqube_version}" - id("nl.neotech.plugin.rootcoverage") version "${Dependencies.root_coverage_version}" + id("org.sonarqube") version Dependencies.sonarqube_version + id("nl.neotech.plugin.rootcoverage") version Dependencies.root_coverage_version kotlin("jvm") version "1.7.10" } From c07409e5e8827e1cbebaf51ce289fbc88dfcfe94 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Fri, 29 Jul 2022 21:57:41 +0200 Subject: [PATCH 09/13] Update versions of all dependencies --- buildSrc/src/main/kotlin/Dependencies.kt | 26 ++++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index df850db..6bbb67d 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -1,18 +1,22 @@ object Dependencies { + const val compile_sdk_version = 32 + const val min_sdk_version = 23 + const val target_sdk_version = 32 + // https://github.com/protocolbuffers/protobuf/releases - const val protobuf_version = "3.21.2" + const val protobuf_version = "3.21.4" // https://github.com/google/protobuf-gradle-plugin/releases const val protobuf_plugin_version = "0.8.19" // https://developer.android.com/jetpack/androidx/releases/navigation - const val nav_version = "2.5.0" + const val nav_version = "2.5.1" // https://dagger.dev/hilt/gradle-setup - const val hilt_version = "2.42" + const val hilt_version = "2.43.1" // https://kotlinlang.org/docs/gradle.html - const val kotlin_version = "1.6.10" + const val kotlin_version = "1.7.10" // https://maven.google.com/web/index.html?q=com.android.tools.build#com.android.tools.build:gradle const val android_plugin_version = "7.2.1" @@ -32,10 +36,6 @@ object Dependencies { // https://plugins.gradle.org/plugin/com.guardsquare.appsweep const val appsweep_version = "1.1.0" - const val compile_sdk_version = 32 - const val min_sdk_version = 23 - const val target_sdk_version = 32 - // https://github.com/material-components/material-components-android/releases const val material_version = "1.6.1" @@ -52,7 +52,7 @@ object Dependencies { const val swipe_refresh_layout_version = "1.1.0" // https://developer.android.com/jetpack/androidx/releases/lifecycle - const val lifecycle_version = "2.5.0" + const val lifecycle_version = "2.5.1" // https://github.com/square/retrofit/tags const val retrofit_version = "2.9.0" @@ -73,7 +73,7 @@ object Dependencies { const val paging_version = "3.1.1" // https://developer.android.com/jetpack/androidx/releases/room - const val room_version = "2.4.2" + const val room_version = "2.4.3" // https://github.com/Kotlin/kotlinx-datetime/releases const val kotlinx_datetime_version = "0.4.0" @@ -91,7 +91,7 @@ object Dependencies { const val security_version = "1.0.0" // https://mvnrepository.com/artifact/com.google.firebase/firebase-bom?repo=google - const val firebase_version = "30.2.0" + const val firebase_version = "30.3.1" // https://github.com/junit-team/junit4/releases const val junit_version = "4.13.2" @@ -100,7 +100,7 @@ object Dependencies { const val junit_ktx_version = "1.1.3" // https://github.com/Kotlin/kotlinx.coroutines/releases - const val coroutines_version = "1.6.3" + const val coroutines_version = "1.6.4" // https://github.com/robolectric/robolectric/releases const val robolectric_version = "4.8.1" @@ -109,7 +109,7 @@ object Dependencies { const val truth_version = "1.1.3" // https://mockk.io/ - const val mockk_version = "1.12.4" + const val mockk_version = "1.12.5" // https://github.com/square/leakcanary/releases const val leakcanary_version = "2.9.1" From 2ab4b8dc52e37100a0ad1dffe68646f6a1cd7cde Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Fri, 29 Jul 2022 22:06:46 +0200 Subject: [PATCH 10/13] Use KSP for Room --- app/build.gradle.kts | 9 ++++----- buildSrc/src/main/kotlin/Dependencies.kt | 3 +++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 78e5c1d..cd8dfe2 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -19,6 +19,7 @@ plugins { id("com.google.firebase.crashlytics") id("com.guardsquare.appsweep") version Dependencies.appsweep_version id("com.google.protobuf") version Dependencies.protobuf_plugin_version + id("com.google.devtools.ksp") version Dependencies.ksp_plugin_version } android { @@ -31,10 +32,8 @@ android { versionCode = 13 versionName = "0.2.4" - javaCompileOptions { - annotationProcessorOptions { - arguments += mapOf("room.schemaLocation" to "$projectDir/schemas") - } + ksp { + arg("room.schemaLocation", "$projectDir/schemas") } buildConfigField("Boolean", "LOG_NETWORK", "false") @@ -173,7 +172,7 @@ dependencies { implementation("androidx.room:room-runtime:${Dependencies.room_version}") implementation("androidx.room:room-ktx:${Dependencies.room_version}") implementation("androidx.room:room-paging:${Dependencies.room_version}") - kapt("androidx.room:room-compiler:${Dependencies.room_version}") + ksp("androidx.room:room-compiler:${Dependencies.room_version}") testImplementation("androidx.room:room-testing:${Dependencies.room_version}") implementation("org.jetbrains.kotlinx:kotlinx-datetime:${Dependencies.kotlinx_datetime_version}") diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 6bbb67d..ef5df7c 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -119,4 +119,7 @@ object Dependencies { // https://developer.android.com/studio/write/java8-support#library-desugaring const val desugar_version = "1.1.5" + + // https://github.com/google/ksp/releases + const val ksp_plugin_version = "1.7.10-1.0.6" } From c728bd5b603efd6c24fc43f5719e240c9479a7d3 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Fri, 29 Jul 2022 22:11:48 +0200 Subject: [PATCH 11/13] Remove unused versions.gradle --- gradle/versions.gradle | 118 ----------------------------------------- 1 file changed, 118 deletions(-) delete mode 100644 gradle/versions.gradle diff --git a/gradle/versions.gradle b/gradle/versions.gradle deleted file mode 100644 index 38de884..0000000 --- a/gradle/versions.gradle +++ /dev/null @@ -1,118 +0,0 @@ -ext { - // https://github.com/protocolbuffers/protobuf/releases - protobuf_version = "3.21.2" - // https://github.com/google/protobuf-gradle-plugin/releases - protobuf_plugin_version = "0.8.19" - - // https://developer.android.com/jetpack/androidx/releases/navigation - nav_version = "2.5.0" - - // https://dagger.dev/hilt/gradle-setup - hilt_version = "2.42" - - // https://kotlinlang.org/docs/gradle.html - kotlin_version = "1.6.10" - - // https://maven.google.com/web/index.html?q=com.android.tools.build#com.android.tools.build:gradle - android_plugin_version = "7.2.1" - - // https://developers.google.com/android/guides/google-services-plugin - google_services_version = "4.3.13" - - // https://mvnrepository.com/artifact/com.google.firebase/firebase-crashlytics-gradle - crashlytics_version = "2.9.1" - - // https://plugins.gradle.org/plugin/org.sonarqube - sonarqube_version = "3.4.0.2513" - - // https://plugins.gradle.org/plugin/nl.neotech.plugin.rootcoverage - root_coverage_version = "1.5.3" - - // https://plugins.gradle.org/plugin/com.guardsquare.appsweep - appsweep_version = "1.1.0" - - compile_sdk_version = 32 - min_sdk_version = 23 - target_sdk_version = 32 - - // https://github.com/material-components/material-components-android/releases - material_version = "1.6.1" - - // https://developer.android.com/kotlin/ktx#core - core_ktx_version = "1.8.0" - - // https://developer.android.com/jetpack/androidx/releases/appcompat - appcompat_version = "1.4.2" - - // https://developer.android.com/jetpack/androidx/releases/constraintlayout - contraint_layout_version = "2.1.4" - - // https://developer.android.com/jetpack/androidx/releases/swiperefreshlayout - swipe_refresh_layout_version = "1.1.0" - - // https://developer.android.com/jetpack/androidx/releases/lifecycle - lifecycle_version = "2.5.0" - - // https://github.com/square/retrofit/tags - retrofit_version = "2.9.0" - // https://github.com/JakeWharton/retrofit2-kotlinx-serialization-converter/tags - retrofit_kotlinx_serialization_version = "0.8.0" - // https://github.com/Kotlin/kotlinx.serialization/releases - kotlinx_serialization_version = "1.3.3" - - // https://github.com/square/okhttp/tags - okhttp_version = "4.10.0" - - // https://github.com/JakeWharton/timber/releases - timber_version = "5.0.1" - - // https://developer.android.com/jetpack/androidx/releases/paging - paging_version = "3.1.1" - - // https://developer.android.com/jetpack/androidx/releases/room - room_version = "2.4.2" - - // https://github.com/Kotlin/kotlinx-datetime/releases - kotlinx_datetime_version = "0.4.0" - - // https://github.com/bumptech/glide/releases - glide_version = "4.13.2" - - // https://github.com/androidbroadcast/ViewBindingPropertyDelegate/releases - view_binding_delegate_version = "1.5.6" - - // https://developer.android.com/jetpack/androidx/releases/datastore - datastore_version = "1.0.0" - - // https://developer.android.com/jetpack/androidx/releases/security - security_version = "1.0.0" - - // https://mvnrepository.com/artifact/com.google.firebase/firebase-bom?repo=google - firebase_version = "30.2.0" - - // https://github.com/junit-team/junit4/releases - junit_version = "4.13.2" - // https://developer.android.com/jetpack/androidx/releases/test - junit_ktx_version = "1.1.3" - - // https://github.com/Kotlin/kotlinx.coroutines/releases - coroutines_version = "1.6.3" - - // https://github.com/robolectric/robolectric/releases - robolectric_version = "4.8.1" - - // https://mvnrepository.com/artifact/com.google.truth/truth - truth_version = "1.1.3" - - // https://mockk.io/ - mockk_version = "1.12.4" - - // https://github.com/square/leakcanary/releases - leakcanary_version = "2.9.1" - - // https://github.com/ChuckerTeam/chucker/releases - chucker_version = "3.5.2" - - // https://developer.android.com/studio/write/java8-support#library-desugaring - desugar_version = "1.1.5" -} \ No newline at end of file From 64e089bf6374ec9acf10d6be3c48f8b56762ac69 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Fri, 29 Jul 2022 22:12:41 +0200 Subject: [PATCH 12/13] Remove unused plugin --- build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index abb8494..f6bdf68 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,7 +19,6 @@ buildscript { plugins { id("org.sonarqube") version Dependencies.sonarqube_version id("nl.neotech.plugin.rootcoverage") version Dependencies.root_coverage_version - kotlin("jvm") version "1.7.10" } sonarqube { From b82f75ab22d71b651c4ab1ae12b142bf45d69373 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Fri, 29 Jul 2022 22:16:37 +0200 Subject: [PATCH 13/13] Use camelCase for Kotlin property names --- app/build.gradle.kts | 108 +++++++++++------------ build.gradle.kts | 18 ++-- buildSrc/src/main/kotlin/Dependencies.kt | 86 +++++++++--------- 3 files changed, 106 insertions(+), 106 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index cd8dfe2..c205938 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -17,18 +17,18 @@ plugins { id("org.jetbrains.kotlin.plugin.serialization") id("com.google.gms.google-services") id("com.google.firebase.crashlytics") - id("com.guardsquare.appsweep") version Dependencies.appsweep_version - id("com.google.protobuf") version Dependencies.protobuf_plugin_version - id("com.google.devtools.ksp") version Dependencies.ksp_plugin_version + id("com.guardsquare.appsweep") version Dependencies.appsweepVersion + id("com.google.protobuf") version Dependencies.protobufPluginVersion + id("com.google.devtools.ksp") version Dependencies.kspPluginVersion } android { - compileSdk = Dependencies.compile_sdk_version + compileSdk = Dependencies.compileSdkVersion defaultConfig { applicationId = "gq.kirmanak.mealient" - minSdk = Dependencies.min_sdk_version - targetSdk = Dependencies.target_sdk_version + minSdk = Dependencies.minSdkVersion + targetSdk = Dependencies.targetSdkVersion versionCode = 13 versionName = "0.2.4" @@ -130,96 +130,96 @@ tasks.withType { } dependencies { - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:${Dependencies.desugar_version}") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:${Dependencies.desugarVersion}") - implementation("com.google.android.material:material:${Dependencies.material_version}") + implementation("com.google.android.material:material:${Dependencies.materialVersion}") - implementation("androidx.navigation:navigation-fragment-ktx:${Dependencies.nav_version}") - implementation("androidx.navigation:navigation-runtime-ktx:${Dependencies.nav_version}") - implementation("androidx.navigation:navigation-ui-ktx:${Dependencies.nav_version}") + implementation("androidx.navigation:navigation-fragment-ktx:${Dependencies.navVersion}") + implementation("androidx.navigation:navigation-runtime-ktx:${Dependencies.navVersion}") + implementation("androidx.navigation:navigation-ui-ktx:${Dependencies.navVersion}") - implementation("androidx.core:core-ktx:${Dependencies.core_ktx_version}") + implementation("androidx.core:core-ktx:${Dependencies.coreKtxVersion}") - implementation("androidx.appcompat:appcompat:${Dependencies.appcompat_version}") + implementation("androidx.appcompat:appcompat:${Dependencies.appcompatVersion}") - implementation("androidx.constraintlayout:constraintlayout:${Dependencies.contraint_layout_version}") + implementation("androidx.constraintlayout:constraintlayout:${Dependencies.contraintLayoutVersion}") - implementation("androidx.swiperefreshlayout:swiperefreshlayout:${Dependencies.swipe_refresh_layout_version}") + implementation("androidx.swiperefreshlayout:swiperefreshlayout:${Dependencies.swipeRefreshLayoutVersion}") - implementation("androidx.lifecycle:lifecycle-livedata-ktx:${Dependencies.lifecycle_version}") - implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:${Dependencies.lifecycle_version}") + implementation("androidx.lifecycle:lifecycle-livedata-ktx:${Dependencies.lifecycleVersion}") + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:${Dependencies.lifecycleVersion}") - implementation("com.google.dagger:hilt-android:${Dependencies.hilt_version}") - kapt("com.google.dagger:hilt-compiler:${Dependencies.hilt_version}") - kaptTest("com.google.dagger:hilt-android-compiler:${Dependencies.hilt_version}") - testImplementation("com.google.dagger:hilt-android-testing:${Dependencies.hilt_version}") + implementation("com.google.dagger:hilt-android:${Dependencies.hiltVersion}") + kapt("com.google.dagger:hilt-compiler:${Dependencies.hiltVersion}") + kaptTest("com.google.dagger:hilt-android-compiler:${Dependencies.hiltVersion}") + testImplementation("com.google.dagger:hilt-android-testing:${Dependencies.hiltVersion}") - implementation("com.squareup.retrofit2:retrofit:${Dependencies.retrofit_version}") + implementation("com.squareup.retrofit2:retrofit:${Dependencies.retrofitVersion}") - implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:${Dependencies.retrofit_kotlinx_serialization_version}") + implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:${Dependencies.retrofitKotlinxSerializationVersion}") - implementation(platform("com.squareup.okhttp3:okhttp-bom:${Dependencies.okhttp_version}")) + implementation(platform("com.squareup.okhttp3:okhttp-bom:${Dependencies.okhttpVersion}")) implementation("com.squareup.okhttp3:okhttp") debugImplementation("com.squareup.okhttp3:logging-interceptor") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:${Dependencies.kotlinx_serialization_version}") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:${Dependencies.kotlinxSerializationVersion}") - implementation("com.jakewharton.timber:timber:${Dependencies.timber_version}") + implementation("com.jakewharton.timber:timber:${Dependencies.timberVersion}") - implementation("androidx.paging:paging-runtime-ktx:${Dependencies.paging_version}") - testImplementation("androidx.paging:paging-common-ktx:${Dependencies.paging_version}") + implementation("androidx.paging:paging-runtime-ktx:${Dependencies.pagingVersion}") + testImplementation("androidx.paging:paging-common-ktx:${Dependencies.pagingVersion}") - implementation("androidx.room:room-runtime:${Dependencies.room_version}") - implementation("androidx.room:room-ktx:${Dependencies.room_version}") - implementation("androidx.room:room-paging:${Dependencies.room_version}") - ksp("androidx.room:room-compiler:${Dependencies.room_version}") - testImplementation("androidx.room:room-testing:${Dependencies.room_version}") + implementation("androidx.room:room-runtime:${Dependencies.roomVersion}") + implementation("androidx.room:room-ktx:${Dependencies.roomVersion}") + implementation("androidx.room:room-paging:${Dependencies.roomVersion}") + ksp("androidx.room:room-compiler:${Dependencies.roomVersion}") + testImplementation("androidx.room:room-testing:${Dependencies.roomVersion}") - implementation("org.jetbrains.kotlinx:kotlinx-datetime:${Dependencies.kotlinx_datetime_version}") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:${Dependencies.kotlinxDatetimeVersion}") - implementation("com.github.bumptech.glide:glide:${Dependencies.glide_version}") - implementation("com.github.bumptech.glide:okhttp3-integration:${Dependencies.glide_version}") - implementation("com.github.bumptech.glide:recyclerview-integration:${Dependencies.glide_version}") { + implementation("com.github.bumptech.glide:glide:${Dependencies.glideVersion}") + implementation("com.github.bumptech.glide:okhttp3-integration:${Dependencies.glideVersion}") + implementation("com.github.bumptech.glide:recyclerview-integration:${Dependencies.glideVersion}") { // Excludes the support library because it's already included by Glide. isTransitive = false } - kapt("com.github.bumptech.glide:compiler:${Dependencies.glide_version}") + kapt("com.github.bumptech.glide:compiler:${Dependencies.glideVersion}") - implementation("com.github.kirich1409:viewbindingpropertydelegate-noreflection:${Dependencies.view_binding_delegate_version}") + implementation("com.github.kirich1409:viewbindingpropertydelegate-noreflection:${Dependencies.viewBindingDelegateVersion}") - implementation("androidx.datastore:datastore-preferences:${Dependencies.datastore_version}") - implementation("androidx.datastore:datastore:${Dependencies.datastore_version}") + implementation("androidx.datastore:datastore-preferences:${Dependencies.datastoreVersion}") + implementation("androidx.datastore:datastore:${Dependencies.datastoreVersion}") - implementation("com.google.protobuf:protobuf-javalite:${Dependencies.protobuf_version}") + implementation("com.google.protobuf:protobuf-javalite:${Dependencies.protobufVersion}") - implementation("androidx.security:security-crypto:${Dependencies.security_version}") + implementation("androidx.security:security-crypto:${Dependencies.securityVersion}") - implementation(platform("com.google.firebase:firebase-bom:${Dependencies.firebase_version}")) + implementation(platform("com.google.firebase:firebase-bom:${Dependencies.firebaseVersion}")) implementation("com.google.firebase:firebase-analytics-ktx") implementation("com.google.firebase:firebase-crashlytics-ktx") - testImplementation("junit:junit:${Dependencies.junit_version}") + testImplementation("junit:junit:${Dependencies.junitVersion}") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:${Dependencies.coroutines_version}") - testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:${Dependencies.coroutines_version}") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:${Dependencies.coroutinesVersion}") + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:${Dependencies.coroutinesVersion}") - testImplementation("org.robolectric:robolectric:${Dependencies.robolectric_version}") + testImplementation("org.robolectric:robolectric:${Dependencies.robolectricVersion}") - testImplementation("androidx.test.ext:junit-ktx:${Dependencies.junit_ktx_version}") + testImplementation("androidx.test.ext:junit-ktx:${Dependencies.junitKtxVersion}") - testImplementation("com.google.truth:truth:${Dependencies.truth_version}") + testImplementation("com.google.truth:truth:${Dependencies.truthVersion}") - testImplementation("io.mockk:mockk:${Dependencies.mockk_version}") + testImplementation("io.mockk:mockk:${Dependencies.mockkVersion}") - debugImplementation("com.squareup.leakcanary:leakcanary-android:${Dependencies.leakcanary_version}") + debugImplementation("com.squareup.leakcanary:leakcanary-android:${Dependencies.leakcanaryVersion}") // https://github.com/ChuckerTeam/chucker/releases - debugImplementation("com.github.chuckerteam.chucker:library:${Dependencies.chucker_version}") + debugImplementation("com.github.chuckerteam.chucker:library:${Dependencies.chuckerVersion}") } protobuf { protoc { - artifact = "com.google.protobuf:protoc:${Dependencies.protobuf_version}" + artifact = "com.google.protobuf:protoc:${Dependencies.protobufVersion}" } generateProtoTasks { diff --git a/build.gradle.kts b/build.gradle.kts index f6bdf68..5dde6f6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,19 +6,19 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:${Dependencies.android_plugin_version}") - classpath("com.google.gms:google-services:${Dependencies.google_services_version}") - classpath("com.google.firebase:firebase-crashlytics-gradle:${Dependencies.crashlytics_version}") - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Dependencies.kotlin_version}") - classpath("org.jetbrains.kotlin:kotlin-serialization:${Dependencies.kotlin_version}") - classpath("androidx.navigation:navigation-safe-args-gradle-plugin:${Dependencies.nav_version}") - classpath("com.google.dagger:hilt-android-gradle-plugin:${Dependencies.hilt_version}") + classpath("com.android.tools.build:gradle:${Dependencies.androidPluginVersion}") + classpath("com.google.gms:google-services:${Dependencies.googleServicesVersion}") + classpath("com.google.firebase:firebase-crashlytics-gradle:${Dependencies.crashlyticsVersion}") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Dependencies.kotlinVersion}") + classpath("org.jetbrains.kotlin:kotlin-serialization:${Dependencies.kotlinVersion}") + classpath("androidx.navigation:navigation-safe-args-gradle-plugin:${Dependencies.navVersion}") + classpath("com.google.dagger:hilt-android-gradle-plugin:${Dependencies.hiltVersion}") } } plugins { - id("org.sonarqube") version Dependencies.sonarqube_version - id("nl.neotech.plugin.rootcoverage") version Dependencies.root_coverage_version + id("org.sonarqube") version Dependencies.sonarqubeVersion + id("nl.neotech.plugin.rootcoverage") version Dependencies.rootCoverageVersion } sonarqube { diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index ef5df7c..91842ec 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -1,125 +1,125 @@ object Dependencies { - const val compile_sdk_version = 32 - const val min_sdk_version = 23 - const val target_sdk_version = 32 + const val compileSdkVersion = 32 + const val minSdkVersion = 23 + const val targetSdkVersion = 32 // https://github.com/protocolbuffers/protobuf/releases - const val protobuf_version = "3.21.4" + const val protobufVersion = "3.21.4" // https://github.com/google/protobuf-gradle-plugin/releases - const val protobuf_plugin_version = "0.8.19" + const val protobufPluginVersion = "0.8.19" // https://developer.android.com/jetpack/androidx/releases/navigation - const val nav_version = "2.5.1" + const val navVersion = "2.5.1" // https://dagger.dev/hilt/gradle-setup - const val hilt_version = "2.43.1" + const val hiltVersion = "2.43.1" // https://kotlinlang.org/docs/gradle.html - const val kotlin_version = "1.7.10" + const val kotlinVersion = "1.7.10" // https://maven.google.com/web/index.html?q=com.android.tools.build#com.android.tools.build:gradle - const val android_plugin_version = "7.2.1" + const val androidPluginVersion = "7.2.1" // https://developers.google.com/android/guides/google-services-plugin - const val google_services_version = "4.3.13" + const val googleServicesVersion = "4.3.13" // https://mvnrepository.com/artifact/com.google.firebase/firebase-crashlytics-gradle - const val crashlytics_version = "2.9.1" + const val crashlyticsVersion = "2.9.1" // https://plugins.gradle.org/plugin/org.sonarqube - const val sonarqube_version = "3.4.0.2513" + const val sonarqubeVersion = "3.4.0.2513" // https://plugins.gradle.org/plugin/nl.neotech.plugin.rootcoverage - const val root_coverage_version = "1.5.3" + const val rootCoverageVersion = "1.5.3" // https://plugins.gradle.org/plugin/com.guardsquare.appsweep - const val appsweep_version = "1.1.0" + const val appsweepVersion = "1.1.0" // https://github.com/material-components/material-components-android/releases - const val material_version = "1.6.1" + const val materialVersion = "1.6.1" // https://developer.android.com/kotlin/ktx#core - const val core_ktx_version = "1.8.0" + const val coreKtxVersion = "1.8.0" // https://developer.android.com/jetpack/androidx/releases/appcompat - const val appcompat_version = "1.4.2" + const val appcompatVersion = "1.4.2" // https://developer.android.com/jetpack/androidx/releases/constraintlayout - const val contraint_layout_version = "2.1.4" + const val contraintLayoutVersion = "2.1.4" // https://developer.android.com/jetpack/androidx/releases/swiperefreshlayout - const val swipe_refresh_layout_version = "1.1.0" + const val swipeRefreshLayoutVersion = "1.1.0" // https://developer.android.com/jetpack/androidx/releases/lifecycle - const val lifecycle_version = "2.5.1" + const val lifecycleVersion = "2.5.1" // https://github.com/square/retrofit/tags - const val retrofit_version = "2.9.0" + const val retrofitVersion = "2.9.0" // https://github.com/JakeWharton/retrofit2-kotlinx-serialization-converter/tags - const val retrofit_kotlinx_serialization_version = "0.8.0" + const val retrofitKotlinxSerializationVersion = "0.8.0" // https://github.com/Kotlin/kotlinx.serialization/releases - const val kotlinx_serialization_version = "1.3.3" + const val kotlinxSerializationVersion = "1.3.3" // https://github.com/square/okhttp/tags - const val okhttp_version = "4.10.0" + const val okhttpVersion = "4.10.0" // https://github.com/JakeWharton/timber/releases - const val timber_version = "5.0.1" + const val timberVersion = "5.0.1" // https://developer.android.com/jetpack/androidx/releases/paging - const val paging_version = "3.1.1" + const val pagingVersion = "3.1.1" // https://developer.android.com/jetpack/androidx/releases/room - const val room_version = "2.4.3" + const val roomVersion = "2.4.3" // https://github.com/Kotlin/kotlinx-datetime/releases - const val kotlinx_datetime_version = "0.4.0" + const val kotlinxDatetimeVersion = "0.4.0" // https://github.com/bumptech/glide/releases - const val glide_version = "4.13.2" + const val glideVersion = "4.13.2" // https://github.com/androidbroadcast/ViewBindingPropertyDelegate/releases - const val view_binding_delegate_version = "1.5.6" + const val viewBindingDelegateVersion = "1.5.6" // https://developer.android.com/jetpack/androidx/releases/datastore - const val datastore_version = "1.0.0" + const val datastoreVersion = "1.0.0" // https://developer.android.com/jetpack/androidx/releases/security - const val security_version = "1.0.0" + const val securityVersion = "1.0.0" // https://mvnrepository.com/artifact/com.google.firebase/firebase-bom?repo=google - const val firebase_version = "30.3.1" + const val firebaseVersion = "30.3.1" // https://github.com/junit-team/junit4/releases - const val junit_version = "4.13.2" + const val junitVersion = "4.13.2" // https://developer.android.com/jetpack/androidx/releases/test - const val junit_ktx_version = "1.1.3" + const val junitKtxVersion = "1.1.3" // https://github.com/Kotlin/kotlinx.coroutines/releases - const val coroutines_version = "1.6.4" + const val coroutinesVersion = "1.6.4" // https://github.com/robolectric/robolectric/releases - const val robolectric_version = "4.8.1" + const val robolectricVersion = "4.8.1" // https://mvnrepository.com/artifact/com.google.truth/truth - const val truth_version = "1.1.3" + const val truthVersion = "1.1.3" // https://mockk.io/ - const val mockk_version = "1.12.5" + const val mockkVersion = "1.12.5" // https://github.com/square/leakcanary/releases - const val leakcanary_version = "2.9.1" + const val leakcanaryVersion = "2.9.1" // https://github.com/ChuckerTeam/chucker/releases - const val chucker_version = "3.5.2" + const val chuckerVersion = "3.5.2" // https://developer.android.com/studio/write/java8-support#library-desugaring - const val desugar_version = "1.1.5" + const val desugarVersion = "1.1.5" // https://github.com/google/ksp/releases - const val ksp_plugin_version = "1.7.10-1.0.6" + const val kspPluginVersion = "1.7.10-1.0.6" }