Commit 0407062c authored by topjohnwu's avatar topjohnwu

Merge branch 'master' into pull request #1342

parents 15aa8134 f315c441
......@@ -60,7 +60,7 @@ dependencies {
implementation 'androidx.work:work-runtime:2.0.1'
implementation 'androidx.transition:transition:1.1.0-beta01'
def libsuVersion = '2.4.0'
def libsuVersion = '2.5.0'
implementation "com.github.topjohnwu.libsu:core:${libsuVersion}"
implementation "com.github.topjohnwu.libsu:io:${libsuVersion}"
......
......@@ -15,7 +15,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools:r8:1.4.79'
classpath 'com.android.tools.build:gradle:3.5.0-alpha10'
classpath 'com.android.tools.build:gradle:3.5.0-alpha12'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.30"
......@@ -42,7 +42,7 @@ subprojects {
}
afterEvaluate {
if (getPlugins().hasPlugin('com.android.library') ||
getPlugins().hasPlugin('com.android.application')) {
getPlugins().hasPlugin('com.android.application')) {
android {
compileSdkVersion 'android-Q'
buildToolsVersion '29.0.0-rc2'
......
#Tue Mar 26 00:03:20 EDT 2019
#Mon Apr 15 22:35:08 EDT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3-rc-2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment