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

Updated dependencies.

This commit is contained in:
Felix Ableitner 2015-04-14 22:09:47 +02:00
parent 2de8707844
commit 7bc7d01488
6 changed files with 19 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
app/build.gradle
View File

@ -6,46 +6,36 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "jp.leafytree.gradle:gradle-android-scala-plugin:1.3.2"
classpath "jp.leafytree.gradle:gradle-android-scala-plugin:1.4"
}
}
dependencies {
compile "com.android.support:support-v4:21.0.3"
// For `flat` debug config, as `flatProvided` is unknown.
provided "org.scala-lang:scala-library:2.11.6"
debugCompile "org.scala-lang:scala-library:2.11.6"
releaseCompile "org.scala-lang:scala-library:2.11.6"
compile "com.android.support:support-v4:22.0.0"
compile 'com.android.support:multidex:1.0.1'
androidTestCompile "com.android.support:multidex-instrumentation:1.0.1", { exclude module: "multidex" }
compile "org.scala-lang:scala-library:2.11.6"
compile 'com.google.guava:guava:18.0'
}
android {
compileSdkVersion 21
buildToolsVersion "21.1.2"
compileSdkVersion 22
buildToolsVersion "22.0.1"
defaultConfig {
applicationId "com.nutomic.ensichat"
minSdkVersion 15
targetSdkVersion 21
targetSdkVersion 22
versionCode 3
versionName "0.1.2"
}
sourceSets {
main.scala.srcDir "src/main/scala"
androidTest.scala.srcDir "src/androidTest/scala"
multiDexEnabled true
testInstrumentationRunner "com.android.test.runner.MultiDexTestRunner"
}
buildTypes {
thin {
applicationIdSuffix ".debug"
minifyEnabled false
signingConfig signingConfigs.debug
}
debug {
applicationIdSuffix ".debug"
minifyEnabled true
proguardFile file("proguard-rules.pro")
minifyEnabled false
testCoverageEnabled true
}
release {
minifyEnabled true
@ -53,15 +43,10 @@ android {
}
}
// Needed to rename `app-thin.apk` to `app-debug.apk` (because Android Studio doesn't let us
// specify a different apk name).
/*
applicationVariants.all { variant ->
def apk = variant.outputFile;
def newName = apk.name.replace("app-thin", "app-debug");
variant.outputFile = new File(apk.parentFile, newName);
productFlavors {
dev.minSdkVersion 19 // TODO: Change to 21 to reduce compilation time
rel.minSdkVersion 15
}
*/
// Avoid duplicate file errors during packaging.
packagingOptions {

2
app/src/androidTest/scala/com/nutomic/ensichat/protocol/messages/ResultAddContactTest.scala
View File

@ -15,4 +15,4 @@ class ResultAddContactTest extends AndroidTestCase {
}
}
}
}

1
app/src/main/AndroidManifest.xml
View File

@ -10,6 +10,7 @@
<uses-feature android:name="android.hardware.bluetooth" android:required="true" />
<application
android:name="android.support.multidex.MultiDexApplication"
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"

13
app/src/thin/AndroidManifest.xml
View File

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.nutomic.ensichat">
<application>
<uses-library android:name="s1" />
<uses-library android:name="s2" />
<uses-library android:name="s3" />
</application>
</manifest>

2
build.gradle
View File

@ -6,7 +6,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.0.1'
classpath 'com.android.tools.build:gradle:1.1.0'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.8'
// NOTE: Do not place your application dependencies here; they belong

2
gradle/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -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-2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip