update Commons, Gradle etc

This commit is contained in:
tibbi 2017-11-21 13:55:19 +01:00
parent b18f0cc4a3
commit 38785577b9
3 changed files with 14 additions and 21 deletions

View File

@ -3,15 +3,16 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android-extensions'
android { android {
compileSdkVersion 26 compileSdkVersion 27
buildToolsVersion "26.0.2" buildToolsVersion "27.0.1"
defaultConfig { defaultConfig {
applicationId "com.simplemobiletools.camera" applicationId "com.simplemobiletools.camera"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 26 targetSdkVersion 27
versionCode 48 versionCode 48
versionName "2.5.0" versionName "2.5.0"
setProperty("archivesBaseName", "draw")
} }
signingConfigs { signingConfigs {
@ -37,23 +38,10 @@ android {
} }
dependencies { dependencies {
compile 'com.simplemobiletools:commons:2.35.4' compile 'com.simplemobiletools:commons:2.41.5'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
} }
buildscript { Properties props = new Properties()
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()
def propFile = new File('signing.properties') def propFile = new File('signing.properties')
if (propFile.canRead()) { if (propFile.canRead()) {
props.load(new FileInputStream(propFile)) props.load(new FileInputStream(propFile))

View File

@ -1,11 +1,16 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.kotlin_version = '1.1.60'
repositories { repositories {
jcenter() jcenter()
google()
} }
dependencies { 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 // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
@ -15,8 +20,8 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
jcenter() jcenter()
google()
maven { url 'https://jitpack.io' } maven { url 'https://jitpack.io' }
maven { url "https://maven.google.com" }
} }
} }

View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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