Release signatures added

stavor/build.gradle

@@ -3,9 +3,22 @@ apply plugin: 'com.android.application'
 //import java.util.regex.Pattern
 
 android {
+    lintOptions {
+        checkReleaseBuilds false
+        // Or, if you prefer, you can continue to check for errors in release builds,
+        // but continue the build even when errors are found:
+        //abortOnError false
+    }
+    signingConfigs {
+        config {
+            keyAlias 'Stavor'
+            keyPassword '2TqXSDgA'
+            storeFile file('D:/Users/xgibert/CS/Projets/Stavor_files/Release/Keys_CS_Mobile/releaseKey')
+            storePassword '2TqXSDgA'
+        }
+    }
     compileSdkVersion 21
     buildToolsVersion "21.1.2"
-
     defaultConfig {
         applicationId "cs.si.stavor"
         versionCode 210
@@ -14,8 +27,8 @@ android {
         targetSdkVersion 21
         // Enabling multidex support.
         multiDexEnabled true
+        signingConfig signingConfigs.config
     }
-
     dexOptions {
         javaMaxHeapSize "4g"
 
@@ -24,24 +37,23 @@ android {
         exclude 'META-INF/LICENSE.txt'
         exclude 'META-INF/NOTICE.txt'
     }
-
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+            signingConfig signingConfigs.config
         }
     }
-
     productFlavors {
         armv7 {
-            versionCode Integer.parseInt(defaultConfig.versionCode.toString()+"0")
+            versionCode Integer.parseInt(defaultConfig.versionCode.toString() + "0")
             //printf("versionCode: "+ versionCode.toString())
             ndk {
                 abiFilters "armeabi-v7a", ""
             }
         }
         x86 {
-            versionCode Integer.parseInt(defaultConfig.versionCode.toString()+"1")
+            versionCode Integer.parseInt(defaultConfig.versionCode.toString() + "1")
             //printf("versionCode: "+ versionCode.toString())
             ndk {
                 abiFilters "x86", ""

stavor/stavor.iml

@@ -8,12 +8,10 @@
     </facet>
     <facet type="android" name="Android">
       <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="x86Debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleX86Debug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileX86DebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleX86DebugTest" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateX86DebugSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateX86DebugTestSources" />
+        <option name="SELECTED_BUILD_VARIANT" value="armv7Release" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleArmv7Release" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileArmv7ReleaseSources" />
+        <option name="SOURCE_GEN_TASK_NAME" value="generateArmv7ReleaseSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -23,49 +21,43 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/x86/debug" />
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/armv7/release" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/x86/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/x86/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/x86/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/x86/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/x86/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/x86/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/x86Debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/x86Debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/x86Debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/x86Debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/x86Debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/x86Debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/x86Debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/x86/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/x86/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/x86/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/x86/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/x86/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/x86/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/x86/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/x86/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/x86/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/x86/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/x86/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/x86/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/x86/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestX86/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestX86/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestX86/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestX86/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestX86/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestX86/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestX86/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/armv7/release" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/armv7/release" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/armv7/release" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/armv7/release" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/armv7/release" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/armv7/release" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/armv7Release/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/armv7Release/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/armv7Release/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/armv7Release/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/armv7Release/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/armv7Release/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/armv7Release/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/armv7/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/armv7/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/armv7/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/armv7/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/armv7/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/armv7/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/armv7/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestArmv7/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestArmv7/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestArmv7/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestArmv7/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestArmv7/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestArmv7/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestArmv7/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/release/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />