Merge pull request #4 from daneren2005/edge

5.4.4

1 files changed, 21 insertions, 20 deletions

diff --git a/app/build.gradle b/app/build.gradle
index e9bd19e5..a87ba2b1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,14 +2,13 @@ apply plugin: 'com.android.application'
 
 android {
 	compileSdkVersion 27
-	buildToolsVersion '25.0.0'
 
 	defaultConfig {
 		applicationId "github.daneren2005.dsub"
 		minSdkVersion 14
 		targetSdkVersion 26
-		versionCode 200
-		versionName '5.4.3'
+		versionCode 202
+		versionName '5.4.4'
 		setProperty("archivesBaseName", "DSub $versionName")
 		resConfigs "de", "es", "fr", "hu", "nl", "pt-rPT", "ru", "sv"
 	}
@@ -27,14 +26,16 @@ android {
 			zipAlignEnabled true
 		}
 	}
-
+	flavorDimensions "version"
 	productFlavors {
 		floss {
 			// FLOSS build (no proprietary libraries)
+			dimension "version"
 		}
 		google {
 			// FLOSS build + Google libraries
 			// Adds ChromeCast support
+			dimension "version"
 		}
 	}
 
@@ -54,20 +55,20 @@ android {
 }
 
 dependencies {
-	compile project(':Server Proxy')
-	compile fileTree(include: ['*.jar'], dir: 'libs')
-	compile 'com.android.support:support-v4:27.1.+'
-	compile 'com.android.support:appcompat-v7:27.1.+'
-	compile 'com.android.support:mediarouter-v7:27.1.+'
-	compile 'com.android.support:recyclerview-v7:27.1.+'
-	compile 'com.android.support:design:27.1.+'
-	googleCompile 'com.google.android.gms:play-services-cast:8.1.0'
-	compile 'com.sothree.slidinguppanel:library:3.0.0'
-	compile 'de.hdodenhof:circleimageview:1.2.1'
-    compile 'com.shehabic.droppy:Droppy:0.5.1@aar'
-	compile group: 'org.fourthline.cling', name: 'cling-core', version:'2.1.1'
-	compile group: 'org.fourthline.cling', name: 'cling-support', version:'2.1.1'
-	compile group: 'org.eclipse.jetty', name: 'jetty-server', version:'8.1.16.v20140903'
-	compile group: 'org.eclipse.jetty', name: 'jetty-servlet', version:'8.1.16.v20140903'
-	compile group: 'org.eclipse.jetty', name: 'jetty-client', version:'8.1.16.v20140903'
+	implementation project(path: ':ServerProxy')
+	implementation fileTree(include: ['*.jar'], dir: 'libs')
+	implementation 'com.android.support:support-v4:27.1.+'
+	implementation 'com.android.support:appcompat-v7:27.1.+'
+	implementation 'com.android.support:mediarouter-v7:27.1.+'
+	implementation 'com.android.support:recyclerview-v7:27.1.+'
+	implementation 'com.android.support:design:27.1.+'
+	googleImplementation 'com.google.android.gms:play-services-cast:8.1.0'
+	implementation 'com.sothree.slidinguppanel:library:3.0.0'
+	implementation 'de.hdodenhof:circleimageview:1.2.1'
+    implementation 'com.shehabic.droppy:Droppy:0.5.1@aar'
+	implementation group: 'org.fourthline.cling', name: 'cling-core', version:'2.1.1'
+	implementation group: 'org.fourthline.cling', name: 'cling-support', version:'2.1.1'
+	implementation group: 'org.eclipse.jetty', name: 'jetty-server', version:'8.1.16.v20140903'
+	implementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version:'8.1.16.v20140903'
+	implementation group: 'org.eclipse.jetty', name: 'jetty-client', version:'8.1.16.v20140903'
 }