diff --git a/app/build.gradle b/app/build.gradle index e867e1b..b766f3e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,13 +21,13 @@ plugins { } android { - compileSdkVersion 30 + compileSdkVersion 32 buildToolsVersion "30.0.3" defaultConfig { applicationId "com.example.forage" minSdkVersion 21 - targetSdkVersion 30 + targetSdkVersion 32 versionCode 1 versionName "1.0" @@ -60,12 +60,12 @@ android { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.6.0' - implementation 'androidx.appcompat:appcompat:1.3.1' - implementation 'com.google.android.material:material:1.4.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' - implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5' - implementation 'androidx.navigation:navigation-ui-ktx:2.3.5' + 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.navigation:navigation-fragment-ktx:2.4.2' + implementation 'androidx.navigation:navigation-ui-ktx:2.4.2' // Lifecycle implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" @@ -83,10 +83,10 @@ dependencies { testImplementation 'junit:junit:4.+' androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' - androidTestImplementation "androidx.test:core-ktx:1.3.0" + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + androidTestImplementation "androidx.test:core-ktx:1.4.0" androidTestImplementation "androidx.navigation:navigation-testing:$nav_version" androidTestImplementation 'androidx.test:runner:1.4.0' - androidTestUtil 'androidx.test:orchestrator:1.4.0' - debugImplementation "androidx.fragment:fragment-testing:1.3.3" + androidTestUtil 'androidx.test:orchestrator:1.4.1' + debugImplementation "androidx.fragment:fragment-testing:1.4.1" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 21f526c..5ba77d0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,6 +27,7 @@ android:theme="@style/Theme.Forage"> diff --git a/build.gradle b/build.gradle index fd78d9b..0a9acb1 100644 --- a/build.gradle +++ b/build.gradle @@ -16,10 +16,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { ext { - kotlin_version = "1.5.0" - lifecycle_version = '2.3.1' - nav_version = '2.3.5' - room_version = '2.3.0' + kotlin_version = "1.6.20" + lifecycle_version = '2.4.1' + nav_version = '2.4.2' + room_version = '2.4.2' } repositories { @@ -27,8 +27,8 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:4.1.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20" + classpath 'com.android.tools.build:gradle:7.1.3' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a7e91f0..ae10964 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Aug 09 14:37:25 PDT 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME