aboutsummaryrefslogtreecommitdiffstats
path: root/build.gradle
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-03-06 19:42:55 +0100
committerlookshe <github@lookshe.org>2016-03-06 19:42:55 +0100
commit3c400703e082a1b180b35d891b8fb3460c7d5b87 (patch)
tree28738dd90fc41b4ab71897f38d324828778ad2e3 /build.gradle
parent72114d732427266024cdd6e27cd8d1aa60afae2f (diff)
parentf28d77dc42f6bac5a026e0b1c78562dee8de45ac (diff)
Merge branch 'trz/rebase' into trz/rename
Diffstat (limited to 'build.gradle')
-rw-r--r--build.gradle63
1 files changed, 35 insertions, 28 deletions
diff --git a/build.gradle b/build.gradle
index cbd03497..e0fd0355 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,14 +6,12 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.2.3'
+ classpath 'com.android.tools.build:gradle:1.3.1'
}
}
allprojects {
repositories {
- jcenter()
- mavenCentral()
}
}
@@ -21,25 +19,35 @@ apply plugin: 'com.android.application'
repositories {
flatDir {
- dirs 'libs/3rdParty', 'libs/3rdParty/zxing'
+ dirs 'libs/3rdParty/jcenter', 'libs/3rdParty/maven'
}
}
dependencies {
// Local JAR files
//compile fileTree(dir: 'libs/zxing', includes: ['core-3.1.0.jar', 'android-integration-3.1.0.jar'])
- compile name: 'core-3.1.0' //zxing
- compile name: 'android-integration-3.1.0' //zxing
+ compile name: 'zxing-core-3.2.1' //zxing
+ compile name: 'zxing-android-integration-3.2.1' //zxing
compile name: 'libidn-1.15'
- compile name: 'minidns-0.1.3'
+ compile name: 'minidns-0.1.7'
compile name: 'org.otr4j-0.22'
- compile name: 'bcprov-jdk15on-1.51'
+ compile name: 'bcprov-jdk15on-1.52'
+ compile name: 'bcmail-jdk15on-1.52'
+ compile name: 'bcpkix-jdk15on-1.52'
compile name: 'EnhancedListView-0.3.4', ext: 'aar'
- compile name: 'ShortcutBadger-1.1.1', ext: 'aar'
+ compile name: 'ShortcutBadger-1.1.3', ext: 'aar'
compile name: 'swipy-1.2.1', ext: 'aar'
+ compile name: 'axolotl-android-1.3.4', ext: 'aar'
+ compile name: 'axolotl-java-1.3.4'
+ compile name: 'curve25519-android-0.2.4', ext: 'aar' // axolotl, loaded from jcenter
+ compile name: 'curve25519-java-0.2.4' // axolotl, loaded from jcenter
+ compile name: 'protobuf-java-2.5.0' // axolotl, loaded from maven
+ compile name: 'android-crop-1.0.1', ext: 'aar'
+ compile name: 'roundedimageview-2.2.0', ext: 'aar'
+ compile name: 'switchbutton-1.2.8', ext: 'aar' // loaded from jcenter
+ compile name: 'openpgp-api-10.0', ext: 'aar' // loaded from jcenter
// Local modules
- compile project(':libs:openpgp-api-lib')
compile project(':libs:MemorizingTrustManager')
compile project(':libs:emojicon')
compile project(':libs:colorpicker')
@@ -50,14 +58,15 @@ dependencies {
}
android {
- compileSdkVersion 22
- buildToolsVersion "22.0.1"
+ compileSdkVersion 23
+ buildToolsVersion "23.0.2"
defaultConfig {
minSdkVersion 14
- targetSdkVersion 21
- versionCode 5
- versionName "0.0.5"
+ targetSdkVersion 23
+ versionCode 128
+ versionName "1.10.1.1"
+ archivesBaseName += "-$versionName"
}
compileOptions {
@@ -65,15 +74,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_7
}
- //
- // To sign release builds, create the file `gradle.properties` in
- // $HOME/.gradle or in your project directory with this content:
- //
- // mStoreFile=/path/to/key.store
- // mStorePassword=xxx
- // mKeyAlias=alias
- // mKeyPassword=xxx
- //
+ productFlavors {
+ playstore
+ free
+ }
if (project.hasProperty('mStoreFile') &&
project.hasProperty('mStorePassword') &&
project.hasProperty('mKeyAlias') &&
@@ -95,16 +99,14 @@ android {
if (variant.name.equals('release')) {
variant.outputs.each { output ->
if (output.zipAlign != null) {
- output.zipAlign.outputFile = new File(output.outputFile.parent, "ConversationsPlus-${variant.versionName}.apk")
+ output.zipAlign.outputFile = new File(output.outputFile.parent, rootProject.name + "-${variant.versionName}.apk")
}
- output.packageApplication.outputFile = new File(output.outputFile.parent, output.packageApplication.outputFile.name
- .replace(".apk", "-${variant.versionName}.apk"))
}
}
}
lintOptions {
- disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity'
+ disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource'
}
subprojects {
@@ -120,4 +122,9 @@ android {
}
}
+
+ packagingOptions {
+ exclude 'META-INF/BCKEY.DSA'
+ exclude 'META-INF/BCKEY.SF'
+ }
}