Skip to content

Commit

Permalink
Merge pull request #18 from DroidsOnRoids/dependencies_bump
Browse files Browse the repository at this point in the history
Dependencies bump
  • Loading branch information
koral-- authored Aug 22, 2019
2 parents cb08009 + 91eaba4 commit 4182ddf
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
```

Expand All @@ -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
Expand All @@ -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'
}
```

Expand Down
8 changes: 5 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down

0 comments on commit 4182ddf

Please sign in to comment.