From 7a26345c7dc3d35b9deca5ee96db51962fc1159e Mon Sep 17 00:00:00 2001 From: Janne Koschinski <janne@kuschku.de> Date: Fri, 7 Dec 2018 17:03:14 +0100 Subject: [PATCH] Further optimize app size, updated kotlin version, changed gradle.properties --- app/build.gradle.kts | 2 +- app/sampledata/libraries.json | 2 +- .../quasseldroid/ui/clientsettings/about/AboutFragment.kt | 2 +- build.gradle.kts | 2 +- gradle.properties | 2 -- lib/build.gradle.kts | 2 +- lifecycle-ktx/build.gradle.kts | 2 +- malheur/build.gradle.kts | 2 +- persistence/build.gradle.kts | 2 +- viewmodel/build.gradle.kts | 2 +- 10 files changed, 9 insertions(+), 11 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index bc783b9ca..279db4a63 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -109,7 +109,7 @@ android { } dependencies { - implementation(kotlin("stdlib", "1.3.10")) + implementation(kotlin("stdlib", "1.3.11")) // App Compat implementation("com.google.android.material", "material", "1.0.0-rc01") diff --git a/app/sampledata/libraries.json b/app/sampledata/libraries.json index 1c15fc706..7f9010572 100644 --- a/app/sampledata/libraries.json +++ b/app/sampledata/libraries.json @@ -161,7 +161,7 @@ }, { "name": "Kotlin Standard Library", - "version": "1.3.10", + "version": "1.3.11", "license": { "short_name": "Apache-2.0", "full_name": "Apache License" diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt index e557ca9b2..ff0ac1b77 100644 --- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt +++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt @@ -196,7 +196,7 @@ class AboutFragment : DaggerFragment() { ), Library( name = "Kotlin Standard Library", - version = "1.3.10", + version = "1.3.11", license = apache2, url = "https://kotlinlang.org/" ), diff --git a/build.gradle.kts b/build.gradle.kts index 081ebb6f3..28cd86749 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -24,7 +24,7 @@ buildscript { } dependencies { classpath("com.android.tools.build:gradle:3.2.1") - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.10") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11") } } diff --git a/gradle.properties b/gradle.properties index 4a92e00b8..2907ece9c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,8 +27,6 @@ org.gradle.jvmargs=-Xmx2048m # 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 org.gradle.parallel=true -# Disable configure on demand (Android Studio doesn’t like it) -org.gradle.configureondemand=false # Enable new Android D8 Dexer android.enableD8=true # Enable gradle build cache diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index b47a83d6b..899cfa3cf 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -29,7 +29,7 @@ plugins { } dependencies { - implementation(kotlin("stdlib", "1.3.10")) + implementation(kotlin("stdlib", "1.3.11")) implementation("androidx.annotation", "annotation", "1.0.0") diff --git a/lifecycle-ktx/build.gradle.kts b/lifecycle-ktx/build.gradle.kts index b091ba0e2..b4c6c6af5 100644 --- a/lifecycle-ktx/build.gradle.kts +++ b/lifecycle-ktx/build.gradle.kts @@ -27,7 +27,7 @@ plugins { } dependencies { - implementation(kotlin("stdlib", "1.3.10")) + implementation(kotlin("stdlib", "1.3.11")) implementation("androidx.annotation", "annotation", "1.0.0") diff --git a/malheur/build.gradle.kts b/malheur/build.gradle.kts index 6fb6fee4e..e3a0236a6 100644 --- a/malheur/build.gradle.kts +++ b/malheur/build.gradle.kts @@ -44,7 +44,7 @@ android { } dependencies { - implementation(kotlin("stdlib", "1.3.10")) + implementation(kotlin("stdlib", "1.3.11")) implementation("com.google.code.gson", "gson", "2.8.5") } diff --git a/persistence/build.gradle.kts b/persistence/build.gradle.kts index 9aad92990..b6f8fcd14 100644 --- a/persistence/build.gradle.kts +++ b/persistence/build.gradle.kts @@ -51,7 +51,7 @@ android { } dependencies { - implementation(kotlin("stdlib", "1.3.10")) + implementation(kotlin("stdlib", "1.3.11")) implementation("androidx.appcompat", "appcompat", "1.0.0") diff --git a/viewmodel/build.gradle.kts b/viewmodel/build.gradle.kts index 683547f02..8e917ce39 100644 --- a/viewmodel/build.gradle.kts +++ b/viewmodel/build.gradle.kts @@ -44,7 +44,7 @@ android { } dependencies { - implementation(kotlin("stdlib", "1.3.10")) + implementation(kotlin("stdlib", "1.3.11")) implementation("androidx.appcompat", "appcompat", "1.0.0") -- GitLab