From 1a0b853e2bee6e4c56c8070a67a6cfe21d2420d6 Mon Sep 17 00:00:00 2001 From: WallE Date: Sat, 11 Mar 2023 04:36:43 +0530 Subject: [PATCH 1/3] chore: Upgrade the Gradle Plugin and Dependencies version --- app/build.gradle | 26 ++++++++++++------------ app/src/main/AndroidManifest.xml | 6 +++--- build.gradle | 10 ++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c5df134..ebcf523 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,12 +2,11 @@ apply plugin: 'com.android.application' apply plugin: 'com.google.firebase.crashlytics' android { - compileSdkVersion 30 - buildToolsVersion '30.0.2' + compileSdkVersion 33 defaultConfig { applicationId "com.nagpal.shivam.vtucslab" minSdkVersion 19 - targetSdkVersion 30 + targetSdkVersion 33 versionCode 7 versionName "6.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -21,30 +20,31 @@ android { buildFeatures { dataBinding true } + namespace 'com.nagpal.shivam.vtucslab' } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.1' - implementation 'com.google.android.material:material:1.2.1' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'com.google.android.material:material:1.8.0' // GSON - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.code.gson:gson:2.8.9' // Firebase SDK - implementation('com.google.firebase:firebase-core:17.5.0') { + implementation('com.google.firebase:firebase-core:21.1.1') { exclude module: 'support-v4' } - implementation('com.google.firebase:firebase-messaging:20.2.4') { + implementation('com.google.firebase:firebase-messaging:23.1.2') { exclude module: 'support-v4' } - implementation 'com.google.firebase:firebase-crashlytics:17.2.1' + implementation 'com.google.firebase:firebase-crashlytics:18.3.5' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.3.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test:runner:1.5.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' } apply plugin: 'com.google.gms.google-services' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index dd559f3..e847e0e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> @@ -22,7 +21,8 @@ + android:theme="@style/AppTheme.NoActionBar" + android:exported="true"> diff --git a/build.gradle b/build.gradle index a6198a3..e454feb 100644 --- a/build.gradle +++ b/build.gradle @@ -4,12 +4,12 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.1' - classpath 'com.google.gms:google-services:4.3.3' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.2.0' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.3.15' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.4' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -18,7 +18,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() maven { url 'https://jitpack.io' } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 76452e3..7076ffe 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip From 144e7885596d93748a2bbb81f94f97451703770d Mon Sep 17 00:00:00 2001 From: WallE Date: Sat, 11 Mar 2023 13:27:46 +0530 Subject: [PATCH 2/3] chore: Enable MultiDex --- app/build.gradle | 2 ++ app/src/main/AndroidManifest.xml | 1 + 2 files changed, 3 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index ebcf523..c81b7d0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,6 +10,7 @@ android { versionCode 7 versionName "6.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + multiDexEnabled true } buildTypes { release { @@ -29,6 +30,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'com.google.android.material:material:1.8.0' + implementation "androidx.multidex:multidex:2.0.1" // GSON implementation 'com.google.code.gson:gson:2.8.9' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e847e0e..6186b9e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ Date: Tue, 14 Mar 2023 01:44:41 +0530 Subject: [PATCH 3/3] chore: Prepare the release candidate --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c81b7d0..ce0e08a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "com.nagpal.shivam.vtucslab" minSdkVersion 19 targetSdkVersion 33 - versionCode 7 - versionName "6.1" + versionCode 8 + versionName "6.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true }