From 18889dcb39316d635533e36a47d9210f0b5a960d Mon Sep 17 00:00:00 2001 From: Koitharu Date: Sat, 22 Feb 2020 14:49:16 +0200 Subject: [PATCH] Try fix travis build --- .travis.yml | 18 +++++++----------- app/build.gradle | 13 +++++++------ 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index a00b7d8c5..d115074a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,15 +5,11 @@ jdk: android: components: - tools - - build-tools + - platform-tools-29.0.6 + - build-tools-29.0.3 - android-29 - - extra-google-m2repository - - extra-android-m2repository - -before_install: - - yes | sdkmanager "platforms;android-29" -script: ./gradlew -Dorg.gradle.jvmargs=-Xmx1536m assembleDebug lintDebug -licenses: - - 'android-sdk-license-.+' - - 'android-sdk-preview-license-.+' - - 'android-sdk-arm-dbt-license-.+' \ No newline at end of file + licenses: + - android-sdk-preview-license-.+ + - android-sdk-license-.+ + - google-gdk-license-.+ +script: ./gradlew -Dorg.gradle.jvmargs=-Xmx1536m assembleDebug lintDebug \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 65c0db51b..43acff0f8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,6 +8,7 @@ def gitBranch = 'git branch --show-current'.execute([], rootDir).text.trim() android { compileSdkVersion 29 + buildToolsVersion '29.0.3' defaultConfig { applicationId "org.koitharu.kotatsu" @@ -57,17 +58,17 @@ dependencies { implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3' implementation 'androidx.core:core-ktx:1.3.0-alpha01' - implementation "androidx.fragment:fragment-ktx:1.2.1" + implementation "androidx.fragment:fragment-ktx:1.2.2" implementation 'androidx.appcompat:appcompat:1.2.0-alpha02' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03' implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha01' implementation 'androidx.preference:preference:1.1.0' - implementation 'com.google.android.material:material:1.2.0-alpha04' + implementation 'com.google.android.material:material:1.2.0-alpha05' - implementation 'androidx.room:room-runtime:2.2.3' - implementation 'androidx.room:room-ktx:2.2.3' - kapt 'androidx.room:room-compiler:2.2.3' + implementation 'androidx.room:room-runtime:2.2.4' + implementation 'androidx.room:room-ktx:2.2.4' + kapt 'androidx.room:room-compiler:2.2.4' implementation 'com.github.moxy-community:moxy:2.0.2' implementation 'com.github.moxy-community:moxy-androidx:2.0.2' @@ -75,7 +76,7 @@ dependencies { implementation 'com.github.moxy-community:moxy-ktx:2.0.2' kapt 'com.github.moxy-community:moxy-compiler:2.0.2' - implementation 'com.squareup.okhttp3:okhttp:4.3.1' + implementation 'com.squareup.okhttp3:okhttp:4.4.0' implementation 'com.squareup.okio:okio:2.4.3' implementation 'org.jsoup:jsoup:1.12.2'