From acf44269527a4bc6b9b65a1bf4b808522c2dd433 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sat, 24 Jun 2017 12:56:52 -0700
Subject: [PATCH] Update for Gradle 4

---
 app/build.gradle | 15 ++++++++++-----
 moonlight-common |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 00881898..baa65bf6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,6 +15,8 @@ android {
         versionCode = 129
     }
 
+    flavorDimensions "root"
+
     productFlavors {
         root {
             // Android O has native mouse capture, so don't show the rooted
@@ -25,6 +27,8 @@ android {
             ndk {
                 abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64", "mips", "mips64"
             }
+
+            dimension "root"
         }
 
         nonRoot {
@@ -32,6 +36,8 @@ android {
             ndk {
                 abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64", "mips", "mips64"
             }
+
+            dimension "root"
         }
     }
 
@@ -54,10 +60,9 @@ android {
 }
 
 dependencies {
-    compile 'org.bouncycastle:bcprov-jdk15on:1.52'
-    compile 'org.bouncycastle:bcpkix-jdk15on:1.52'
-    compile files('libs/jcodec-0.1.9-patched.jar')
+    implementation 'org.bouncycastle:bcprov-jdk15on:1.52'
+    implementation 'org.bouncycastle:bcpkix-jdk15on:1.52'
+    implementation files('libs/jcodec-0.1.9-patched.jar')
 
-    debugCompile project(path:':moonlight-common', configuration:'debug')
-    releaseCompile project(path:':moonlight-common', configuration:'release')
+    implementation project(':moonlight-common')
 }
diff --git a/moonlight-common b/moonlight-common
index 13bf4f88..3f8271fc 160000
--- a/moonlight-common
+++ b/moonlight-common
@@ -1 +1 @@
-Subproject commit 13bf4f8855b47c5ce91661ed6b493e97c81ab041
+Subproject commit 3f8271fcd774763bdf818628c1bb9dc3ea4398d3