2.85 release

This commit is contained in:
M66B 2017-03-21 10:07:31 +01:00
parent 1361b38860
commit 5d18d7873c
2 changed files with 14 additions and 14 deletions

View File

@ -72,14 +72,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/all/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/all/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/all/renderscript" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/all/renderscript" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/all/shaders" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/all/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testAll/res" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/testAll/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testAll/resources" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/testAll/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testAll/assets" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/testAll/assets" type="java-test-resource" />
@ -88,6 +80,14 @@
<sourceFolder url="file://$MODULE_DIR$/src/testAll/jni" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/testAll/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testAll/rs" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/testAll/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testAll/shaders" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/testAll/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/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" />

View File

@ -55,25 +55,25 @@ model {
productFlavors { productFlavors {
create("all") { create("all") {
versionName = "2.84" versionName = "2.85"
minSdkVersion.apiLevel = 14 minSdkVersion.apiLevel = 14
targetSdkVersion.apiLevel = 25 targetSdkVersion.apiLevel = 25
versionCode = 2017031901 versionCode = 2017032101
archivesBaseName = "NetGuard-v$versionName" archivesBaseName = "NetGuard-v$versionName"
} }
create("lollipop-and-later") { create("lollipop-and-later") {
versionName = "2.84" versionName = "2.85"
minSdkVersion.apiLevel = 20 minSdkVersion.apiLevel = 20
targetSdkVersion.apiLevel = 25 targetSdkVersion.apiLevel = 25
versionCode = 2017031911 versionCode = 2017032111
archivesBaseName = "NetGuard-v$versionName" archivesBaseName = "NetGuard-v$versionName"
} }
create("kitkat-and-earlier") { create("kitkat-and-earlier") {
versionName = "2.84" versionName = "2.85"
minSdkVersion.apiLevel = 14 minSdkVersion.apiLevel = 14
maxSdkVersion = 19 maxSdkVersion = 19
targetSdkVersion.apiLevel = 25 targetSdkVersion.apiLevel = 25
versionCode = 2017031921 versionCode = 2017032121
archivesBaseName = "NetGuard-v$versionName" archivesBaseName = "NetGuard-v$versionName"
} }
} }