Skip to content

Commit

Permalink
update Commons, Gradle etc
Browse files Browse the repository at this point in the history
  • Loading branch information
tibbi committed Nov 21, 2017
1 parent b18f0cc commit 3878557
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 21 deletions.
24 changes: 6 additions & 18 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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))
Expand Down
9 changes: 7 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -15,8 +20,8 @@ buildscript {
allprojects {
repositories {
jcenter()
google()
maven { url 'https://jitpack.io' }
maven { url "https://maven.google.com" }
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 3878557

Please sign in to comment.