nutomic/ensichat
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Updated dependencies, downgrade scala for incremental compiles.

Browse source
This commit is contained in:
Felix Ableitner 2014-11-04 13:51:48 +02:00
parent 137f337cfe
commit bf7aab1e11
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/build.gradle
View file

@ -1,23 +1,23 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
apply plugin: 'android-scala' apply plugin: 'jp.leafytree.android-scala'
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath "jp.leafytree.gradle:gradle-android-scala-plugin:1.0" classpath "jp.leafytree.gradle:gradle-android-scala-plugin:1.2.1"
} }
} }
dependencies { 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" compile "org.msgpack:msgpack-scala_2.11:0.6.11"
} }
android { android {
compileSdkVersion 21 compileSdkVersion 21
buildToolsVersion "19.1.0" buildToolsVersion "21.1.0"
defaultConfig { defaultConfig {
applicationId "com.nutomic.ensichat" applicationId "com.nutomic.ensichat"
@ -43,12 +43,12 @@ android {
buildTypes { buildTypes {
debug { debug {
runProguard true minifyEnabled true
proguardFile file("proguard-rules.pro") proguardFile file("proguard-rules.pro")
applicationIdSuffix ".debug" applicationIdSuffix ".debug"
} }
release { release {
runProguard true minifyEnabled true
proguardFile file("proguard-rules.pro") proguardFile file("proguard-rules.pro")
} }
} }
@ -57,5 +57,7 @@ android {
packagingOptions { packagingOptions {
exclude 'decoder.properties' exclude 'decoder.properties'
exclude 'rootdoc.txt' exclude 'rootdoc.txt'
exclude 'META-INF/LICENSE'
exclude 'META-INF/NOTICE'
} }
} }

4
build.gradle
View file

@ -1,11 +1,13 @@
// 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.
apply plugin: 'com.github.ben-manes.versions'
buildscript { buildscript {
repositories { repositories {
jcenter() jcenter()
} }
dependencies { 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 // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files