diff options
author | Harsh Shandilya <msfjarvis@gmail.com> | 2020-10-16 20:48:11 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-16 17:18:11 +0200 |
commit | 6c1e41ba1050c92f4b615f7e857e0d085120a242 (patch) | |
tree | 5be0bc1e6c1a2afeda9ba9566c12a791302b7918 /build.gradle.kts | |
parent | 92f1aab25da12411aa256c3b763e0cb6182e9320 (diff) |
Revamp build configuration (#1156)
* release: move scripts to scripts directory
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* Move CI secrets to secrets directory
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* gradle: uprev to 6.7
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* gradle: suppress warnings about unsupported options
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* build: update dependencies
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* build: move Gradle plugins to ext
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* build: move configuration tasks to buildSrc
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* CHANGELOG: add entry for #1137
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* Fix lint warnings
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'build.gradle.kts')
-rw-r--r-- | build.gradle.kts | 66 |
1 files changed, 7 insertions, 59 deletions
diff --git a/build.gradle.kts b/build.gradle.kts index 93b44473..cfd3ae3d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,11 +2,9 @@ * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile -import com.android.build.gradle.BaseExtension -import kotlinx.validation.ApiValidationExtension - buildscript { + apply(from = "buildSrc/buildDependencies.gradle") + val build: Map<Any, Any> by extra repositories { google() jcenter() @@ -14,64 +12,14 @@ buildscript { maven { url = uri("https://kotlin.bintray.com/kotlinx") } } dependencies { - classpath(Plugins.agp) - classpath(Plugins.binaryCompatibilityValidator) - classpath(Plugins.kotlin) + classpath(build.getValue("androidGradlePlugin")) + classpath(build.getValue("binaryCompatibilityValidator")) + classpath(build.getValue("kotlinGradlePlugin")) } } plugins { id("com.github.ben-manes.versions") version "0.33.0" -} - -apply(plugin = "binary-compatibility-validator") - -extensions.configure<ApiValidationExtension> { - ignoredProjects = mutableSetOf( - "app" - ) -} - -subprojects { - repositories { - google() - jcenter() - maven { - setUrl("https://jitpack.io") - } - } - if (name == "app") { - apply(plugin = "com.android.application") - } else { - apply(plugin = "com.android.library") - } - configure<BaseExtension> { - compileSdkVersion(29) - defaultConfig { - minSdkVersion(23) - targetSdkVersion(29) - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } - tasks.withType<JavaCompile> { - options.compilerArgs.add("-Xlint:unchecked") - options.isDeprecation = true - } - } - tasks.withType<KotlinCompile> { - kotlinOptions { - jvmTarget = "1.8" - freeCompilerArgs = listOf("-Xopt-in=kotlin.RequiresOptIn", "-Xallow-result-return-type") - languageVersion = "1.4" - } - } -} - -tasks.wrapper { - gradleVersion = "6.6.1" - distributionType = Wrapper.DistributionType.ALL - distributionSha256Sum = "11657af6356b7587bfb37287b5992e94a9686d5c8a0a1b60b87b9928a2decde5" + `binary-compatibility-validator` + `aps-plugin` } |