mirror of
https://github.com/KokaKiwi/BarInsta
synced 2024-11-12 17:57:29 +00:00
Merge branch 'master' into feature/multistack-navigation
This commit is contained in:
commit
8a88f90281
@ -165,7 +165,7 @@ dependencies {
|
||||
|
||||
def exoplayer_version = '2.14.1'
|
||||
|
||||
implementation 'com.google.android.material:material:1.4.0-rc01'
|
||||
implementation 'com.google.android.material:material:1.4.0'
|
||||
|
||||
implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer_version"
|
||||
implementation "com.google.android.exoplayer:exoplayer-dash:$exoplayer_version"
|
||||
@ -181,7 +181,7 @@ dependencies {
|
||||
|
||||
implementation 'com.google.guava:guava:27.0.1-android'
|
||||
|
||||
def core_version = "1.6.0-rc01"
|
||||
def core_version = "1.6.0"
|
||||
implementation "androidx.core:core:$core_version"
|
||||
|
||||
// Fragment
|
||||
@ -205,10 +205,10 @@ dependencies {
|
||||
annotationProcessor "androidx.room:room-compiler:$room_version"
|
||||
|
||||
// CameraX
|
||||
def camerax_version = "1.1.0-alpha05"
|
||||
def camerax_version = "1.1.0-alpha06"
|
||||
implementation "androidx.camera:camera-camera2:$camerax_version"
|
||||
implementation "androidx.camera:camera-lifecycle:$camerax_version"
|
||||
implementation "androidx.camera:camera-view:1.0.0-alpha25"
|
||||
implementation "androidx.camera:camera-view:1.0.0-alpha26"
|
||||
|
||||
// EmojiCompat
|
||||
def emoji_compat_version = "1.1.0"
|
||||
@ -232,7 +232,7 @@ dependencies {
|
||||
|
||||
implementation 'org.apache.commons:commons-imaging:1.0-alpha2'
|
||||
|
||||
implementation 'com.github.skydoves:balloon:1.3.4'
|
||||
implementation 'com.github.skydoves:balloon:1.3.5'
|
||||
|
||||
implementation 'com.github.ammargitham:AutoLinkTextViewV2:3.2.0'
|
||||
implementation 'com.github.ammargitham:uCrop:2.3-native-beta-2'
|
||||
|
@ -10,7 +10,7 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:4.2.1'
|
||||
classpath 'com.android.tools.build:gradle:4.2.2'
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
|
||||
}
|
||||
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionSha256Sum=a9e356a21595348b6f04b024ed0b08ac8aea6b2ac37e6c0ef58e51549cd7b9cb
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip
|
||||
distributionSha256Sum=9bb8bc05f562f2d42bdf1ba8db62f6b6fa1c3bf6c392228802cc7cb0578fe7e0
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
2
gradlew
vendored
2
gradlew
vendored
@ -72,7 +72,7 @@ case "`uname`" in
|
||||
Darwin* )
|
||||
darwin=true
|
||||
;;
|
||||
MINGW* )
|
||||
MSYS* | MINGW* )
|
||||
msys=true
|
||||
;;
|
||||
NONSTOP* )
|
||||
|
@ -2,6 +2,6 @@
|
||||
"extends": [
|
||||
"config:base"
|
||||
],
|
||||
"prConcurrentLimit": 5,
|
||||
"prHourlyLimit": 1
|
||||
"prConcurrentLimit": 10,
|
||||
"prHourlyLimit": 5
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user