From a968260b188f0a00772997ce500ca760337b6705 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 4 Apr 2016 21:25:44 +0200 Subject: fixing travis --- build.gradle | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index bcdff444..5a05e95b 100644 --- a/build.gradle +++ b/build.gradle @@ -51,6 +51,12 @@ dependencies { playstoreCompile 'com.google.android.gms:play-services-gcm:8.4.0' } +ext { + travisBuild = System.getenv("TRAVIS") == "true" + // allows for -Dpre-dex=false to be set + preDexEnabled = "true".equals(System.getProperty("pre-dex", "true")) +} + android { compileSdkVersion 23 buildToolsVersion "23.0.2" @@ -64,6 +70,11 @@ android { applicationId "eu.siacs.conversations" } + dexOptions { + // Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false. + preDexLibraries = preDexEnabled && !travisBuild + } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7 -- cgit v1.2.3 From b4ad2de2e5a3e8da72f2cab733e255e1a48f9e4b Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 5 Apr 2016 23:10:55 +0200 Subject: version bump to 1.11.4 + changelog --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index 5a05e95b..b1570f1d 100644 --- a/build.gradle +++ b/build.gradle @@ -64,8 +64,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 23 - versionCode 135 - versionName "1.11.3" + versionCode 136 + versionName "1.11.4" archivesBaseName += "-$versionName" applicationId "eu.siacs.conversations" } -- cgit v1.2.3 From 7a84cfdfa28cb9060aa74783455f0745d6ab088b Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 8 Apr 2016 10:41:55 +0200 Subject: version bump to 1.11.5 + changelog --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index b1570f1d..36649f30 100644 --- a/build.gradle +++ b/build.gradle @@ -64,8 +64,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 23 - versionCode 136 - versionName "1.11.4" + versionCode 137 + versionName "1.11.5" archivesBaseName += "-$versionName" applicationId "eu.siacs.conversations" } -- cgit v1.2.3 From c22b3846805af47529d62e1b4d6f58063a241fb6 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 8 Apr 2016 18:29:32 +0200 Subject: increase version code to fix nasty bug in 1.11.5 beta --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index 36649f30..b1e97ecf 100644 --- a/build.gradle +++ b/build.gradle @@ -64,7 +64,7 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 23 - versionCode 137 + versionCode 138 versionName "1.11.5" archivesBaseName += "-$versionName" applicationId "eu.siacs.conversations" -- cgit v1.2.3 From 4652541b61df5490d04cfa9efe57acd0612b3bc5 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 9 Apr 2016 21:47:10 +0200 Subject: update gradle and 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 b1e97ecf..020a87d3 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:2.0.0' } } -- cgit v1.2.3 From 23a0beab43a5f30baf6481afeb9188b86df0b32d Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 10 Apr 2016 21:20:13 +0200 Subject: version bump to 1.11.6 + changelog --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index 020a87d3..a1d5710d 100644 --- a/build.gradle +++ b/build.gradle @@ -64,8 +64,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 23 - versionCode 138 - versionName "1.11.5" + versionCode 139 + versionName "1.11.6" archivesBaseName += "-$versionName" applicationId "eu.siacs.conversations" } -- cgit v1.2.3 From bfe01c432244e04daf6804d5cfc3b838ea247c4b Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 14 Apr 2016 23:13:44 +0200 Subject: version bump to 1.11.7 + changelog --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index a1d5710d..cd1d7186 100644 --- a/build.gradle +++ b/build.gradle @@ -64,8 +64,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 23 - versionCode 139 - versionName "1.11.6" + versionCode 140 + versionName "1.11.7" archivesBaseName += "-$versionName" applicationId "eu.siacs.conversations" } -- cgit v1.2.3