From 64bdd7e731c11407bfe6b8b1ec6a254ffb989057 Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Wed, 22 Oct 2014 12:38:44 -0400 Subject: Use Gradle build system --- build.gradle | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 build.gradle (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..8942ba1c --- /dev/null +++ b/build.gradle @@ -0,0 +1,16 @@ +// Top-level build file where you can add configuration options common to all +// sub-projects/modules. +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.12.2' + } +} + +allprojects { + repositories { + jcenter() + } +} -- cgit v1.2.3 From 07b47172a08c01c248c6f69bae48d9e60695a14b Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Wed, 22 Oct 2014 15:39:53 -0400 Subject: Add build deps and move build props to build file --- build.gradle | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 50 insertions(+), 9 deletions(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index 8942ba1c..ab032571 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,57 @@ // Top-level build file where you can add configuration options common to all // sub-projects/modules. buildscript { - repositories { - jcenter() - } - dependencies { - classpath 'com.android.tools.build:gradle:0.12.2' - } + repositories { + jcenter() + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.12.2' + } } allprojects { - repositories { - jcenter() - } + repositories { + jcenter() + mavenCentral() + } +} + +apply plugin: 'android' + +repositories { + mavenCentral() +} + +android { + compileSdkVersion 19 + buildToolsVersion "19.1" + + defaultConfig { + minSdkVersion 14 + targetSdkVersion 19 + versionCode 32 + versionName "0.8-alpha" + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + buildTypes { + release { + runProguard true + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + debug { + runProguard false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + } +} + +dependencies { + // ToDo: Move libs here if possible (instead of including the jars) + "compile 'com.android.support:support-v13:19.1.0'" + compile fileTree(dir: 'libs', include: ['*.jar']) } -- cgit v1.2.3 From 281ce3105fad5f012471cf3e5062a4032dfbc7a6 Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Wed, 22 Oct 2014 15:44:55 -0400 Subject: Make conversations the root project --- build.gradle | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index ab032571..2352b116 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,11 @@ android { } dependencies { - // ToDo: Move libs here if possible (instead of including the jars) - "compile 'com.android.support:support-v13:19.1.0'" + compile project(':minidns') + compile project(':openpgpapilib') + compile project(':memorizingTrustManager') + compile 'com.android.support:support-v13:19.1.0' + // compile files('libs/bcprov-jdk15on-150.jar') + // compile files('libs/otr4j-0.10.jar') compile fileTree(dir: 'libs', include: ['*.jar']) } -- cgit v1.2.3 From 1f49e99c460be1a4987bbb3b77753c667410294c Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Wed, 22 Oct 2014 18:17:49 -0400 Subject: Suppress lint errors and remove bcprov --- build.gradle | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index 2352b116..95e10738 100644 --- a/build.gradle +++ b/build.gradle @@ -20,9 +20,19 @@ allprojects { apply plugin: 'android' repositories { + jcenter() mavenCentral() } +dependencies { + compile project(':minidns') + compile project(':openpgpapilib') + compile project(':memorizingTrustManager') + compile 'com.android.support:support-v13:19.1.0' + compile 'org.bouncycastle:bcprov-jdk15on:1.50' + compile fileTree(dir: 'libs', include: ['*.jar']) +} + android { compileSdkVersion 19 buildToolsVersion "19.1" @@ -40,22 +50,24 @@ android { } buildTypes { release { - runProguard true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' - } - debug { runProguard false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } -} + lintOptions { + disable 'MissingTranslation', 'InvalidPackage' + } + subprojects { -dependencies { - compile project(':minidns') - compile project(':openpgpapilib') - compile project(':memorizingTrustManager') - compile 'com.android.support:support-v13:19.1.0' - // compile files('libs/bcprov-jdk15on-150.jar') - // compile files('libs/otr4j-0.10.jar') - compile fileTree(dir: 'libs', include: ['*.jar']) + afterEvaluate { + if (getPlugins().hasPlugin('android') || + getPlugins().hasPlugin('android-library')) { + + configure(android.lintOptions) { + disable 'AndroidGradlePluginVersion', 'MissingTranslation' + } + } + + } + } } -- cgit v1.2.3 From 5f4b6e39bcf96435acb79dcf8c660b0819232544 Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Wed, 22 Oct 2014 18:22:49 -0400 Subject: Use proguard on release builds We don't need obfuscation (it's an open source project), but proguard wil shrink the apk by stripping out unused code. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index 95e10738..6a91ef52 100644 --- a/build.gradle +++ b/build.gradle @@ -50,7 +50,7 @@ android { } buildTypes { release { - runProguard false + runProguard true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } -- cgit v1.2.3 From 7f484513bea3bae502aee90278dd5b2808f34266 Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Sun, 26 Oct 2014 08:54:41 -0400 Subject: Pull otr4j form Maven repo --- build.gradle | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index 6a91ef52..affdc304 100644 --- a/build.gradle +++ b/build.gradle @@ -22,6 +22,9 @@ apply plugin: 'android' repositories { jcenter() mavenCentral() + maven { + url "http://jitsi.github.com/otr4j/repository/" + } } dependencies { @@ -30,6 +33,7 @@ dependencies { compile project(':memorizingTrustManager') compile 'com.android.support:support-v13:19.1.0' compile 'org.bouncycastle:bcprov-jdk15on:1.50' + compile 'net.java:otr4j:0.10' compile fileTree(dir: 'libs', include: ['*.jar']) } -- cgit v1.2.3 From c83e49d1b8863598d7b8718148234f9521c5c83d Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Sun, 26 Oct 2014 09:05:12 -0400 Subject: Update otr4j to 0.21 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index affdc304..d6838b35 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ dependencies { compile project(':memorizingTrustManager') compile 'com.android.support:support-v13:19.1.0' compile 'org.bouncycastle:bcprov-jdk15on:1.50' - compile 'net.java:otr4j:0.10' + compile 'net.java:otr4j:0.21' compile fileTree(dir: 'libs', include: ['*.jar']) } -- cgit v1.2.3 From 90898ec3d440a5ebce99724d31954e583ea9f227 Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Sun, 26 Oct 2014 09:11:28 -0400 Subject: Add some logic for signing releases --- build.gradle | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index d6838b35..c46df4c7 100644 --- a/build.gradle +++ b/build.gradle @@ -52,15 +52,44 @@ android { sourceCompatibility JavaVersion.VERSION_1_7 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 + // + if (project.hasProperty('mStoreFile') && + project.hasProperty('mStorePassword') && + project.hasProperty('mKeyAlias') && + project.hasProperty('mKeyPassword')) { + signingConfigs { + release { + storeFile file(mStoreFile) + storePassword mStorePassword + keyAlias mKeyAlias + keyPassword mKeyPassword + } + } + buildTypes.release.signingConfig = signingConfigs.release + } else { + buildTypes.release.signingConfig = null + } + buildTypes { release { runProguard true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } + lintOptions { disable 'MissingTranslation', 'InvalidPackage' } + subprojects { afterEvaluate { -- cgit v1.2.3 From a6d0042e5c595cf7d6d19a2c3afd3c9309727212 Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Sun, 26 Oct 2014 09:35:11 -0400 Subject: Move submodules back to libs/ --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index c46df4c7..37d59089 100644 --- a/build.gradle +++ b/build.gradle @@ -28,9 +28,9 @@ repositories { } dependencies { - compile project(':minidns') - compile project(':openpgpapilib') - compile project(':memorizingTrustManager') + compile project(':libs/minidns') + compile project(':libs/openpgp-api-lib') + compile project(':libs/MemorizingTrustManager') compile 'com.android.support:support-v13:19.1.0' compile 'org.bouncycastle:bcprov-jdk15on:1.50' compile 'net.java:otr4j:0.21' -- cgit v1.2.3 From 4024136b1c6ac55b68dcce0cc6c4c4a9a9e59143 Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Sun, 26 Oct 2014 10:14:38 -0400 Subject: Use full URI for android application Gradle plugin --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index 37d59089..9139a6ae 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ allprojects { } } -apply plugin: 'android' +apply plugin: 'com.android.application' repositories { jcenter() -- cgit v1.2.3 From ef25720f0fda2e46e82e1e4b66607c42afe91170 Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Sun, 26 Oct 2014 10:22:37 -0400 Subject: Include build number in output of release builds --- build.gradle | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index 9139a6ae..68b1b2f2 100644 --- a/build.gradle +++ b/build.gradle @@ -84,6 +84,18 @@ android { runProguard true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } + applicationVariants.all { variant -> + def fileName = variant.packageApplication.outputFile.name.replace(".apk", + "-" + defaultConfig.versionName + ".apk") + variant.packageApplication.outputFile = new + File(variant.packageApplication.outputFile.parent, fileName) + if (variant.zipAlign) { + if (variant.name.equals('release')) { + variant.outputFile = new File(variant.outputFile.parent, + rootProject.name + "-" + defaultConfig.versionName + ".apk") + } + } + } } lintOptions { -- cgit v1.2.3