Updated dependencies, downgrade scala for incremental compiles.
This commit is contained in:
parent
137f337cfe
commit
bf7aab1e11
2 changed files with 11 additions and 7 deletions
|
@ -1,23 +1,23 @@
|
|||
apply plugin: 'com.android.application'
|
||||
apply plugin: 'android-scala'
|
||||
apply plugin: 'jp.leafytree.android-scala'
|
||||
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath "jp.leafytree.gradle:gradle-android-scala-plugin:1.0"
|
||||
classpath "jp.leafytree.gradle:gradle-android-scala-plugin:1.2.1"
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.scala-lang:scala-library:2.11.2"
|
||||
compile "org.scala-lang:scala-library:2.10.4"
|
||||
compile "org.msgpack:msgpack-scala_2.11:0.6.11"
|
||||
}
|
||||
|
||||
android {
|
||||
compileSdkVersion 21
|
||||
buildToolsVersion "19.1.0"
|
||||
buildToolsVersion "21.1.0"
|
||||
|
||||
defaultConfig {
|
||||
applicationId "com.nutomic.ensichat"
|
||||
|
@ -43,12 +43,12 @@ android {
|
|||
|
||||
buildTypes {
|
||||
debug {
|
||||
runProguard true
|
||||
minifyEnabled true
|
||||
proguardFile file("proguard-rules.pro")
|
||||
applicationIdSuffix ".debug"
|
||||
}
|
||||
release {
|
||||
runProguard true
|
||||
minifyEnabled true
|
||||
proguardFile file("proguard-rules.pro")
|
||||
}
|
||||
}
|
||||
|
@ -57,5 +57,7 @@ android {
|
|||
packagingOptions {
|
||||
exclude 'decoder.properties'
|
||||
exclude 'rootdoc.txt'
|
||||
exclude 'META-INF/LICENSE'
|
||||
exclude 'META-INF/NOTICE'
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,11 +1,13 @@
|
|||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
apply plugin: 'com.github.ben-manes.versions'
|
||||
|
||||
buildscript {
|
||||
repositories {
|
||||
jcenter()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:0.13.3'
|
||||
classpath 'com.android.tools.build:gradle:0.14.1'
|
||||
classpath 'com.github.ben-manes:gradle-versions-plugin:0.5'
|
||||
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
// in the individual module build.gradle files
|
||||
|
|
Reference in a new issue