diff options
| -rw-r--r-- | app/build.gradle | 4 | ||||
| -rw-r--r-- | app/src/play/res/layout/media_router_controller.xml | 4 | ||||
| -rw-r--r-- | build.gradle | 26 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.jar | bin | 54783 -> 54708 bytes | |||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 3 | ||||
| -rwxr-xr-x | gradlew | 6 |
6 files changed, 21 insertions, 22 deletions
diff --git a/app/build.gradle b/app/build.gradle index c7b95421b..f767afe4b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -153,7 +153,7 @@ dependencies { compile "com.artemzin.rxjava:proguard-rules:$rxJavaRulesVersion" compile "com.joanzapata.iconify:android-iconify-fontawesome:$iconifyVersion" compile "com.joanzapata.iconify:android-iconify-material:$iconifyVersion" - compile("com.github.afollestad.material-dialogs:commons:$materialDialogsVersion") { + compile("com.afollestad.material-dialogs:commons:$materialDialogsVersion") { transitive = true } compile "com.yqritc:recyclerview-flexibledivider:$recyclerviewFlexibledividerVersion" @@ -179,7 +179,7 @@ task filterAbout { inputs.files files(["src/main/templates/about.html", "src/main/AndroidManifest.xml"]) outputs.file "src/main/assets/about.html" -} << { +} doLast { copy { from "src/main/templates/about.html" into "src/main/assets" diff --git a/app/src/play/res/layout/media_router_controller.xml b/app/src/play/res/layout/media_router_controller.xml index 659ac0a78..9489173a3 100644 --- a/app/src/play/res/layout/media_router_controller.xml +++ b/app/src/play/res/layout/media_router_controller.xml @@ -31,11 +31,11 @@ <TextView android:id="@+id/mrc_control_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?attr/mediaRouteControllerPrimaryTextStyle"/> + android:textAppearance="@style/TextAppearance.MediaRouter.PrimaryText"/> <TextView android:id="@+id/mrc_control_subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?attr/mediaRouteControllerSecondaryTextStyle" + android:textAppearance="@style/TextAppearance.MediaRouter.SecondaryText" android:singleLine="true" /> </LinearLayout> </RelativeLayout> diff --git a/build.gradle b/build.gradle index 47a4021a4..16c5017c3 100644 --- a/build.gradle +++ b/build.gradle @@ -6,8 +6,8 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:2.2.3" - classpath "me.tatarka:gradle-retrolambda:3.3.1" + classpath "com.android.tools.build:gradle:2.3.3" + classpath "me.tatarka:gradle-retrolambda:3.7.0" classpath "me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2" classpath "com.github.triplet.gradle:play-publisher:1.1.4" // Exclude the version that the android plugin depends on. @@ -42,33 +42,33 @@ project.ext { minSdkVersion = 10 targetSdkVersion = 25 - supportVersion = "23.4.0" - commonsioVersion = "2.4" - commonslangVersion = "3.4" + supportVersion = "25.3.1" + commonsioVersion = "2.5" + commonslangVersion = "3.6" eventbusVersion = "2.4.0" - flattr4jVersion = "2.13" + flattr4jVersion = "2.14" glideVersion = "3.7.0" glideOkhttpIntegrationVersion = "1.4.0" iconifyVersion = "2.2.2" - jsoupVersion = "1.9.2" - materialDialogsVersion = "0.8.5.8@aar" + jsoupVersion = "1.10.3" + materialDialogsVersion = "0.9.0.2" okhttpVersion = "3.4.2" okioVersion = "1.11.0" recyclerviewFlexibledividerVersion = "1.2.6" - robotiumSoloVersion = "5.6.0" + robotiumSoloVersion = "5.6.3" rxAndroidVersion = "1.2.1" - rxJavaVersion = "1.1.8" - rxJavaRulesVersion = "1.1.8.0" + rxJavaVersion = "1.3.2" + rxJavaRulesVersion = "1.3.2.0" triangleLabelViewVersion = "1.1.0" audioPlayerVersion = "v1.0.17" - castCompanionLibVer = "2.8.3" + castCompanionLibVer = "2.9.1" playServicesVersion = "8.4.0" } task wrapper(type: Wrapper) { - gradleVersion = "3.5" + gradleVersion = "4.2" } // free build hack: common functions diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex f55326309..736fb7d3f 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 304cdd1fd..52dd1f044 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Wed May 31 17:07:18 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -155,7 +155,7 @@ if $cygwin ; then fi # Escape application args -save ( ) { +save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } |