From 43696af2df53b00f95ef2493b75af8db94ece362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20Wr=C3=B3tniak?= Date: Thu, 22 Aug 2019 14:08:02 +0200 Subject: [PATCH 1/2] Dependency versions bump: Gradle 5.6 Android Gradle Plugin 3.5.0 Chucker 3.0.1 --- build.gradle | 8 +++++--- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 857bbd2..8fada1c 100644 --- a/build.gradle +++ b/build.gradle @@ -4,14 +4,15 @@ buildscript { compileSdk : 29, targetSdk : 29, kotlin : '1.3.41', - androidGradlePlugin: '3.4.2', + androidGradlePlugin: '3.5.0', versionsPlugin : '0.22.0', hyperion : '0.9.27', debugDb : '1.0.6', - chucker : '3.0.0-beta1', + chucker : '3.0.1', hyperionAppInfo : '1.1.0', deviceNames : '1.1.9', autoService : '1.0-rc6', + shipkit : '5406deb9d1746f963d1b132bccb3cca17021c3e9' ] repositories { @@ -26,7 +27,8 @@ buildscript { classpath "com.android.tools.build:gradle:$versions.androidGradlePlugin" classpath "com.github.ben-manes:gradle-versions-plugin:$versions.versionsPlugin" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin" - classpath 'com.github.koral--:shipkit:5406deb9d1746f963d1b132bccb3cca17021c3e9' //TODO replace with parent shipkit project once Android support is ready + classpath "com.github.koral--:shipkit:$versions.shipkit" + //TODO replace with parent shipkit project once Android support is ready } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4b7e1f3..ef9a9e0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 8e25e6c..83f2acf 100755 --- a/gradlew +++ b/gradlew @@ -125,8 +125,8 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` JAVACMD=`cygpath --unix "$JAVACMD"` From 91eaba4b8a2afd1c10e906a7691a21c8cda5e31d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20Wr=C3=B3tniak?= Date: Thu, 22 Aug 2019 14:09:25 +0200 Subject: [PATCH 2/2] Update version numbers in Readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6ffc779..58a9f46 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ Shows device market name and Android version. ```groovy dependencies { - debugImplementation 'pl.droidsonroids.foqa:deviceinfo:0.0.14' + debugImplementation 'pl.droidsonroids.foqa:deviceinfo:0.1.3' } ``` @@ -65,7 +65,7 @@ System settings write prompt will appear when setting scale for the first time. ```groovy dependencies { - debugImplementation 'pl.droidsonroids.foqa:fontscale:0.0.14' + debugImplementation 'pl.droidsonroids.foqa:fontscale:0.1.3' } ``` ### Chuck plugin @@ -79,7 +79,7 @@ We'll deprecate this plugin after Hyperion Chuck becomes [compatible with MavenC ```groovy dependencies { - debugImplementation 'pl.droidsonroids.foqa:chuck:0.0.14' + debugImplementation 'pl.droidsonroids.foqa:chuck:0.1.3' } ```