From 6dc4408f78ffd0a9862c2a3af59581137f70e450 Mon Sep 17 00:00:00 2001 From: beyondeye Date: Sun, 20 Jan 2019 16:39:05 +0200 Subject: [PATCH] android studio -> 3.3.0 gradle -> 4.10.1 target sdk -> 28 kotin -> 1.3.11 android support libs -> 28.0.0 kjsonpatch -> 0.3.21 --- build.gradle | 6 +++--- buildsystem/dependencies.gradle | 12 ++++++------ example/counter-android/build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 79e4c27..f3da242 100644 --- a/build.gradle +++ b/build.gradle @@ -134,13 +134,13 @@ buildscript { // mavenCentral() } rootProject.ext.versions = [ - kotlin: '1.3.0', + kotlin: '1.3.11', dokka: '0.9.17' ] dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$rootProject.versions.kotlin" - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.3' classpath "com.github.dcendents:android-maven-gradle-plugin:2.0" classpath "org.jetbrains.dokka:dokka-gradle-plugin:$rootProject.versions.dokka" @@ -154,5 +154,5 @@ task clean(type: Delete) { //task for updating gradle task wrapper(type: Wrapper) { - gradleVersion = '4.6' + gradleVersion = '4.10.1' } diff --git a/buildsystem/dependencies.gradle b/buildsystem/dependencies.gradle index 5223c0f..86a3dbd 100644 --- a/buildsystem/dependencies.gradle +++ b/buildsystem/dependencies.gradle @@ -14,16 +14,16 @@ allprojects { ext.versions = [ minSdk : 16, - targetSdk : 27, - compileSdk : 27, + targetSdk : 28, + compileSdk : 28, // buildTools : '26.0.2', - kotlin : '1.3.0', + kotlin : '1.3.11', //https://github.com/Kotlin/kotlinx.coroutines/releases - kotlin_coroutines : '1.0.0', + kotlin_coroutines : '1.1.0', // UI libs. //https://developer.android.com/topic/libraries/support-library/revisions.html - supportLibs : '27.1.1', + supportLibs : '28.0.0', supportxLibs : '1.0.0', //androidx @@ -40,7 +40,7 @@ ext.versions = [ rxAndroid2 : '2.0.1', //dario libs - kjsonpatch : '0.3.20', + kjsonpatch : '0.3.21', // Others. kovenant : '3.3.0', diff --git a/example/counter-android/build.gradle b/example/counter-android/build.gradle index e1bc39e..2a56290 100644 --- a/example/counter-android/build.gradle +++ b/example/counter-android/build.gradle @@ -13,7 +13,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_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 6cef056..5b97387 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Oct 02 14:52:15 IDT 2018 +#Sun Jan 20 15:17:08 IST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip