From cec0e1bbcb7eec6c8eb90807c105cbeab9c01c6c Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 29 Oct 2020 16:38:01 +0530 Subject: [PATCH] gradle: reformat all build files with 2SI Signed-off-by: Harsh Shandilya --- app/build.gradle | 148 ++++++++++++++++++------------------- build.gradle | 150 +++++++++++++++++++------------------- data/build.gradle | 14 ++-- lobsters-api/build.gradle | 18 ++--- model/build.gradle | 6 +- 5 files changed, 168 insertions(+), 168 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bfcdd837..76a5d65b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,95 +1,95 @@ plugins { - id "kotlin-kapt" - id "dagger.hilt.android.plugin" + id "kotlin-kapt" + id "dagger.hilt.android.plugin" } final def keystorePropertiesFile = rootProject.file("keystore.properties") android { - adbOptions { - installOptions = ["--user 0"] - } - defaultConfig { - applicationId "dev.msfjarvis.lobsters" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } + adbOptions { + installOptions = ["--user 0"] + } + defaultConfig { + applicationId "dev.msfjarvis.lobsters" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } - buildTypes { - release { - minifyEnabled true - proguardFiles "proguard-android-optimize.txt", "proguard-rules.pro" - } + buildTypes { + release { + minifyEnabled true + proguardFiles "proguard-android-optimize.txt", "proguard-rules.pro" } + } - compileOptions.coreLibraryDesugaringEnabled = true + compileOptions.coreLibraryDesugaringEnabled = true - buildFeatures.compose = true + buildFeatures.compose = true - composeOptions { - kotlinCompilerVersion "${kotlin_version}" - kotlinCompilerExtensionVersion "${compose_version}" - } + composeOptions { + kotlinCompilerVersion "${kotlin_version}" + kotlinCompilerExtensionVersion "${compose_version}" + } - if (keystorePropertiesFile.exists()) { - final def keystoreProperties = new Properties() - keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) + if (keystorePropertiesFile.exists()) { + final def keystoreProperties = new Properties() + keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) - signingConfigs { - release { - keyAlias keystoreProperties["keyAlias"] - keyPassword keystoreProperties["keyPassword"] - storeFile rootProject.file(keystoreProperties["storeFile"]) - storePassword keystoreProperties["storePassword"] - } - } - buildTypes.debug.signingConfig = signingConfigs.release - buildTypes.release.signingConfig = signingConfigs.release + signingConfigs { + release { + keyAlias keystoreProperties["keyAlias"] + keyPassword keystoreProperties["keyPassword"] + storeFile rootProject.file(keystoreProperties["storeFile"]) + storePassword keystoreProperties["storePassword"] + } } + buildTypes.debug.signingConfig = signingConfigs.release + buildTypes.release.signingConfig = signingConfigs.release + } } tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { - kotlinOptions { - freeCompilerArgs += [ - "-Xallow-jvm-ir-dependencies", - "-Xskip-prerelease-check", - "-Xopt-in=kotlin.RequiresOptIn", - "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", - ] - } + kotlinOptions { + freeCompilerArgs += [ + "-Xallow-jvm-ir-dependencies", + "-Xskip-prerelease-check", + "-Xopt-in=kotlin.RequiresOptIn", + "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", + ] + } } dependencies { - kapt "com.google.dagger:hilt-compiler:$hilt_dagger_version" - kapt "androidx.hilt:hilt-compiler:$hilt_androidx_version" - implementation(project(":data")) - implementation(project(":lobsters-api")) - implementation(project(":model")) - implementation "androidx.core:core-ktx:$core_version" - implementation "androidx.activity:activity-ktx:$activity_version" - implementation "androidx.appcompat:appcompat:$appcompat_version" - implementation "androidx.browser:browser:$browser_version" - implementation "androidx.compose.foundation:foundation:$compose_version" - implementation "androidx.compose.foundation:foundation-layout:$compose_version" - implementation "androidx.compose.foundation:foundation-text:$compose_version" - implementation "androidx.compose.runtime:runtime:$compose_version" - implementation "androidx.compose.material:material:$compose_version" - implementation "androidx.compose.compiler:compiler:$compose_version" - implementation "androidx.compose.ui:ui:$compose_version" - implementation "androidx.compose.ui:ui-text:$compose_version" - implementation "androidx.compose.ui:ui-text-android:$compose_version" - implementation "androidx.compose.ui:ui-unit:$compose_version" - implementation "androidx.hilt:hilt-lifecycle-viewmodel:$hilt_androidx_version" - implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" - implementation "androidx.navigation:navigation-compose:$nav_compose_version" - implementation "androidx.ui:ui-tooling:$compose_version" - implementation "com.google.android.material:material:$material_version" - implementation "com.google.dagger:hilt-android:$hilt_dagger_version" - implementation "dev.chrisbanes.accompanist:accompanist-coil:$accompanist_version" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" - implementation "saschpe.android:customtabs:$customtabs_version" - androidTestImplementation "com.google.dagger:hilt-android-testing:$hilt_dagger_version" - testImplementation "junit:junit:$junit_version" - androidTestImplementation "androidx.ui:ui-test:$compose_version" - coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$desugar_version" + kapt "com.google.dagger:hilt-compiler:$hilt_dagger_version" + kapt "androidx.hilt:hilt-compiler:$hilt_androidx_version" + implementation(project(":data")) + implementation(project(":lobsters-api")) + implementation(project(":model")) + implementation "androidx.core:core-ktx:$core_version" + implementation "androidx.activity:activity-ktx:$activity_version" + implementation "androidx.appcompat:appcompat:$appcompat_version" + implementation "androidx.browser:browser:$browser_version" + implementation "androidx.compose.foundation:foundation:$compose_version" + implementation "androidx.compose.foundation:foundation-layout:$compose_version" + implementation "androidx.compose.foundation:foundation-text:$compose_version" + implementation "androidx.compose.runtime:runtime:$compose_version" + implementation "androidx.compose.material:material:$compose_version" + implementation "androidx.compose.compiler:compiler:$compose_version" + implementation "androidx.compose.ui:ui:$compose_version" + implementation "androidx.compose.ui:ui-text:$compose_version" + implementation "androidx.compose.ui:ui-text-android:$compose_version" + implementation "androidx.compose.ui:ui-unit:$compose_version" + implementation "androidx.hilt:hilt-lifecycle-viewmodel:$hilt_androidx_version" + implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" + implementation "androidx.navigation:navigation-compose:$nav_compose_version" + implementation "androidx.ui:ui-tooling:$compose_version" + implementation "com.google.android.material:material:$material_version" + implementation "com.google.dagger:hilt-android:$hilt_dagger_version" + implementation "dev.chrisbanes.accompanist:accompanist-coil:$accompanist_version" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" + implementation "saschpe.android:customtabs:$customtabs_version" + androidTestImplementation "com.google.dagger:hilt-android-testing:$hilt_dagger_version" + testImplementation "junit:junit:$junit_version" + androidTestImplementation "androidx.ui:ui-test:$compose_version" + coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$desugar_version" } diff --git a/build.gradle b/build.gradle index d527b85c..b17c18e6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,97 +1,97 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext { - accompanist_version = "0.3.2" - activity_version = "1.2.0-beta01" - agp_version = "4.2.0-alpha15" - appcompat_version = "1.3.0-alpha02" - browser_version = "1.3.0-beta01" - compose_version = "1.0.0-alpha06" - core_version = "1.5.0-alpha04" - coroutines_version = "1.4.0" - customtabs_version = "3.0.2" - dagger_version = "2.29.1" - desugar_version = "1.0.10" - hilt_androidx_version = "1.0.0-alpha02" - hilt_dagger_version = "2.29.1-alpha" - junit_version = "4.13.1" - kotlin_version = "1.4.10" - lifecycle_version = "2.3.0-beta01" - material_version = "1.3.0-alpha03" - moshi_version = "1.11.0" - nav_compose_version = "1.0.0-alpha01" - okhttp_version = "4.10.0-RC1" - retrofit_version = "2.9.0" - room_version = "2.3.0-alpha03" - } - repositories { - google() - jcenter() - } - dependencies { - classpath "com.android.tools.build:gradle:$agp_version" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_dagger_version" - } + ext { + accompanist_version = "0.3.2" + activity_version = "1.2.0-beta01" + agp_version = "4.2.0-alpha15" + appcompat_version = "1.3.0-alpha02" + browser_version = "1.3.0-beta01" + compose_version = "1.0.0-alpha06" + core_version = "1.5.0-alpha04" + coroutines_version = "1.4.0" + customtabs_version = "3.0.2" + dagger_version = "2.29.1" + desugar_version = "1.0.10" + hilt_androidx_version = "1.0.0-alpha02" + hilt_dagger_version = "2.29.1-alpha" + junit_version = "4.13.1" + kotlin_version = "1.4.10" + lifecycle_version = "2.3.0-beta01" + material_version = "1.3.0-alpha03" + moshi_version = "1.11.0" + nav_compose_version = "1.0.0-alpha01" + okhttp_version = "4.10.0-RC1" + retrofit_version = "2.9.0" + room_version = "2.3.0-alpha03" + } + repositories { + google() + jcenter() + } + dependencies { + classpath "com.android.tools.build:gradle:$agp_version" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_dagger_version" + } } plugins { - id("com.github.ben-manes.versions") version "0.33.0" + id("com.github.ben-manes.versions") version "0.33.0" } allprojects { - repositories { - google() - jcenter() - } + repositories { + google() + jcenter() + } } subprojects { - repositories { - google() - jcenter() - } - if (name == "app") { - apply plugin: "com.android.application" - } else { - apply plugin: "com.android.library" - } - apply plugin: "kotlin-android" - android { - compileSdkVersion 30 + repositories { + google() + jcenter() + } + if (name == "app") { + apply plugin: "com.android.application" + } else { + apply plugin: "com.android.library" + } + apply plugin: "kotlin-android" + android { + compileSdkVersion 30 - defaultConfig { - minSdkVersion 23 - targetSdkVersion 30 - versionCode 1 - versionName "1.0" - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } + defaultConfig { + minSdkVersion 23 + targetSdkVersion 30 + versionCode 1 + versionName "1.0" } - configurations.all { - resolutionStrategy { - force "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - force "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" - force "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" - } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } - tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8 - } + } + configurations.all { + resolutionStrategy { + force "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + force "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" + force "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" } + } + tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8 + } + } } task clean(type: Delete) { - delete rootProject.buildDir + delete rootProject.buildDir } tasks { - wrapper { - gradleVersion = "6.7" - distributionType = Wrapper.DistributionType.ALL - } + wrapper { + gradleVersion = "6.7" + distributionType = Wrapper.DistributionType.ALL + } } diff --git a/data/build.gradle b/data/build.gradle index b44e1a5a..81698f83 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -1,12 +1,12 @@ plugins { - id 'kotlin-kapt' + id 'kotlin-kapt' } dependencies { - implementation project(":model") - kapt "androidx.room:room-compiler:$room_version" - api "androidx.room:room-runtime:$room_version" - implementation "androidx.room:room-ktx:$room_version" - implementation "com.squareup.moshi:moshi:$moshi_version" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" + implementation project(":model") + kapt "androidx.room:room-compiler:$room_version" + api "androidx.room:room-runtime:$room_version" + implementation "androidx.room:room-ktx:$room_version" + implementation "com.squareup.moshi:moshi:$moshi_version" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" } diff --git a/lobsters-api/build.gradle b/lobsters-api/build.gradle index 729edf39..14fbb225 100644 --- a/lobsters-api/build.gradle +++ b/lobsters-api/build.gradle @@ -1,14 +1,14 @@ plugins { - id 'kotlin-kapt' + id 'kotlin-kapt' } dependencies { - implementation project(":model") - implementation "com.squareup.retrofit2:retrofit:$retrofit_version" - implementation "com.squareup.retrofit2:converter-moshi:$retrofit_version" - kaptTest "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version" - testImplementation "junit:junit:$junit_version" - testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" - //noinspection GradleDependency - testImplementation "com.squareup.okhttp3:mockwebserver:$okhttp_version" + implementation project(":model") + implementation "com.squareup.retrofit2:retrofit:$retrofit_version" + implementation "com.squareup.retrofit2:converter-moshi:$retrofit_version" + kaptTest "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version" + testImplementation "junit:junit:$junit_version" + testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" + //noinspection GradleDependency + testImplementation "com.squareup.okhttp3:mockwebserver:$okhttp_version" } diff --git a/model/build.gradle b/model/build.gradle index 4d9b064a..15922c39 100644 --- a/model/build.gradle +++ b/model/build.gradle @@ -1,8 +1,8 @@ plugins { - id 'kotlin-kapt' + id 'kotlin-kapt' } dependencies { - kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version" - implementation "com.squareup.moshi:moshi:$moshi_version" + kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version" + implementation "com.squareup.moshi:moshi:$moshi_version" }