From ce709210aedf20067c8add5aca2608adb6d24d16 Mon Sep 17 00:00:00 2001 From: Mubeen Khalid Date: Fri, 27 Jan 2023 17:35:05 +0500 Subject: [PATCH 1/3] Gradle plugin update to 7.3.1 spotless dependency update to 4.5.1 Build tools update to 30.0.3 compile sdk version update to api 33 Multidex support to SampleApp --- dependencies.gradle | 16 +++++++++------- gradle.properties | 1 + gradle/wrapper/gradle-wrapper.properties | 5 +++-- sample/build.gradle | 3 +++ .../materialdialogssample/SampleApp.kt | 3 +++ sample/src/main/AndroidManifest.xml | 3 ++- 6 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index aab328849..3b5fb49e1 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,16 +1,16 @@ ext.versions = [ min_sdk: 16, - compile_sdk: 29, - build_tools: "29.0.0", + compile_sdk: 33, + build_tools: "30.0.3", publish_version: "3.3.0", publish_version_code: 262 ] ext.deps = [ gradle_plugins: [ - android: "com.android.tools.build:gradle:4.1.2", - kotlin: "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61", - spotless: "com.diffplug.spotless:spotless-plugin-gradle:3.27.1", + android: "com.android.tools.build:gradle:7.3.1", + kotlin: "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0", + spotless: "com.diffplug.spotless:spotless-plugin-gradle:4.5.1", versions: "com.github.ben-manes:gradle-versions-plugin:0.27.0" ], @@ -25,7 +25,7 @@ ext.deps = [ recycler_view: "androidx.recyclerview:recyclerview:1.1.0" ], - google_material: "com.google.android.material:material:1.1.0", + google_material: "com.google.android.material:material:1.8.0", kotlin: [ stdlib8: "org.jetbrains.kotlin:kotlin-stdlib-jdk8", @@ -40,5 +40,7 @@ ext.deps = [ date_picker: "com.afollestad:date-picker:0.6.1" ], - leak_canary: "com.squareup.leakcanary:leakcanary-android:2.2" + leak_canary: "com.squareup.leakcanary:leakcanary-android:2.2", + + multiDex: "androidx.multidex:multidex:2.0.1" ] diff --git a/gradle.properties b/gradle.properties index 4f31c7a98..391655f0f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,3 +14,4 @@ org.gradle.jvmargs=-Xmx1536m # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true android.useAndroidX=true +android.disableAutomaticComponentCreation=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9fccb7a76..1147b0297 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Fri Jan 27 16:19:26 PKT 2023 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/sample/build.gradle b/sample/build.gradle index 98ba15958..049a5a3da 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -4,6 +4,7 @@ ext.module_name = "materialdialogssample" apply from: rootProject.file("gradle/android_application_config.gradle") android.defaultConfig.vectorDrawables.useSupportLibrary = true +android.defaultConfig.multiDexEnabled = true dependencies { implementation project(':core') @@ -24,4 +25,6 @@ dependencies { implementation deps.afollestad.assent debugImplementation deps.leak_canary + + debugImplementation deps.multiDex } diff --git a/sample/src/debug/java/com/afollestad/materialdialogssample/SampleApp.kt b/sample/src/debug/java/com/afollestad/materialdialogssample/SampleApp.kt index ab8bfd94b..d7fc58f04 100644 --- a/sample/src/debug/java/com/afollestad/materialdialogssample/SampleApp.kt +++ b/sample/src/debug/java/com/afollestad/materialdialogssample/SampleApp.kt @@ -16,6 +16,7 @@ package com.afollestad.materialdialogssample import android.app.Application +import androidx.multidex.MultiDex import leakcanary.LeakCanary /** @author Aidan Follestad (afollestad) */ @@ -24,5 +25,7 @@ class SampleApp : Application() { override fun onCreate() { super.onCreate() LeakCanary.config = LeakCanary.config.copy(retainedVisibleThreshold = 3) + + MultiDex.install(this) } } diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index 4ec017140..51e4129a6 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -18,7 +18,8 @@ + android:label="@string/app_name" + android:exported="true"> From fec9cc3821a774dbd1e1f81d82d765ed422f79ed Mon Sep 17 00:00:00 2001 From: Mubeen Khalid Date: Fri, 27 Jan 2023 17:35:48 +0500 Subject: [PATCH 2/3] SampleApp parent theme change to Material3 --- sample/src/main/res/values-v21/styles_parent.xml | 4 ++-- sample/src/main/res/values/styles.xml | 2 +- sample/src/main/res/values/styles_parent.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sample/src/main/res/values-v21/styles_parent.xml b/sample/src/main/res/values-v21/styles_parent.xml index f3fb0f362..7dd748a47 100644 --- a/sample/src/main/res/values-v21/styles_parent.xml +++ b/sample/src/main/res/values-v21/styles_parent.xml @@ -1,13 +1,13 @@ - - - - From 8b9ebc2ac4d6a5a165515dff70aeef3d5ba410ab Mon Sep 17 00:00:00 2001 From: Mubeen Khalid Date: Fri, 27 Jan 2023 17:45:43 +0500 Subject: [PATCH 3/3] updated publish_version to 3.5.0 and publish_version_code to 264 --- dependencies.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 3b5fb49e1..28bd96ae9 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,8 +2,8 @@ ext.versions = [ min_sdk: 16, compile_sdk: 33, build_tools: "30.0.3", - publish_version: "3.3.0", - publish_version_code: 262 + publish_version: "3.5.0", + publish_version_code: 264 ] ext.deps = [