Version 2.12

murder187ss · Apr 25, 2016 · 81bd999 · 81bd999
1 parent e8076d6
commit 81bd999
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 63 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,5 @@
+Version 2.12 (2016/04/25)
+    * Internal reorganization in build flavors
 Version 2.11.3 (2016/02/5)
     * Updated Russian translations (thanks Sergey)
     * Fix selection of file system root

diff --git a/app/app.iml b/app/app.iml
@@ -8,12 +8,12 @@
     </facet>
     <facet type="android" name="Android">
       <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="fdroid_freeDebug" />
+        <option name="SELECTED_BUILD_VARIANT" value="playstore_demoDebug" />
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleFdroid_freeDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileFdroid_freeDebugSources" />
+        <option name="ASSEMBLE_TASK_NAME" value="assemblePlaystore_demoDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compilePlaystore_demoDebugSources" />
         <afterSyncTasks>
-          <task>generateFdroid_freeDebugSources</task>
+          <task>generatePlaystore_demoDebugSources</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -24,57 +24,57 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/retrolambda/fdroid_freeDebug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/fdroid_free/debug" />
+    <output url="file://$MODULE_DIR$/build/retrolambda/playstore_demoDebug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/playstore_demo/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/fdroid_free/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/fdroid_free/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/fdroid_free/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/fdroid_free/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/fdroid_free/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/fdroid_free/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/fdroid_freeDebug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/fdroid_freeDebug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/fdroid_freeDebug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/fdroid_freeDebug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/fdroid_freeDebug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/fdroid_freeDebug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/fdroid_freeDebug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/fdroid_free/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/fdroid_free/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/fdroid_free/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/fdroid_free/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/fdroid_free/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/fdroid_free/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFdroid_freeDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFdroid_freeDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFdroid_freeDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFdroid_freeDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFdroid_freeDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFdroid_freeDebug/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFdroid_freeDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/fdroid_free/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/fdroid_free/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/fdroid_free/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/fdroid_free/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/fdroid_free/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/fdroid_free/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/fdroid_free/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFdroid_free/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFdroid_free/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFdroid_free/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFdroid_free/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFdroid_free/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFdroid_free/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFdroid_free/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFdroid_free/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFdroid_free/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFdroid_free/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFdroid_free/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFdroid_free/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFdroid_free/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testFdroid_free/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/playstore_demo/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/playstore_demo/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/playstore_demo/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/playstore_demo/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/playstore_demo/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/playstore_demo/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/playstore_demoDebug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/playstore_demoDebug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/playstore_demoDebug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/playstore_demoDebug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/playstore_demoDebug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/playstore_demoDebug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/playstore_demoDebug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/playstore_demo/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/playstore_demo/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/playstore_demo/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/playstore_demo/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/playstore_demo/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/playstore_demo/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testPlaystore_demoDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testPlaystore_demoDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testPlaystore_demoDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testPlaystore_demoDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testPlaystore_demoDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testPlaystore_demoDebug/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testPlaystore_demoDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/playstore_demo/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/playstore_demo/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/playstore_demo/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/playstore_demo/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/playstore_demo/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/playstore_demo/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/playstore_demo/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testPlaystore_demo/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testPlaystore_demo/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testPlaystore_demo/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testPlaystore_demo/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testPlaystore_demo/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testPlaystore_demo/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testPlaystore_demo/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPlaystore_demo/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPlaystore_demo/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPlaystore_demo/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPlaystore_demo/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPlaystore_demo/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPlaystore_demo/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPlaystore_demo/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" />
@@ -96,23 +96,22 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
@@ -125,6 +124,8 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />

diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "be.ppareit.swiftp"
         minSdkVersion 14
         targetSdkVersion 22
-        versionCode 21103
-        versionName "2.11.3"
+        versionCode 21200
+        versionName "2.12.0"
     }
     productFlavors {
         playstore_paid {
@@ -28,6 +28,9 @@ android {
             shrinkResources true
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            lintOptions {
+                disable 'MissingTranslation'
+            }
         }
     }
     // Needed for retrolambda