From 646f3c7c111ce92aae3663376b357bbad054c75f Mon Sep 17 00:00:00 2001 From: Martijn van Welie Date: Mon, 14 Jun 2021 07:30:29 +0200 Subject: [PATCH] More Gradle updates --- app/build.gradle | 5 ++--- blessed/build.gradle | 6 ++---- build.gradle | 9 ++++----- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 843eef0..59c6c91 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,9 +36,8 @@ dependencies { implementation project(':blessed') testImplementation 'junit:junit:4.13.2' implementation "androidx.core:core-ktx:1.5.0" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3-native-mt" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3-native-mt" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0-native-mt" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0-native-mt" } repositories { mavenCentral() diff --git a/blessed/build.gradle b/blessed/build.gradle index 0055730..96cdc77 100644 --- a/blessed/build.gradle +++ b/blessed/build.gradle @@ -32,15 +32,13 @@ android { dependencies { implementation 'com.jakewharton.timber:timber:4.7.1' - implementation 'org.jetbrains:annotations:19.0.0' testImplementation 'junit:junit:4.13.2' testImplementation "org.robolectric:robolectric:4.5.1" testImplementation "org.mockito:mockito-core:3.8.0" testImplementation 'androidx.test:core:1.3.0' implementation "androidx.core:core-ktx:1.5.0" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3-native-mt" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3-native-mt" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0-native-mt" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0-native-mt" } repositories { mavenCentral() diff --git a/build.gradle b/build.gradle index 4e4e168..05e6a94 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.5.0' + ext.kotlin_version = '1.5.10' repositories { google() - jcenter() - + mavenCentral() } + dependencies { classpath 'com.android.tools.build:gradle:4.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -19,8 +19,7 @@ buildscript { allprojects { repositories { google() - jcenter() - + mavenCentral() } }