mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-11-23 09:56:00 +03:00
7a1b138894
* develop: (286 commits) Fix crash after video call Fix issue on button styles Clean after benoits review Fix warning about implicit type, introduced in Kotlin 1.5.20. "Returning type parameter has been inferred to Nothing implicitly. Please specify type arguments explicitly to hide this warning. Nothing can produce an exception at runtime." Bump kotlin_version from 1.5.10 to 1.5.20 Bump libphonenumber from 8.12.25 to 8.12.26 Fix call invite processed after call is ended because of fastlane mode. Jump to unread: removes unnecessary check which can cause scroll issue Jump to unread: avoid blink when jumping Clean after Benoits review Delete unused drawable to avoid conflict on develop Jump to unread: add towncrier file. Read marker: fix some issues with jump to unread visibility. Stop using ProgressDialog, there is a theme issue with it. It's not maintain by Google since it's deprecated. Force usage of MaterialAlertDialogBuilder to have the same UI effect. We sometimes need to block the UI :/ Reordering Add text style for dialogs Colored dialog button is now handled by the theme Update theme for material dialog and create a destructive variant Reorder buttons Update doc ... # Conflicts: # library/ui-styles/src/main/res/values/theme_dark.xml # library/ui-styles/src/main/res/values/theme_light.xml # vector/build.gradle # vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.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/composer/TextComposerView.kt # vector/src/main/res/values/strings.xml
136 lines
5.1 KiB
Groovy
136 lines
5.1 KiB
Groovy
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
|
|
|
buildscript {
|
|
// Ref: https://kotlinlang.org/releases.html
|
|
ext.kotlin_version = '1.5.20'
|
|
ext.kotlin_coroutines_version = "1.5.0"
|
|
repositories {
|
|
google()
|
|
jcenter()
|
|
maven {
|
|
url "https://plugins.gradle.org/m2/"
|
|
}
|
|
}
|
|
dependencies {
|
|
classpath 'com.android.tools.build:gradle:4.2.1'
|
|
classpath 'com.google.gms:google-services:4.3.8'
|
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
|
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.3'
|
|
classpath 'com.google.android.gms:oss-licenses-plugin:0.10.4'
|
|
classpath "com.likethesalad.android:string-reference:1.2.2"
|
|
|
|
// NOTE: Do not place your application dependencies here; they belong
|
|
// in the individual module build.gradle files
|
|
}
|
|
}
|
|
|
|
allprojects {
|
|
repositories {
|
|
// For olm library. This has to be declared first, to ensure that Olm library is not downloaded from another repo
|
|
maven {
|
|
url 'https://jitpack.io'
|
|
content {
|
|
// Use this repo only for olm library
|
|
includeGroupByRegex "org\\.matrix\\.gitlab\\.matrix-org"
|
|
// And also for FilePicker
|
|
includeGroupByRegex "com\\.github\\.jaiselrahman"
|
|
// And monarchy
|
|
includeGroupByRegex "com\\.github\\.Zhuinden"
|
|
// And ucrop
|
|
includeGroupByRegex "com\\.github\\.yalantis"
|
|
// JsonViewer
|
|
includeGroupByRegex 'com\\.github\\.BillCarsonFr'
|
|
// PhotoView
|
|
includeGroupByRegex 'com\\.github\\.chrisbanes'
|
|
// PFLockScreen-Android
|
|
includeGroupByRegex 'com\\.github\\.vector-im'
|
|
|
|
// Chat effects
|
|
includeGroupByRegex 'com\\.github\\.jetradarmobile'
|
|
includeGroupByRegex 'nl\\.dionsegijn'
|
|
|
|
// Voice RecordView
|
|
includeGroupByRegex 'com\\.github\\.Armen101'
|
|
}
|
|
}
|
|
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
|
|
// Jitsi repo
|
|
maven {
|
|
url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-3.1.0"
|
|
// Note: to test Jitsi release you can use a local file like this:
|
|
// url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-3.1.0"
|
|
}
|
|
google()
|
|
mavenCentral()
|
|
jcenter()
|
|
}
|
|
|
|
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
|
|
// Warnings are potential errors, so stop ignoring them
|
|
// You can override by passing `-PallWarningsAsErrors=false` in the command line
|
|
kotlinOptions.allWarningsAsErrors = project.getProperties().getOrDefault("allWarningsAsErrors", "true").toBoolean()
|
|
}
|
|
}
|
|
|
|
task clean(type: Delete) {
|
|
delete rootProject.buildDir
|
|
}
|
|
|
|
apply plugin: 'org.sonarqube'
|
|
|
|
// To run a sonar analysis:
|
|
// Run './gradlew sonarqube -Dsonar.login=<REPLACE_WITH_SONAR_KEY>'
|
|
// The SONAR_KEY is stored in passbolt
|
|
|
|
sonarqube {
|
|
properties {
|
|
property "sonar.projectName", "Element-Android"
|
|
property "sonar.projectKey", "im.vector.app.android"
|
|
property "sonar.host.url", "https://sonarcloud.io"
|
|
property "sonar.projectVersion", project(":vector").android.defaultConfig.versionName
|
|
property "sonar.sourceEncoding", "UTF-8"
|
|
property "sonar.links.homepage", "https://github.com/vector-im/element-android/"
|
|
property "sonar.links.ci", "https://buildkite.com/matrix-dot-org/element-android"
|
|
property "sonar.links.scm", "https://github.com/vector-im/element-android/"
|
|
property "sonar.links.issue", "https://github.com/vector-im/element-android/issues"
|
|
property "sonar.organization", "new_vector_ltd_organization"
|
|
property "sonar.login", project.hasProperty("SONAR_LOGIN") ? SONAR_LOGIN : "invalid"
|
|
}
|
|
}
|
|
|
|
project(":vector") {
|
|
sonarqube {
|
|
properties {
|
|
property "sonar.sources", project(":vector").android.sourceSets.main.java.srcDirs
|
|
// exclude source code from analyses separated by a colon (:)
|
|
// Exclude Java source
|
|
property "sonar.exclusions", "**/BugReporterMultipartBody.java"
|
|
}
|
|
}
|
|
}
|
|
|
|
project(":diff-match-patch") {
|
|
sonarqube {
|
|
skipProject = true
|
|
}
|
|
}
|
|
|
|
//project(":matrix-sdk-android") {
|
|
// sonarqube {
|
|
// properties {
|
|
// property "sonar.sources", project(":matrix-sdk-android").android.sourceSets.main.java.srcDirs
|
|
// // exclude source code from analyses separated by a colon (:)
|
|
// // property "sonar.exclusions", "**/*.*"
|
|
// }
|
|
// }
|
|
//}
|
|
//
|
|
//project(":matrix-sdk-android-rx") {
|
|
// sonarqube {
|
|
// properties {
|
|
// property "sonar.sources", project(":matrix-sdk-android-rx").android.sourceSets.main.java.srcDirs
|
|
// // exclude source code from analyses separated by a colon (:)
|
|
// // property "sonar.exclusions", "**/*.*"
|
|
// }
|
|
// }
|
|
//}
|