Merge pull request #1065 from Arneball/master
This commit is contained in:
commit
873b7fd0bd
2 changed files with 22 additions and 10 deletions
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -8,13 +8,15 @@
|
|||
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
|
||||
|
||||
<uses-feature android:name="android.hardware.bluetooth" android:required="true" />
|
||||
|
||||
<application
|
||||
android:allowBackup="true"
|
||||
android:icon="@drawable/ic_launcher"
|
||||
android:label="@string/app_name"
|
||||
android:theme="@style/AppTheme" >
|
||||
|
||||
<uses-library android:name="s1"/>
|
||||
<uses-library android:name="s2"/>
|
||||
<uses-library android:name="s3"/>
|
||||
<activity
|
||||
android:name=".activities.MainActivity"
|
||||
android:label="@string/app_name"
|
||||
|
|
Reference in a new issue