all: reformat

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
Harsh Shandilya 2021-01-18 18:53:18 +05:30
parent 6b85bc51de
commit 45c3ec504f
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
14 changed files with 55 additions and 43 deletions

View file

@ -1,17 +1,17 @@
rootProject.ext.versions = [
agp: '7.0.0-alpha04',
agp : '7.0.0-alpha04',
daggerHilt: '2.30.1-alpha',
kotlin: '1.4.21',
lint: '27.3.0-alpha04',
semver: '0.9.0',
kotlin : '1.4.21',
lint : '27.3.0-alpha04',
semver : '0.9.0',
]
rootProject.ext.build = [
androidGradlePlugin: "com.android.tools.build:gradle:${versions.agp}",
androidGradlePlugin_builder: "com.android.tools.build:builder:${versions.agp}",
androidGradlePlugin : "com.android.tools.build:gradle:${versions.agp}",
androidGradlePlugin_builder : "com.android.tools.build:builder:${versions.agp}",
androidGradlePlugin_builderModel: "com.android.tools.build:builder-model:${versions.agp}",
androidGradlePlugin_lintModel: "com.android.tools.lint:lint-model:${versions.lint}",
daggerGradlePlugin: "com.google.dagger:hilt-android-gradle-plugin:${versions.daggerHilt}",
kotlinGradlePlugin: "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}",
jsemver: "com.github.zafarkhaja:java-semver:${versions.semver}",
androidGradlePlugin_lintModel : "com.android.tools.lint:lint-model:${versions.lint}",
daggerGradlePlugin : "com.google.dagger:hilt-android-gradle-plugin:${versions.daggerHilt}",
kotlinGradlePlugin : "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}",
jsemver : "com.github.zafarkhaja:java-semver:${versions.semver}",
]

View file

@ -54,12 +54,14 @@ internal fun Project.configureForAllProjects() {
}
}
}
/**
* Apply configuration options for Android Application projects.
*/
@Suppress("UnstableApiUsage")
internal fun BaseAppModuleExtension.configureAndroidApplicationOptions(project: Project) {
val minifySwitch = project.providers.environmentVariable("DISABLE_MINIFY").forUseAtConfigurationTime()
val minifySwitch =
project.providers.environmentVariable("DISABLE_MINIFY").forUseAtConfigurationTime()
project.tasks.withType<KotlinCompile> {
kotlinOptions {
freeCompilerArgs = freeCompilerArgs + listOf(

View file

@ -7,6 +7,7 @@ private const val DAGGER_HILT_VERSION = "2.31-alpha"
object Dependencies {
const val COMPOSE_VERSION = "1.0.0-alpha10"
object Kotlin {
object Coroutines {

View file

@ -40,7 +40,8 @@ class LobstersPlugin : Plugin<Project> {
is AppPlugin -> {
project.extensions.getByType<TestedExtension>().configureCommonAndroidOptions()
project.extensions.getByType<BaseAppModuleExtension>().configureBuildSigning(project)
project.extensions.getByType<BaseAppModuleExtension>().configureAndroidApplicationOptions(project)
project.extensions.getByType<BaseAppModuleExtension>()
.configureAndroidApplicationOptions(project)
}
is Kapt3GradleSubplugin -> {
project.configureKapt()

View file

@ -4,8 +4,8 @@
*/
import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
import java.util.Properties
import org.gradle.api.Project
import java.util.*
private const val KEYSTORE_CONFIG_PATH = "keystore.properties"

View file

@ -6,10 +6,10 @@
import com.android.build.gradle.internal.plugins.AppPlugin
import com.github.zafarkhaja.semver.Version
import java.io.OutputStream
import java.util.Properties
import org.gradle.api.Plugin
import org.gradle.api.Project
import java.io.OutputStream
import java.util.*
private const val VERSIONING_PROP_FILE = "version.properties"
private const val VERSIONING_PROP_VERSION_NAME = "versioning-plugin.versionName"
@ -71,9 +71,10 @@ class VersioningPlugin : Plugin<Project> {
val versionName = requireNotNull(versionProps.getProperty(VERSIONING_PROP_VERSION_NAME)) {
"version.properties must contain a '$VERSIONING_PROP_VERSION_NAME' property"
}
val versionCode = requireNotNull(versionProps.getProperty(VERSIONING_PROP_VERSION_CODE).toInt()) {
"version.properties must contain a '$VERSIONING_PROP_VERSION_CODE' property"
}
val versionCode =
requireNotNull(versionProps.getProperty(VERSIONING_PROP_VERSION_CODE).toInt()) {
"version.properties must contain a '$VERSIONING_PROP_VERSION_CODE' property"
}
appPlugin.extension.defaultConfig.versionName = versionName
appPlugin.extension.defaultConfig.versionCode = versionCode
afterEvaluate {