From 38785577b9ba756e7dda255aaf5b49c40a55a34a Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 21 Nov 2017 13:55:19 +0100 Subject: [PATCH] update Commons, Gradle etc --- app/build.gradle | 24 ++++++------------------ build.gradle | 9 +++++++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c5f0e5b4..6d4e105f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,15 +3,16 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 26 - buildToolsVersion "26.0.2" + compileSdkVersion 27 + buildToolsVersion "27.0.1" defaultConfig { applicationId "com.simplemobiletools.camera" minSdkVersion 16 - targetSdkVersion 26 + targetSdkVersion 27 versionCode 48 versionName "2.5.0" + setProperty("archivesBaseName", "draw") } signingConfigs { @@ -37,23 +38,10 @@ android { } dependencies { - compile 'com.simplemobiletools:commons:2.35.4' - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + compile 'com.simplemobiletools:commons:2.41.5' } -buildscript { - ext.kotlin_version = '1.1.51' - repositories { - mavenCentral() - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version" - } -} - -def Properties props = new Properties() +Properties props = new Properties() def propFile = new File('signing.properties') if (propFile.canRead()) { props.load(new FileInputStream(propFile)) diff --git a/build.gradle b/build.gradle index 614265d6..2bf82004 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,16 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { + ext.kotlin_version = '1.1.60' + repositories { jcenter() + google() } + dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.0' + 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 @@ -15,8 +20,8 @@ buildscript { allprojects { repositories { jcenter() + google() maven { url 'https://jitpack.io' } - maven { url "https://maven.google.com" } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0dcb39c9..97318a77 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-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip