diff options
| author | Ricki Hirner <hirner@bitfire.at> | 2020-05-31 16:26:14 +0300 |
|---|---|---|
| committer | Ricki Hirner <hirner@bitfire.at> | 2020-05-31 16:33:16 +0300 |
| commit | 767d1f9759dc1e385b371e426bcf3ecbddfd7424 (patch) | |
| tree | 01aa07745a7ceb77b6d8ff8125bb033682d8e7ce | |
| parent | 2a05a03e9ebdfea6466ff65c7289b429aee38db6 (diff) | |
Update dependencies; use Kotlin JDK7
| -rw-r--r-- | build.gradle | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/build.gradle b/build.gradle index bcc66ac..e889257 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.6.3' + classpath 'com.android.tools.build:gradle:4.0.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}" } @@ -41,7 +41,7 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } - dataBinding.enabled = true + buildFeatures.dataBinding = true lintOptions { disable 'MissingTranslation', 'ExtraTranslation' // translations from Transifex are not always up to date @@ -62,19 +62,19 @@ android { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' implementation 'androidx.lifecycle:lifecycle-livedata:2.2.0' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0' - implementation 'com.google.android.material:material:1.2.0-alpha06' + implementation 'com.google.android.material:material:1.2.0-beta01' implementation "org.conscrypt:conscrypt-android:${versions.conscrypt}" androidTestImplementation 'androidx.test:runner:1.2.0' androidTestImplementation 'androidx.test:rules:1.2.0' - androidTestImplementation 'com.squareup.okhttp3:mockwebserver:4.6.0' + androidTestImplementation 'com.squareup.okhttp3:mockwebserver:4.7.2' androidTestImplementation 'commons-io:commons-io:2.6' //noinspection GradleDependency - commons-lang 3.10+ needs Java 8/Android 7 androidTestImplementation 'org.apache.commons:commons-lang3:3.9' |