From 3903519da6f85d9eaac89c581352aff1831a6710 Mon Sep 17 00:00:00 2001
From: M66B <marcel@faircode.eu>
Date: Sun, 24 Jul 2016 19:55:12 +0200
Subject: [PATCH] Make Lollipop and later the default product flavor

---
 app/app.iml      | 116 +++++++++++++++++++++++------------------------
 app/build.gradle |  14 +++---
 2 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/app/app.iml b/app/app.iml
index c57d64ba..02e544a2 100644
--- 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="kitkat-and-earlierDebug" />
+        <option name="SELECTED_BUILD_VARIANT" value="lollipop-and-laterDebug" />
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleKitkat-and-earlierDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileKitkat-and-earlierDebugSources" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleLollipop-and-laterDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileLollipop-and-laterDebugSources" />
         <afterSyncTasks>
-          <task>generateKitkat-and-earlierDebugSources</task>
+          <task>generateLollipop-and-laterDebugSources</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -24,62 +24,62 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/kitkat-and-earlier/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/kitkat-and-earlier/debug" />
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/lollipop-and-later/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/lollipop-and-later/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/kitkat-and-earlier/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/kitkat-and-earlier/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/kitkat-and-earlier/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/kitkat-and-earlier/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/kitkat-and-earlier/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/kitkat-and-earlier/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlierDebug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlierDebug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlierDebug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlierDebug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlierDebug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlierDebug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlierDebug/renderscript" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlierDebug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlierDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlierDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlierDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlierDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlierDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlierDebug/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlierDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlierDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/kitkat-and-earlier/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/kitkat-and-earlier/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/kitkat-and-earlier/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/kitkat-and-earlier/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/kitkat-and-earlier/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/kitkat-and-earlier/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlier/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlier/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlier/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlier/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlier/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlier/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlier/renderscript" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlier/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestKitkat-and-earlier/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestKitkat-and-earlier/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestKitkat-and-earlier/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestKitkat-and-earlier/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestKitkat-and-earlier/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestKitkat-and-earlier/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestKitkat-and-earlier/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestKitkat-and-earlier/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlier/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlier/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlier/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlier/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlier/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlier/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlier/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlier/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/lollipop-and-later/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/lollipop-and-later/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/lollipop-and-later/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/lollipop-and-later/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/lollipop-and-later/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/lollipop-and-later/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-laterDebug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-laterDebug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-laterDebug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-laterDebug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-laterDebug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-laterDebug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-laterDebug/renderscript" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-laterDebug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/lollipop-and-later/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/lollipop-and-later/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/lollipop-and-later/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/lollipop-and-later/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/lollipop-and-later/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/lollipop-and-later/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-laterDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-laterDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-laterDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-laterDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-laterDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-laterDebug/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-laterDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-laterDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-later/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-later/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-later/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-later/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-later/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-later/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-later/renderscript" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-later/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop-and-later/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop-and-later/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop-and-later/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop-and-later/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop-and-later/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop-and-later/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop-and-later/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop-and-later/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-later/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-later/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-later/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-later/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-later/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-later/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-later/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-later/shaders" 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" />
diff --git a/app/build.gradle b/app/build.gradle
index 12e6d17c..06aecde8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -54,6 +54,13 @@ model {
         }
 
         productFlavors {
+            create("lollipop-and-later") {
+                versionName = "2.44"
+                minSdkVersion.apiLevel = 20
+                targetSdkVersion.apiLevel = 24
+                versionCode = 2016072421
+                archivesBaseName = "NetGuard-v$versionName"
+            }
             create("kitkat-and-earlier") {
                 versionName = "2.44"
                 minSdkVersion.apiLevel = 14
@@ -62,13 +69,6 @@ model {
                 versionCode = 2016072411
                 archivesBaseName = "NetGuard-v$versionName"
             }
-            create("lollipop-and-later") {
-                versionName = "2.44"
-                minSdkVersion.apiLevel = 20
-                targetSdkVersion.apiLevel = 24
-                versionCode = 2016072421
-                archivesBaseName = "NetGuard-v$versionName"
-            }
         }
     }
 }