From 93ab0aa0297189e65ab4535eef627fe31951a859 Mon Sep 17 00:00:00 2001 From: droidpulkit Date: Sun, 3 Mar 2024 00:36:18 -0500 Subject: [PATCH] Upgrade dependencies --- app/build.gradle | 19 ++++++++++--------- app/src/main/AndroidManifest.xml | 8 ++++---- build.gradle | 9 ++++----- gradle.properties | 5 ++++- gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 23 insertions(+), 20 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b8d0b6a..c67b905 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,11 +4,11 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 29 + compileSdk 34 defaultConfig { applicationId "pulkit.com.torontowastewizard" minSdkVersion 23 - targetSdkVersion 29 + targetSdkVersion 34 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -23,16 +23,17 @@ android { dataBinding { enabled = true } + namespace 'pulkit.com.torontowastewizard' } dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2' - implementation 'com.google.android.material:material:1.1.0-beta01' - implementation 'com.squareup.retrofit2:retrofit:2.6.2' - testImplementation 'junit:junit:4.13-beta-3' - androidTestImplementation 'androidx.test.ext:junit:1.1.2-alpha02' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha02' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'com.google.android.material:material:1.11.0' + implementation 'com.squareup.retrofit2:retrofit:2.9.0' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c33e899..1aea8ee 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + @@ -12,7 +11,8 @@ android:supportsRtl="true" android:theme="@style/AppTheme"> - + @@ -22,7 +22,7 @@ - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 19d11f1..a12221d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.9.20' repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.1' + classpath 'com.android.tools.build:gradle:8.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -20,11 +20,10 @@ buildscript { allprojects { repositories { google() - jcenter() mavenCentral() } } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } diff --git a/gradle.properties b/gradle.properties index 07698ea..efdb785 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,7 @@ org.gradle.jvmargs=-Xmx2048m android.useAndroidX=true -android.enableJetifier=true \ No newline at end of file +android.enableJetifier=true +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 e2fbeb5..7f9270e 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-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip