From e27bf9d2cbf83485e7d50d8efdcf7c2f5ad0a64b Mon Sep 17 00:00:00 2001 From: Prathamesh More Date: Sat, 11 Dec 2021 01:21:51 +0530 Subject: [PATCH] Updated dependencies and some changes to Gradle to decrease build time. getDate used to run for every Build which resulted in different versionCode for every which is present in manifest, so heavy tasks used to run everytime so more build time. getDate is used for only release builds now. --- app/build.gradle | 15 ++++++++------- .../retromusic/cast/CastOptionsProvider.kt | 2 +- build.gradle | 16 ++++------------ settings.gradle | 8 ++++++++ 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ddb856324..c2ef5728c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,18 +5,18 @@ apply plugin: "androidx.navigation.safeargs.kotlin" apply plugin: 'kotlin-parcelize' android { - compileSdkVersion 31 + compileSdk 31 defaultConfig { - minSdkVersion 21 - targetSdkVersion 31 + minSdk 21 + targetSdk 31 renderscriptTargetApi 29//must match target sdk and build tools vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" - versionCode 10545 - versionName '5.4.2 ' + "_" + getDate() + versionCode 10547 + versionName '5.4.3' buildConfigField("String", "GOOGLE_PLAY_LICENSING_KEY", "\"${getProperty(getProperties('../public.properties'), 'GOOGLE_PLAY_LICENSE_KEY')}\"") } @@ -31,7 +31,8 @@ android { } buildTypes { release { - //debuggable true + versionNameSuffix "_" + getDate() + shrinkResources true minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' signingConfig signingConfigs.release @@ -101,7 +102,7 @@ dependencies { //Cast Dependencies implementation 'androidx.mediarouter:mediarouter:1.2.5' - implementation 'com.google.android.gms:play-services-cast-framework:20.1.0' + implementation 'com.google.android.gms:play-services-cast-framework:21.0.0' //WebServer by NanoHttpd implementation "org.nanohttpd:nanohttpd:2.3.1" diff --git a/app/src/main/java/code/name/monkey/retromusic/cast/CastOptionsProvider.kt b/app/src/main/java/code/name/monkey/retromusic/cast/CastOptionsProvider.kt index a8d14aaef..d6759dc20 100644 --- a/app/src/main/java/code/name/monkey/retromusic/cast/CastOptionsProvider.kt +++ b/app/src/main/java/code/name/monkey/retromusic/cast/CastOptionsProvider.kt @@ -35,7 +35,7 @@ class CastOptionsProvider : OptionsProvider { .build() } - override fun getAdditionalSessionProviders(context: Context?): List? { + override fun getAdditionalSessionProviders(context: Context): MutableList? { return null } } \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8a6bcb45b..e4eace34c 100644 --- a/build.gradle +++ b/build.gradle @@ -7,22 +7,14 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.3' + classpath 'com.android.tools.build:gradle:7.0.4' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" def nav_version = "2.4.0-beta02" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version" - classpath "com.diffplug.spotless:spotless-plugin-gradle:6.0.1" + classpath "com.diffplug.spotless:spotless-plugin-gradle:6.0.4" } } -allprojects { - repositories { - google() - mavenCentral() - maven { url "https://jitpack.io" } - } -} - -/*task clean(type: Delete) { +task clean(type: Delete) { delete rootProject.buildDir -}*/ \ No newline at end of file +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 914418483..27bc031ae 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,9 @@ +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + maven { url "https://jitpack.io" } + } +} include ':app', ':appthemehelper' \ No newline at end of file