mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-11-22 09:25:49 +03:00
978056e01f
Conflicts:
dependencies.gradle
gradle.properties
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/RoomSyncAccountDataHandler.kt
vector/build.gradle
vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
Parts of conflict resolution taken from
commit 3302ab563ea549684f1e7d7604da01d6856c8d8d
Merge: 06f52832b 1f74bc986
Author: S1m <git@sgougeon.fr>
Date: Fri Oct 15 09:36:46 2021 +0200
Merge remote-tracking branch 'upstream/develop' into unifiedpush
Change-Id: I25ad98c59df8b8057147260d790eb2a86d6a6e9b
141 lines
7.5 KiB
Groovy
141 lines
7.5 KiB
Groovy
ext.versions = [
|
|
|
|
'minSdk' : 21,
|
|
'compileSdk' : 30,
|
|
'targetSdk' : 30,
|
|
'sourceCompat' : JavaVersion.VERSION_1_8,
|
|
'targetCompat' : JavaVersion.VERSION_1_8,
|
|
]
|
|
|
|
def gradle = "7.0.3"
|
|
// Ref: https://kotlinlang.org/releases.html
|
|
def kotlin = "1.5.31"
|
|
def kotlinCoroutines = "1.5.2"
|
|
def dagger = "2.39.1"
|
|
def retrofit = "2.9.0"
|
|
def arrow = "0.8.2"
|
|
def markwon = "4.6.2"
|
|
def moshi = "1.12.0"
|
|
def lifecycle = "2.2.0"
|
|
def rxBinding = "3.1.0"
|
|
def epoxy = "4.6.2"
|
|
def mavericks = "2.4.0"
|
|
def glide = "4.12.0"
|
|
def bigImageViewer = "1.8.1"
|
|
def jjwt = "0.11.2"
|
|
def vanniktechEmoji = "0.8.0"
|
|
|
|
// Testing
|
|
def mockk = "1.12.0"
|
|
def espresso = "3.4.0"
|
|
def androidxTest = "1.4.0"
|
|
|
|
|
|
ext.libs = [
|
|
gradle : [
|
|
'gradlePlugin' : "com.android.tools.build:gradle:$gradle",
|
|
'kotlinPlugin' : "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin"
|
|
],
|
|
jetbrains : [
|
|
'kotlinReflect' : "org.jetbrains.kotlin:kotlin-reflect:$kotlin",
|
|
'coroutinesCore' : "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutines",
|
|
'coroutinesAndroid' : "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinCoroutines",
|
|
'coroutinesRx2' : "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$kotlinCoroutines"
|
|
],
|
|
androidx : [
|
|
'appCompat' : "androidx.appcompat:appcompat:1.3.1",
|
|
'core' : "androidx.core:core-ktx:1.6.0",
|
|
'recyclerview' : "androidx.recyclerview:recyclerview:1.2.1",
|
|
'exifinterface' : "androidx.exifinterface:exifinterface:1.3.3",
|
|
'fragmentKtx' : "androidx.fragment:fragment-ktx:1.3.6",
|
|
'constraintLayout' : "androidx.constraintlayout:constraintlayout:2.1.1",
|
|
'work' : "androidx.work:work-runtime-ktx:2.6.0",
|
|
'autoFill' : "androidx.autofill:autofill:1.1.0",
|
|
'preferenceKtx' : "androidx.preference:preference-ktx:1.1.1",
|
|
'junit' : "androidx.test.ext:junit:1.1.3",
|
|
'lifecycleExtensions' : "androidx.lifecycle:lifecycle-extensions:$lifecycle",
|
|
'lifecycleJava8' : "androidx.lifecycle:lifecycle-common-java8:$lifecycle",
|
|
'lifecycleLivedata' : "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1",
|
|
'datastore' : "androidx.datastore:datastore:1.0.0",
|
|
'datastorepreferences' : "androidx.datastore:datastore-preferences:1.0.0",
|
|
'pagingRuntimeKtx' : "androidx.paging:paging-runtime-ktx:2.1.2",
|
|
'coreTesting' : "androidx.arch.core:core-testing:2.1.0",
|
|
'testCore' : "androidx.test:core:$androidxTest",
|
|
'orchestrator' : "androidx.test:orchestrator:$androidxTest",
|
|
'testRunner' : "androidx.test:runner:$androidxTest",
|
|
'testRules' : "androidx.test:rules:$androidxTest",
|
|
'espressoCore' : "androidx.test.espresso:espresso-core:$espresso",
|
|
'espressoContrib' : "androidx.test.espresso:espresso-contrib:$espresso",
|
|
'espressoIntents' : "androidx.test.espresso:espresso-intents:$espresso"
|
|
],
|
|
google : [
|
|
'material' : "com.google.android.material:material:1.4.0"
|
|
],
|
|
dagger : [
|
|
'dagger' : "com.google.dagger:dagger:$dagger",
|
|
'daggerCompiler' : "com.google.dagger:dagger-compiler:$dagger"
|
|
],
|
|
squareup : [
|
|
'moshi' : "com.squareup.moshi:moshi-adapters:$moshi",
|
|
'moshiKt' : "com.squareup.moshi:moshi-kotlin:$moshi",
|
|
'moshiKotlin' : "com.squareup.moshi:moshi-kotlin-codegen:$moshi",
|
|
'retrofit' : "com.squareup.retrofit2:retrofit:$retrofit",
|
|
'retrofitMoshi' : "com.squareup.retrofit2:converter-moshi:$retrofit"
|
|
],
|
|
rx : [
|
|
'rxKotlin' : "io.reactivex.rxjava2:rxkotlin:2.4.0",
|
|
'rxAndroid' : "io.reactivex.rxjava2:rxandroid:2.1.1"
|
|
],
|
|
arrow : [
|
|
'core' : "io.arrow-kt:arrow-core:$arrow",
|
|
'instances' : "io.arrow-kt:arrow-instances-core:$arrow"
|
|
],
|
|
markwon : [
|
|
'core' : "io.noties.markwon:core:$markwon",
|
|
'html' : "io.noties.markwon:html:$markwon"
|
|
],
|
|
airbnb : [
|
|
'epoxy' : "com.airbnb.android:epoxy:$epoxy",
|
|
'epoxyGlide' : "com.airbnb.android:epoxy-glide-preloading:$epoxy",
|
|
'epoxyProcessor' : "com.airbnb.android:epoxy-processor:$epoxy",
|
|
'epoxyPaging' : "com.airbnb.android:epoxy-paging:$epoxy",
|
|
'mavericks' : "com.airbnb.android:mavericks:$mavericks",
|
|
'mavericksRx' : "com.airbnb.android:mavericks-rxjava2:$mavericks",
|
|
'mavericksTesting' : "com.airbnb.android:mavericks-testing:$mavericks"
|
|
],
|
|
mockk : [
|
|
'mockk' : "io.mockk:mockk:$mockk",
|
|
'mockkAndroid' : "io.mockk:mockk-android:$mockk"
|
|
],
|
|
github : [
|
|
'glide' : "com.github.bumptech.glide:glide:$glide",
|
|
'glideCompiler' : "com.github.bumptech.glide:compiler:$glide",
|
|
'bigImageViewer' : "com.github.piasy:BigImageViewer:$bigImageViewer",
|
|
'glideImageLoader' : "com.github.piasy:GlideImageLoader:$bigImageViewer",
|
|
'progressPieIndicator' : "com.github.piasy:ProgressPieIndicator:$bigImageViewer",
|
|
'glideImageViewFactory' : "com.github.piasy:GlideImageViewFactory:$bigImageViewer"
|
|
],
|
|
jakewharton : [
|
|
'timber' : "com.jakewharton.timber:timber:5.0.1",
|
|
'rxbinding' : "com.jakewharton.rxbinding3:rxbinding:$rxBinding",
|
|
'rxbindingAppcompat' : "com.jakewharton.rxbinding3:rxbinding-appcompat:$rxBinding",
|
|
'rxbindingMaterial' : "com.jakewharton.rxbinding3:rxbinding-material:$rxBinding"
|
|
],
|
|
jsonwebtoken: [
|
|
'jjwtApi' : "io.jsonwebtoken:jjwt-api:$jjwt",
|
|
'jjwtImpl' : "io.jsonwebtoken:jjwt-impl:$jjwt",
|
|
'jjwtOrgjson' : "io.jsonwebtoken:jjwt-orgjson:$jjwt"
|
|
],
|
|
vanniktech : [
|
|
'emojiMaterial' : "com.vanniktech:emoji-material:$vanniktechEmoji",
|
|
'emojiGoogle' : "com.vanniktech:emoji-google:$vanniktechEmoji"
|
|
],
|
|
apache : [
|
|
'commonsImaging' : "org.apache.sanselan:sanselan:0.97-incubator"
|
|
],
|
|
tests : [
|
|
'kluent' : "org.amshove.kluent:kluent-android:1.68",
|
|
'timberJunitRule' : "net.lachlanmckee:timber-junit-rule:1.0.1",
|
|
'junit' : "junit:junit:4.13.2"
|
|
]
|
|
]
|