From 94b06a2578f42da931fdde020f242afd6412e80f Mon Sep 17 00:00:00 2001 From: Aman Nishad Date: Mon, 1 May 2023 00:31:39 +0530 Subject: [PATCH 1/2] Target Sdk & compile Sdk Updated to 33 --- .idea/codeStyles/Project.xml | 1 + .idea/compiler.xml | 2 +- .idea/gradle.xml | 2 -- .idea/misc.xml | 2 +- app/build.gradle | 39 ++++++++++++------------ build.gradle | 6 ++-- gradle.properties | 5 ++- gradle/wrapper/gradle-wrapper.properties | 2 +- 8 files changed, 31 insertions(+), 28 deletions(-) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 7643783..6df05a0 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,5 +1,6 @@ + - diff --git a/.idea/misc.xml b/.idea/misc.xml index be115a8..7a21f18 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -207,7 +207,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 38ebd8e..cbedb48 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,15 +6,15 @@ plugins { } android { - compileSdk 31 + compileSdk 33 defaultConfig { applicationId "com.gcect.gcectapp" minSdk 23 - targetSdk 31 + targetSdk 33 versionCode 1 versionName "1.0" - resConfigs "en" + resourceConfigurations += ['en'] testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -35,32 +35,33 @@ android { buildFeatures { dataBinding true } + namespace 'com.gcect.gcectapp' } dependencies { - implementation 'androidx.core:core-ktx:1.7.0' - implementation 'androidx.appcompat:appcompat:1.4.1' - implementation 'com.google.android.material:material:1.5.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.3' + implementation 'androidx.core:core-ktx:1.10.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.8.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'androidx.recyclerview:recyclerview:1.2.1' - implementation 'com.google.firebase:firebase-database-ktx:20.0.3' - implementation 'com.firebaseui:firebase-ui-database:2.3.0' + implementation 'androidx.recyclerview:recyclerview:1.3.0' + implementation 'com.google.firebase:firebase-database-ktx:20.2.0' + implementation 'com.firebaseui:firebase-ui-database:7.1.1' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' //Retrofit - implementation 'com.google.code.gson:gson:2.8.9' + implementation 'com.google.code.gson:gson:2.9.1' implementation 'com.squareup.retrofit2:retrofit:2.9.0' implementation 'com.squareup.retrofit2:converter-gson:2.9.0' //Glide - implementation 'com.github.bumptech.glide:glide:4.12.0' + implementation 'com.github.bumptech.glide:glide:4.15.1' kapt 'com.github.bumptech.glide:compiler:4.12.0' // navigation - implementation 'androidx.navigation:navigation-fragment-ktx:2.4.1' - implementation 'androidx.navigation:navigation-ui-ktx:2.4.1' + implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3' + implementation 'androidx.navigation:navigation-ui-ktx:2.5.3' // For circular image view implementation 'com.mikhaellopez:circularimageview:4.3.0' @@ -75,14 +76,14 @@ dependencies { implementation 'com.github.smarteist:autoimageslider:1.4.0' //Coroutines - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4' // PDF view implementation 'com.github.barteksc:android-pdf-viewer:2.8.2' // Room components - implementation "androidx.room:room-ktx:2.4.1" - kapt "androidx.room:room-compiler:2.4.1" + implementation "androidx.room:room-ktx:2.5.1" + kapt "androidx.room:room-compiler:2.5.1" //For file download implementation 'com.mindorks.android:prdownloader:0.6.0' diff --git a/build.gradle b/build.gradle index 4bcae99..cda8924 100644 --- a/build.gradle +++ b/build.gradle @@ -5,9 +5,9 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10' - classpath 'com.google.gms:google-services:4.3.10' + classpath 'com.android.tools.build:gradle:8.0.0' + classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21' + classpath 'com.google.gms:google-services:4.3.15' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle.properties b/gradle.properties index 98bed16..8145fa7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,4 +18,7 @@ android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official \ No newline at end of file +kotlin.code.style=official +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7b1e4fb..9763525 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Mar 18 15:41:28 IST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME From 04266582fbaaffc579ceb192fff2e9b5a971744a Mon Sep 17 00:00:00 2001 From: Aman Nishad Date: Mon, 1 May 2023 00:35:15 +0530 Subject: [PATCH 2/2] Target Sdk & compile Sdk Updated to 33 --- app/src/main/AndroidManifest.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 692b773..e19f4a6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,11 +1,11 @@ + xmlns:tools="http://schemas.android.com/tools"> - +