aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@users.noreply.github.com>2018-11-23 13:24:37 -0500
committerGitHub <noreply@github.com>2018-11-23 13:24:37 -0500
commitf49a8a01b28271d236cde6e5c93d76f88e5c3e36 (patch)
tree739d3a1c65d26930398e06f257bfab25d800891f
parent800b2ba177fea614d4363857714698123265ab22 (diff)
parent7ab937c9748e91dc490f52e7663f1bf6281b494e (diff)
downloaddsub-f49a8a01b28271d236cde6e5c93d76f88e5c3e36.tar.gz
dsub-f49a8a01b28271d236cde6e5c93d76f88e5c3e36.tar.bz2
dsub-f49a8a01b28271d236cde6e5c93d76f88e5c3e36.zip
Merge pull request #913 from vrih/feature/gradle-3
Upgrade to gradle 3.2.1
-rw-r--r--app/build.gradle37
-rw-r--r--build.gradle3
-rw-r--r--gradle/wrapper/gradle-wrapper.properties4
-rw-r--r--settings.gradle6
4 files changed, 27 insertions, 23 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 61c309f3..a87ba2b1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 27
- buildToolsVersion '25.0.0'
defaultConfig {
applicationId "github.daneren2005.dsub"
@@ -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'
}
diff --git a/build.gradle b/build.gradle
index d5dfdd4f..3fc890c1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,9 +7,10 @@ buildscript {
url 'https://maven.google.com/'
name 'Google'
}
+ google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.3.3'
+ classpath 'com.android.tools.build:gradle:3.2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 325e6709..90a0ff73 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Nov 09 08:50:56 PST 2017
+#Sun Nov 18 21:50:34 GMT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/settings.gradle b/settings.gradle
index 430c7754..73938efa 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,4 @@
-include ':app', ':Server Proxy'
-project(':Server Proxy').projectDir = new File('ServerProxy')
+include ':app'
+
+include ':ServerProxy'
+project(':ServerProxy').projectDir = new File('ServerProxy')