Skip to content

Commit

Permalink
Chore: remove unused dependencies & improve gradle properties & code …
Browse files Browse the repository at this point in the history
…style (#1189)

* Inline version strings

* Optimize gradle

* Remove kotlin-stdlib-jdk7

* Add jvmargs in gradle.properties

* Revert "Inline version strings"

This reverts commit ad2ab2b

* Revert asserts
  • Loading branch information
Goooler authored Sep 13, 2021
1 parent 1ea3a5b commit 8998037
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 12 deletions.
1 change: 0 additions & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ subprojects {

apply(plugin = if (isApp) "com.android.application" else "com.android.library")

extensions.configure(BaseExtension::class) {
extensions.configure<BaseExtension> {
val minSdkVersion = 21
val targetSdkVersion = 30
val buildVersionCode = 204010
Expand Down Expand Up @@ -172,7 +172,7 @@ task("clean", type = Delete::class) {
delete(rootProject.buildDir)
}

tasks.named<Wrapper>("wrapper") {
tasks.wrapper {
distributionType = Wrapper.DistributionType.ALL

doLast {
Expand Down
1 change: 0 additions & 1 deletion common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ plugins {
dependencies {
compileOnly(project(":hideapi"))

implementation(kotlin("stdlib-jdk7"))
implementation(deps.kotlin.coroutine)
implementation(deps.androidx.core)
}
5 changes: 0 additions & 5 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion design/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion service/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 8998037

Please sign in to comment.