From 3c3421afd8f74a3aa8d1011de07a8c18f9549210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Tue, 8 Apr 2014 12:04:17 +0200 Subject: Rename app->bitmask_android This way, gradle commands generate apks correctly named. --- app/build.gradle | 39 --------------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 app/build.gradle (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle deleted file mode 100644 index d59533ea..00000000 --- a/app/build.gradle +++ /dev/null @@ -1,39 +0,0 @@ -apply plugin: 'android' - -android { - compileSdkVersion 19 - buildToolsVersion "19.0.1" - - defaultConfig { - minSdkVersion 14 - targetSdkVersion 19 - - testPackageName "se.leap.bitmaskclient.test" - testInstrumentationRunner "android.test.InstrumentationTestRunner" - } - - buildTypes { - release { - runProguard false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' - } - } - - lintOptions { - abortOnError false - } - - sourceSets { - main - { - assets.srcDirs = ['assets', 'ovpnlibs/assets'] - jniLibs.srcDirs = ['ovpnlibs/jniLibs'] - jni.srcDirs = [] //disable automatic ndk-build - } - } -} - -dependencies { - androidTestCompile 'com.android.support:support-v4:+' - androidTestCompile 'com.jayway.android.robotium:robotium-solo:4.3.1' -} -- cgit v1.2.3 From 1684c8f398922065a97e7da4dac4ac6a33cc5218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Wed, 9 Apr 2014 16:03:55 +0200 Subject: Back to the standard "app" module. This return to "app" instead of "bitmask_android" is due to this reading: https://developer.android.com/sdk/installing/studio-build.html#projectStructure I'll have to tweak the final apk name in build.gradle. --- app/build.gradle | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 app/build.gradle (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 00000000..d9ff1fdf --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,61 @@ +apply plugin: 'android' + +android { + compileSdkVersion 19 + buildToolsVersion "19.0.1" + + defaultConfig { + minSdkVersion 14 + targetSdkVersion 19 + + testPackageName "se.leap.bitmaskclient.test" + testInstrumentationRunner "android.test.InstrumentationTestRunner" + } + + signingConfigs { + release + } + + buildTypes { + release { + runProguard true + signingConfig signingConfigs.release + } + } + + if (project.hasProperty('storeFile')) { + signingConfigs.release.storeFile = new File(storeFile) + } + + if (project.hasProperty('storePassword')) { + signingConfigs.release.storePassword = storePassword + } + + if (project.hasProperty('keyAlias')) { + signingConfigs.release.keyAlias = keyAlias + } + + if (project.hasProperty('keyPassword')) { + signingConfigs.release.keyPassword = keyPassword + } + + lintOptions { + abortOnError false + } + + sourceSets { + main { + assets.srcDirs = ['assets', 'ovpnlibs/assets'] + jniLibs.srcDirs = ['ovpnlibs/jniLibs'] + jni.srcDirs = [] //disable automatic ndk-build + } + debug { + assets.srcDirs = ['src/debug/assets'] + } + } + } + +dependencies { + androidTestCompile 'com.android.support:support-v4:+' + androidTestCompile 'com.jayway.android.robotium:robotium-solo:4.3.1' +} \ No newline at end of file -- cgit v1.2.3 From f92948d0151ffe0860ebbd2841a56e76c3b5ff9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Thu, 10 Apr 2014 20:34:16 +0200 Subject: Require Build Tools 19.0.3. --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index d9ff1fdf..e53c0f26 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'android' android { compileSdkVersion 19 - buildToolsVersion "19.0.1" + buildToolsVersion "19.0.3" defaultConfig { minSdkVersion 14 -- cgit v1.2.3 From 8aa7eabe7ca81595b307f83ddcb1079ceec6d45b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Thu, 10 Apr 2014 21:32:21 +0200 Subject: Release apk signed with debug key if no keystore You have to edit a gradle.properties file with the following structure: storeFileProperty=fullPath storePasswordProperty=store password without quotation marks keyAliasProperty=key alias without quotation marks keyPasswordProperty=key password without quotation marks --- app/build.gradle | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index e53c0f26..94823b02 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,32 +13,21 @@ android { } signingConfigs { - release + release { + storeFile project.hasProperty('storeFileProperty') ? file(storeFileProperty) : null + storePassword project.hasProperty('storePasswordProperty') ? storePasswordProperty : "" + keyAlias project.hasProperty('keyAliasProperty') ? keyAliasProperty : "" + keyPassword project.hasProperty('keyPasswordProperty') ? keyPasswordProperty : "" + } } buildTypes { release { runProguard true - signingConfig signingConfigs.release + signingConfig signingConfigs.release.isSigningReady() ? signingConfigs.release : signingConfigs.debug } } - if (project.hasProperty('storeFile')) { - signingConfigs.release.storeFile = new File(storeFile) - } - - if (project.hasProperty('storePassword')) { - signingConfigs.release.storePassword = storePassword - } - - if (project.hasProperty('keyAlias')) { - signingConfigs.release.keyAlias = keyAlias - } - - if (project.hasProperty('keyPassword')) { - signingConfigs.release.keyPassword = keyPassword - } - lintOptions { abortOnError false } -- cgit v1.2.3 From 2e05e80f5954b88ba5e97bb5def2c0c3502687d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Mon, 14 Apr 2014 19:35:05 +0200 Subject: Gradle "check" task runs unit tests --- app/build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index 94823b02..8f1b1575 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,7 +31,7 @@ android { lintOptions { abortOnError false } - + sourceSets { main { assets.srcDirs = ['assets', 'ovpnlibs/assets'] @@ -42,6 +42,8 @@ android { assets.srcDirs = ['src/debug/assets'] } } + + check.dependsOn connectedCheck } dependencies { -- cgit v1.2.3 From 34a16612cc48f45068db935ccad47c1f397d55bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Thu, 24 Apr 2014 00:47:36 +0200 Subject: Disable proguard in release build. release apk is not working ok with proguard. --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/build.gradle') diff --git a/app/build.gradle b/app/build.gradle index 8f1b1575..4795488d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,7 +23,7 @@ android { buildTypes { release { - runProguard true + //runProguard true signingConfig signingConfigs.release.isSigningReady() ? signingConfigs.release : signingConfigs.debug } } -- cgit v1.2.3