Commit 70d509e1 authored by Mygod's avatar Mygod

Update dependencies

parent 5e3bf2a1
......@@ -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.2.0")
classpath("com.google.firebase:firebase-crashlytics-gradle:2.2.1")
classpath("com.google.gms:google-services:4.3.3")
classpath("com.vanniktech:gradle-maven-publish-plugin:0.12.0")
classpath("gradle.plugin.org.mozilla.rust-android-gradle:plugin:0.8.3")
......
......@@ -47,8 +47,8 @@ fun Project.setupCommon() {
dependencies {
add("testImplementation", "junit:junit:4.13")
add("androidTestImplementation", "androidx.test:runner:1.2.0")
add("androidTestImplementation", "androidx.test.espresso:espresso-core:3.2.0")
add("androidTestImplementation", "androidx.test:runner:1.3.0")
add("androidTestImplementation", "androidx.test.espresso:espresso-core:3.3.0")
}
}
......
......@@ -38,6 +38,7 @@ cargo {
profile = findProperty("CARGO_PROFILE")?.toString() ?: currentFlavor
extraCargoBuildArguments = listOf("--bin", libname!!)
featureSpec.noDefaultBut(arrayOf(
"ring-aead-ciphers",
"sodium",
"rc4",
"aes-cfb",
......@@ -92,5 +93,5 @@ dependencies {
api("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutinesVersion")
kapt("androidx.room:room-compiler:$roomVersion")
androidTestImplementation("androidx.room:room-testing:$roomVersion")
androidTestImplementation("androidx.test.ext:junit-ktx:1.1.1")
androidTestImplementation("androidx.test.ext:junit-ktx:1.1.2")
}
Subproject commit 74688d8a97f4e67132272ebc78d5e242bf269c68
Subproject commit 5af929004e3bef4d330de277de8a3fb32ce961b3
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
......@@ -130,7 +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
......
......@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init
if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
......@@ -54,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init
if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
......@@ -64,21 +64,6 @@ echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
:execute
@rem Setup the command line
......@@ -86,7 +71,7 @@ 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%
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
......
......@@ -18,10 +18,10 @@ dependencies {
implementation("androidx.camera:camera-camera2:$cameraxVersion")
implementation("androidx.camera:camera-lifecycle:$cameraxVersion")
implementation("androidx.camera:camera-view:1.0.0-alpha15")
implementation("androidx.constraintlayout:constraintlayout:2.0.0")
implementation("androidx.constraintlayout:constraintlayout:2.0.1")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
implementation("com.google.firebase:firebase-ads:19.3.0")
implementation("com.google.mlkit:barcode-scanning:16.0.2")
implementation("com.google.mlkit:barcode-scanning:16.0.3")
implementation("com.google.zxing:core:3.4.0")
implementation("com.takisoft.preferencex:preferencex-simplemenu:1.1.0")
implementation("com.twofortyfouram:android-plugin-api-for-locale:1.0.4")
......
......@@ -24,6 +24,6 @@ mavenPublish.targets.getByName("uploadArchives") {
dependencies {
api("androidx.core:core-ktx:1.3.1")
// https://android-developers.googleblog.com/2019/07/android-q-beta-5-update.html
api("androidx.drawerlayout:drawerlayout:1.1.0")
api("com.google.android.material:material:1.2.0")
api("androidx.drawerlayout:drawerlayout:1.1.1")
api("com.google.android.material:material:1.2.1")
}
rootProject.extra.apply {
set("androidPlugin", "com.android.tools.build:gradle:4.1.0-rc01")
set("androidPlugin", "com.android.tools.build:gradle:4.1.0-rc02")
set("kotlinVersion", "1.4.0")
}
......
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