From 899803739b7df934a790e0f818790a97efa831de Mon Sep 17 00:00:00 2001 From: Goooler Date: Mon, 13 Sep 2021 17:49:23 +0800 Subject: [PATCH] Chore: remove unused dependencies & improve gradle properties & code style (#1189) * Inline version strings * Optimize gradle * Remove kotlin-stdlib-jdk7 * Add jvmargs in gradle.properties * Revert "Inline version strings" This reverts commit ad2ab2bb * Revert asserts --- app/build.gradle.kts | 1 - build.gradle.kts | 4 ++-- common/build.gradle.kts | 1 - core/build.gradle.kts | 5 ----- design/build.gradle.kts | 1 - gradle.properties | 2 +- service/build.gradle.kts | 1 - 7 files changed, 3 insertions(+), 12 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c7ef0c985..64b7595c6 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -12,7 +12,6 @@ dependencies { implementation(project(":design")) implementation(project(":common")) - implementation(kotlin("stdlib-jdk7")) implementation(deps.kotlin.coroutine) implementation(deps.androidx.core) implementation(deps.androidx.activity) diff --git a/build.gradle.kts b/build.gradle.kts index 2cd52a5cc..f749b9b53 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -48,7 +48,7 @@ subprojects { apply(plugin = if (isApp) "com.android.application" else "com.android.library") - extensions.configure(BaseExtension::class) { + extensions.configure { val minSdkVersion = 21 val targetSdkVersion = 30 val buildVersionCode = 204010 @@ -172,7 +172,7 @@ task("clean", type = Delete::class) { delete(rootProject.buildDir) } -tasks.named("wrapper") { +tasks.wrapper { distributionType = Wrapper.DistributionType.ALL doLast { diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 1d22fbd5c..197f25cc1 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -6,7 +6,6 @@ plugins { dependencies { compileOnly(project(":hideapi")) - implementation(kotlin("stdlib-jdk7")) implementation(deps.kotlin.coroutine) implementation(deps.androidx.core) } diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 52aa6c592..942fa3615 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -57,16 +57,11 @@ android { dependencies { implementation(project(":common")) - implementation(kotlin("stdlib-jdk7")) implementation(deps.androidx.core) implementation(deps.kotlin.coroutine) implementation(deps.kotlin.serialization.json) } -repositories { - mavenCentral() -} - afterEvaluate { tasks.withType(GolangBuildTask::class.java).forEach { it.inputs.dir(golangSource) diff --git a/design/build.gradle.kts b/design/build.gradle.kts index f23bc6d25..b461b4531 100644 --- a/design/build.gradle.kts +++ b/design/build.gradle.kts @@ -9,7 +9,6 @@ dependencies { implementation(project(":core")) implementation(project(":service")) - implementation(kotlin("stdlib-jdk7")) implementation(deps.kotlin.coroutine) implementation(deps.androidx.core) implementation(deps.androidx.appcompat) diff --git a/gradle.properties b/gradle.properties index cb092798b..287e2163c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx4608m +org.gradle.jvmargs=-Xmx4g -XX:+UseParallelGC -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects diff --git a/service/build.gradle.kts b/service/build.gradle.kts index 38755d275..402072d68 100644 --- a/service/build.gradle.kts +++ b/service/build.gradle.kts @@ -13,7 +13,6 @@ dependencies { implementation(project(":core")) implementation(project(":common")) - implementation(kotlin("stdlib-jdk7")) implementation(deps.kotlin.coroutine) implementation(deps.kotlin.serialization.json) implementation(deps.androidx.core)