Commit 072a11d2 authored by Mygod's avatar Mygod

Update dependencies

parent 8d7d4e03
......@@ -17,7 +17,7 @@ buildscript {
classpath(rootProject.extra.get("androidPlugin").toString())
classpath(kotlin("gradle-plugin", rootProject.extra.get("kotlinVersion").toString()))
classpath("com.google.android.gms:oss-licenses-plugin:0.10.2")
classpath("com.google.firebase:firebase-crashlytics-gradle:2.1.0")
classpath("com.google.firebase:firebase-crashlytics-gradle:2.1.1")
classpath("com.google.gms:google-services:4.3.3")
classpath("com.vanniktech:gradle-maven-publish-plugin:0.11.1")
classpath("gradle.plugin.org.mozilla.rust-android-gradle:plugin:0.8.3")
......
......@@ -54,7 +54,7 @@ fun Project.setupCore() {
versionName = "5.1.1-nightly"
}
compileOptions.isCoreLibraryDesugaringEnabled = true
ndkVersion = "21.1.6352462"
ndkVersion = "21.3.6528147"
}
dependencies.add("coreLibraryDesugaring", "com.android.tools:desugar_jdk_libs:1.0.5")
}
......
......@@ -19,10 +19,9 @@ android {
arguments("-j${Runtime.getRuntime().availableProcessors()}")
}
javaCompileOptions.annotationProcessorOptions.arguments = mapOf(
javaCompileOptions.annotationProcessorOptions.arguments(mapOf(
"room.incremental" to "true",
"room.schemaLocation" to "$projectDir/schemas"
)
"room.schemaLocation" to "$projectDir/schemas"))
}
externalNativeBuild.ndkBuild.path("src/main/jni/Android.mk")
......@@ -81,9 +80,9 @@ dependencies {
api("androidx.work:work-gcm:$workVersion")
api("com.google.android.gms:play-services-oss-licenses:17.0.0")
api("com.google.code.gson:gson:2.8.6")
api("com.google.firebase:firebase-analytics-ktx:17.4.1")
api("com.google.firebase:firebase-analytics-ktx:17.4.3")
api("com.google.firebase:firebase-config-ktx:19.1.4")
api("com.google.firebase:firebase-crashlytics:17.0.0")
api("com.google.firebase:firebase-crashlytics:17.0.1")
api("com.jakewharton.timber:timber:4.7.1")
api("dnsjava:dnsjava:3.1.0")
api("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion")
......
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
......@@ -82,6 +82,7 @@ esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
......@@ -129,6 +130,7 @@ fi
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
......
......@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
......
......@@ -15,7 +15,7 @@ dependencies {
implementation("androidx.browser:browser:1.2.0")
implementation("androidx.constraintlayout:constraintlayout:2.0.0-beta6")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
implementation("com.google.android.gms:play-services-vision:20.0.0")
implementation("com.google.android.gms:play-services-vision:20.1.0")
implementation("com.google.firebase:firebase-ads:19.1.0")
implementation("com.google.zxing:core:3.4.0")
implementation("com.takisoft.preferencex:preferencex-simplemenu:1.1.0")
......
......@@ -25,6 +25,6 @@ dependencies {
api(kotlin("stdlib-jdk8", rootProject.extra.get("kotlinVersion").toString()))
api("androidx.core:core-ktx:1.2.0")
// https://android-developers.googleblog.com/2019/07/android-q-beta-5-update.html
api("androidx.drawerlayout:drawerlayout:1.1.0-beta01")
api("androidx.drawerlayout:drawerlayout:1.1.0-rc01")
api("com.google.android.material:material:1.1.0")
}
rootProject.extra.apply {
set("androidPlugin", "com.android.tools.build:gradle:4.1.0-alpha09")
set("androidPlugin", "com.android.tools.build:gradle:4.1.0-beta01")
set("kotlinVersion", "1.3.72")
}
......
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