From 08cb4bb299dec0a8985b4ceebbf171e0ad6e7cb8 Mon Sep 17 00:00:00 2001 From: andreahbji Date: Sat, 5 Feb 2022 23:34:59 +0800 Subject: [PATCH 1/4] update project config --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 26cb560..b1ee0f2 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ buildscript { jcenter() } dependencies{ - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:7.1.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 23e56aa..6a5ed32 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.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip From 0f6e569acb15d2fd69c98bf47ebed7494e7f6267 Mon Sep 17 00:00:00 2001 From: andreahbji Date: Tue, 8 Feb 2022 10:40:05 +0800 Subject: [PATCH 2/4] upgrade sdk setting --- app/build.gradle | 4 ++-- app/src/main/AndroidManifest.xml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8e0fce7..41f1a25 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,11 +18,11 @@ apply plugin: 'kotlin-kapt' apply plugin: "androidx.navigation.safeargs.kotlin" android { - compileSdkVersion 29 + compileSdkVersion 31 defaultConfig { applicationId "com.materialstudies.reply" minSdkVersion 23 - targetSdkVersion 29 + targetSdkVersion 31 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d936212..9095e10 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,7 +11,8 @@ android:supportsRtl="true" android:theme="@style/Theme.Reply.DayNight" tools:ignore="AllowBackup"> - + From 86f3a1e5614655b70887e6a95cb6c73025672834 Mon Sep 17 00:00:00 2001 From: Andrea Ji Date: Sun, 13 Feb 2022 19:13:58 +0800 Subject: [PATCH 3/4] update kotlin version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b1ee0f2..7afdb37 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { ext { - kotlin_version = '1.4.10' + kotlin_version = '1.6.10' navigation_version = '2.3.1' } repositories { From eb0e2880362e89b6d910f9387792712f9a531c1d Mon Sep 17 00:00:00 2001 From: Andrea Ji Date: Sun, 13 Feb 2022 19:30:29 +0800 Subject: [PATCH 4/4] update dependencies --- app/build.gradle | 18 +++++++++--------- build.gradle | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 41f1a25..97f6a1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -52,11 +52,11 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" // AndroidX - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' - implementation 'androidx.recyclerview:recyclerview:1.1.0' - implementation 'androidx.core:core-ktx:1.3.2' - implementation 'androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0' + implementation 'androidx.appcompat:appcompat:1.4.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.3' + implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.lifecycle:lifecycle-livedata-core-ktx:2.4.1' implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version" implementation "androidx.navigation:navigation-ui-ktx:$navigation_version" @@ -64,10 +64,10 @@ dependencies { implementation "com.github.bumptech.glide:glide:4.11.0" // Material Components - implementation 'com.google.android.material:material:1.2.1' + implementation 'com.google.android.material:material:1.5.0' // Testing - testImplementation 'junit:junit:4.13' - 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.4.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' } diff --git a/build.gradle b/build.gradle index 7afdb37..0aba9b9 100644 --- a/build.gradle +++ b/build.gradle @@ -15,14 +15,14 @@ buildscript { ext { kotlin_version = '1.6.10' - navigation_version = '2.3.1' + navigation_version = '2.4.1' } repositories { google() - jcenter() + mavenCentral() } dependencies{ - classpath 'com.android.tools.build:gradle:7.1.0' + classpath 'com.android.tools.build:gradle:7.1.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version" @@ -34,7 +34,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } }