From 94891f4c3213a089ea56220c793ee60fc852ffba Mon Sep 17 00:00:00 2001 From: "abanoubcs@gmail.com" Date: Mon, 8 Feb 2021 19:28:56 +0200 Subject: [PATCH] v5 update gradle --- app/build.gradle | 16 ++++++++-------- build.gradle | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 4 ++-- labyrinth/build.gradle | 8 ++++---- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 077c1e1..76a5b57 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,7 +6,7 @@ apply plugin: 'kotlin-android-extensions' android { compileSdkVersion 30 - buildToolsVersion "30.0.2" + buildToolsVersion "30.0.3" defaultConfig { applicationId "org.abanoubmilad.labyrinth" minSdkVersion 21 @@ -30,20 +30,20 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'androidx.core:core-ktx:1.3.1' - implementation 'com.google.android.material:material:1.2.1' - implementation 'androidx.constraintlayout:constraintlayout:2.0.1' + implementation 'androidx.core:core-ktx:1.3.2' + implementation 'com.google.android.material:material:1.3.0' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' // test // Required -- JUnit 4 framework - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13.1' // Optional -- Robolectric environment testImplementation 'androidx.test:core:1.3.0' // Optional -- Mockito framework - testImplementation 'org.mockito:mockito-core:2.19.0' + testImplementation 'org.mockito:mockito-core:2.21.0' // Once https://issuetracker.google.com/127986458 is fixed this can be testImplementation implementation 'android.arch.core:core-testing:1.1.1' @@ -59,7 +59,7 @@ dependencies { androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0' // Robolectric - testImplementation "org.robolectric:robolectric:3.3.2" + testImplementation "org.robolectric:robolectric:4.4" implementation project(':labyrinth') } diff --git a/build.gradle b/build.gradle index e44f34d..9d4cb94 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,15 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.72' - ext.libraryVersion= '0.4' + ext.kotlin_version = '1.4.30' + ext.libraryVersion= '0.5' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.1' + classpath 'com.android.tools.build:gradle:4.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // 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 d116671..38d4602 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Sep 17 18:22:43 EET 2020 +#Mon Feb 08 19:28:30 EET 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip diff --git a/labyrinth/build.gradle b/labyrinth/build.gradle index 1dd7dcb..44ad2bb 100644 --- a/labyrinth/build.gradle +++ b/labyrinth/build.gradle @@ -11,7 +11,7 @@ def libraryArtifactId = 'labyrinth' android { compileSdkVersion 30 - buildToolsVersion "30.0.2" + buildToolsVersion "30.0.3" defaultConfig { @@ -35,13 +35,13 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'androidx.core:core-ktx:1.3.1' + implementation 'androidx.core:core-ktx:1.3.2' implementation 'androidx.fragment:fragment-ktx:1.2.5' implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0' - implementation 'com.google.android.material:material:1.2.1' + implementation 'com.google.android.material:material:1.3.0' }