From 1c01f5bf19c6a585ff42fe262c1eb84f7429e22a Mon Sep 17 00:00:00 2001 From: Stefan Date: Sun, 8 Aug 2021 09:06:24 +0200 Subject: [PATCH] Updated Dependencies. --- .idea/gradle.xml | 3 +- .idea/misc.xml | 7 +++++ .idea/runConfigurations.xml | 13 --------- app/build.gradle | 35 ++++++++++++++---------- build.gradle | 4 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 .idea/runConfigurations.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 23a89bb..2c7e034 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,7 +4,7 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index 860da66..66ddcf5 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,12 @@ + + + diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index e497da9..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 7ec280f..84839e3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,8 +1,15 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: "kotlin-kapt" -apply plugin: "androidx.navigation.safeargs.kotlin" -apply plugin: "kotlin-parcelize" +//apply plugin: 'com.android.application' +//apply plugin: 'kotlin-android' +//apply plugin: "kotlin-kapt" +//apply plugin: "androidx.navigation.safeargs.kotlin" +//apply plugin: "kotlin-parcelize" +plugins { + id('com.android.application') + id('kotlin-android') + id('kotlin-kapt') + id('androidx.navigation.safeargs.kotlin') + id('kotlin-parcelize') +} android { compileSdkVersion 30 @@ -26,8 +33,8 @@ android { } buildFeatures{ - dataBinding = true - viewBinding = true + dataBinding true + viewBinding true } compileOptions { @@ -42,13 +49,13 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) - implementation 'androidx.core:core-ktx:1.5.0' - implementation 'androidx.appcompat:appcompat:1.3.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + implementation 'androidx.core:core-ktx:1.6.0' + implementation 'androidx.appcompat:appcompat:1.3.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' // Navigation Component implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5' @@ -66,7 +73,7 @@ dependencies { implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1" // Kotlin components - api "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0-native-mt" - api "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0-native-mt" + api "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0" + api "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0" } \ No newline at end of file diff --git a/build.gradle b/build.gradle index a2a17be..6068c51 100644 --- a/build.gradle +++ b/build.gradle @@ -6,9 +6,9 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.0.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.10" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 664d9cf..7708f4e 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.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip