Update for Gradle 4

This commit is contained in:
Cameron Gutman 2017-06-24 12:56:52 -07:00
parent e8c50342ab
commit acf4426952
2 changed files with 11 additions and 6 deletions

View File

@ -15,6 +15,8 @@ android {
versionCode = 129 versionCode = 129
} }
flavorDimensions "root"
productFlavors { productFlavors {
root { root {
// Android O has native mouse capture, so don't show the rooted // Android O has native mouse capture, so don't show the rooted
@ -25,6 +27,8 @@ android {
ndk { ndk {
abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64", "mips", "mips64" abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64", "mips", "mips64"
} }
dimension "root"
} }
nonRoot { nonRoot {
@ -32,6 +36,8 @@ android {
ndk { ndk {
abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64", "mips", "mips64" abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64", "mips", "mips64"
} }
dimension "root"
} }
} }
@ -54,10 +60,9 @@ android {
} }
dependencies { dependencies {
compile 'org.bouncycastle:bcprov-jdk15on:1.52' implementation 'org.bouncycastle:bcprov-jdk15on:1.52'
compile 'org.bouncycastle:bcpkix-jdk15on:1.52' implementation 'org.bouncycastle:bcpkix-jdk15on:1.52'
compile files('libs/jcodec-0.1.9-patched.jar') implementation files('libs/jcodec-0.1.9-patched.jar')
debugCompile project(path:':moonlight-common', configuration:'debug') implementation project(':moonlight-common')
releaseCompile project(path:':moonlight-common', configuration:'release')
} }

@ -1 +1 @@
Subproject commit 13bf4f8855b47c5ce91661ed6b493e97c81ab041 Subproject commit 3f8271fcd774763bdf818628c1bb9dc3ea4398d3