diff --git a/app/build.gradle b/app/build.gradle index a103f96..ccb1a62 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,20 +1,17 @@ -apply plugin: 'com.android.application' -apply plugin: 'jp.leafytree.android-scala' - buildscript { repositories { mavenCentral() } dependencies { + classpath "com.android.tools.build:gradle:0.14.4" classpath "jp.leafytree.gradle:gradle-android-scala-plugin:1.3.1" } } - -dependencies { - compile "com.android.support:support-v4:21.0.0" - compile "org.scala-lang:scala-library:2.11.4" - compile "org.msgpack:msgpack-scala_2.11:0.6.11" +repositories { + jcenter() } +apply plugin: 'com.android.application' +apply plugin: 'jp.leafytree.android-scala' android { compileSdkVersion 21 @@ -44,7 +41,7 @@ android { buildTypes { debug { - minifyEnabled true +// minifyEnabled true proguardFile file("proguard-rules.pro") applicationIdSuffix ".debug" } @@ -62,3 +59,16 @@ android { exclude 'META-INF/NOTICE' } } + +dependencies { + compile "com.android.support:support-v4:21.+" + provided "org.scala-lang:scala-library:2.11.4" + compile("org.msgpack:msgpack-scala_2.11:0.6.11") { + transitive = false; + } + compile('org.msgpack:msgpack:0.6.11'){ + transitive = false; + } +} + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c7783cd..3049328 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -8,13 +8,15 @@ - + + +