mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Make Lollipop and later the default product flavor

This commit is contained in:
M66B 2016-07-24 19:55:12 +02:00
parent adb96b0f2e
commit 3903519da6
2 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
app/app.iml
View File

@ -8,12 +8,12 @@
</facet> </facet>
<facet type="android" name="Android"> <facet type="android" name="Android">
<configuration> <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="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleKitkat-and-earlierDebug" /> <option name="ASSEMBLE_TASK_NAME" value="assembleLollipop-and-laterDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileKitkat-and-earlierDebugSources" /> <option name="COMPILE_JAVA_TASK_NAME" value="compileLollipop-and-laterDebugSources" />
<afterSyncTasks> <afterSyncTasks>
<task>generateKitkat-and-earlierDebugSources</task> <task>generateLollipop-and-laterDebugSources</task>
</afterSyncTasks> </afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" /> <option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" /> <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@ -24,62 +24,62 @@
</facet> </facet>
</component> </component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false"> <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 url="file://$MODULE_DIR$/build/intermediates/classes/lollipop-and-later/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/kitkat-and-earlier/debug" /> <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/lollipop-and-later/debug" />
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <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/r/lollipop-and-later/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/aidl/lollipop-and-later/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/buildConfig/lollipop-and-later/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/source/rs/lollipop-and-later/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/rs/lollipop-and-later/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$/build/generated/res/resValues/lollipop-and-later/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlierDebug/res" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-laterDebug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlierDebug/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-laterDebug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlierDebug/assets" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-laterDebug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlierDebug/aidl" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-laterDebug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlierDebug/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-laterDebug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlierDebug/jni" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-laterDebug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlierDebug/renderscript" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-laterDebug/renderscript" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlierDebug/shaders" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-laterDebug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlierDebug/res" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/lollipop-and-later/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlierDebug/resources" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/lollipop-and-later/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlierDebug/assets" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/lollipop-and-later/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlierDebug/aidl" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/lollipop-and-later/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlierDebug/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/lollipop-and-later/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlierDebug/jni" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/lollipop-and-later/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlierDebug/rs" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-laterDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlierDebug/shaders" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-laterDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/kitkat-and-earlier/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-laterDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/kitkat-and-earlier/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-laterDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/kitkat-and-earlier/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-laterDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/kitkat-and-earlier/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-laterDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/kitkat-and-earlier/debug" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-laterDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/kitkat-and-earlier/debug" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-laterDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlier/res" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-later/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlier/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-later/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlier/assets" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-later/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlier/aidl" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-later/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlier/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-later/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlier/jni" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-later/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlier/renderscript" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-later/renderscript" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/kitkat-and-earlier/shaders" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-later/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestKitkat-and-earlier/res" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop-and-later/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/androidTestLollipop-and-later/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/androidTestLollipop-and-later/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestKitkat-and-earlier/aidl" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop-and-later/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestKitkat-and-earlier/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop-and-later/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestKitkat-and-earlier/jni" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop-and-later/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestKitkat-and-earlier/rs" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop-and-later/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestKitkat-and-earlier/shaders" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop-and-later/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlier/res" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-later/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/testLollipop-and-later/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/testLollipop-and-later/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlier/aidl" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-later/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlier/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-later/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlier/jni" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-later/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlier/rs" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-later/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testKitkat-and-earlier/shaders" 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/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" 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/assets" type="java-resource" />

14
app/build.gradle
View File

@ -54,6 +54,13 @@ model {
} }
productFlavors { productFlavors {
create("lollipop-and-later") {
versionName = "2.44"
minSdkVersion.apiLevel = 20
targetSdkVersion.apiLevel = 24
versionCode = 2016072421
archivesBaseName = "NetGuard-v$versionName"
}
create("kitkat-and-earlier") { create("kitkat-and-earlier") {
versionName = "2.44" versionName = "2.44"
minSdkVersion.apiLevel = 14 minSdkVersion.apiLevel = 14
@ -62,13 +69,6 @@ model {
versionCode = 2016072411 versionCode = 2016072411
archivesBaseName = "NetGuard-v$versionName" archivesBaseName = "NetGuard-v$versionName"
} }
create("lollipop-and-later") {
versionName = "2.44"
minSdkVersion.apiLevel = 20
targetSdkVersion.apiLevel = 24
versionCode = 2016072421
archivesBaseName = "NetGuard-v$versionName"
}
} }
} }
} }