From 765baa636ea98a303b5ea5e78f86d6f545bb4983 Mon Sep 17 00:00:00 2001 From: Suresh Maidaragi Date: Fri, 3 Sep 2021 07:08:17 +0530 Subject: [PATCH] Update dependencies --- app/app.iml | 2 +- app/build.gradle | 22 +++++++++++++--------- app/src/main/res/layout/activity_main.xml | 4 ---- build.gradle | 4 ++-- circulartimerview/circulartimerview.iml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/app.iml b/app/app.iml index f743c30..1ce0f7b 100644 --- a/app/app.iml +++ b/app/app.iml @@ -1,5 +1,5 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 20c9a14..1798efd 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,12 +4,12 @@ apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 29 - buildToolsVersion "29.0.0" + compileSdkVersion 30 + buildToolsVersion "29.0.3" defaultConfig { applicationId "com.view.example" minSdkVersion 15 - targetSdkVersion 29 + targetSdkVersion 30 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -20,18 +20,22 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.appcompat:appcompat:1.3.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.0' testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + androidTestImplementation 'androidx.test:runner:1.4.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' implementation project(path: ':circulartimerview') - implementation "androidx.core:core-ktx:$kotlin_core_ktx" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'androidx.core:core-ktx:1.6.0' + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.31' } repositories { mavenCentral() diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 43146d2..f809001 100755 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -40,8 +40,4 @@ app:startingPoint="top" app:textSize="18sp"/> - - - - \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8f9a587..fd0e7d9 100755 --- a/build.gradle +++ b/build.gradle @@ -9,9 +9,9 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.3' + classpath 'com.android.tools.build:gradle:3.5.4' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/circulartimerview/circulartimerview.iml b/circulartimerview/circulartimerview.iml index 198fa27..6e930a2 100644 --- a/circulartimerview/circulartimerview.iml +++ b/circulartimerview/circulartimerview.iml @@ -1,5 +1,5 @@ - + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e91b34..4bd4cca 100755 --- 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-6.9-all.zip