From db60a2f6d258bb94887174d8a3dfee9ebf1e935c Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 9 Dec 2021 16:05:30 +0100 Subject: [PATCH 01/20] Upgrade flexbox to 3.0.0 It has been moved to mavenCentral --- vector/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vector/build.gradle b/vector/build.gradle index d29f36c877..224c28a35a 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -398,7 +398,7 @@ dependencies { implementation libs.markwon.html implementation 'com.googlecode.htmlcompressor:htmlcompressor:1.5.2' implementation 'me.saket:better-link-movement-method:2.2.0' - implementation 'com.google.android:flexbox:2.0.1' + implementation 'com.google.android.flexbox:flexbox:3.0.0' implementation libs.androidx.autoFill implementation 'jp.wasabeef:glide-transformations:4.3.0' implementation 'com.github.vector-im:PFLockScreen-Android:1.0.0-beta12' From 101f3229c200d890101abe5389950e36de813368 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 9 Dec 2021 21:03:36 +0100 Subject: [PATCH 02/20] Add explicit dependency location for jcenter --- build.gradle | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 89825428fb..85b23503b3 100644 --- a/build.gradle +++ b/build.gradle @@ -75,7 +75,19 @@ allprojects { } google() mavenCentral() - jcenter() + jcenter { + content { + includeGroup 'com.amulyakhare' + includeGroup 'com.danikula' + includeGroup 'com.otaliastudios' + includeGroup 'com.tapadoo.android' + includeGroup 'com.yqritc' + includeGroup 'dk.ilios' + includeGroup 'im.dlg' + includeGroup 'me.dm7.barcodescanner' + includeGroup 'me.gujun.android' + } + } } tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { From 934d325c2aafe7e6b452af5cfdc19c883e058a7b Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 9 Dec 2021 21:05:31 +0100 Subject: [PATCH 03/20] Add explicit dependency location for olm library --- build.gradle | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 85b23503b3..e477859c97 100644 --- a/build.gradle +++ b/build.gradle @@ -37,8 +37,13 @@ allprojects { apply plugin: "org.jlleitschuh.gradle.ktlint" repositories { - // For olm library. This has to be declared first, to ensure that Olm library is not downloaded from another repo - maven { url 'https://gitlab.matrix.org/api/v4/projects/27/packages/maven' } + // For olm library. + maven { + url 'https://gitlab.matrix.org/api/v4/projects/27/packages/maven' + content { + includeGroup 'org.matrix.android' + } + } maven { url 'https://jitpack.io' From 45ee39f3c08c0cc4028744bd3f67d8610b9c4948 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 9 Dec 2021 21:06:22 +0100 Subject: [PATCH 04/20] Add a TODO --- vector/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/vector/build.gradle b/vector/build.gradle index 224c28a35a..f2247efc77 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -415,6 +415,7 @@ dependencies { implementation 'com.arthenica:ffmpeg-kit-audio:4.5.LTS' // Alerter + // TODO 7.2.4 is available implementation 'com.tapadoo.android:alerter:7.0.1' implementation 'com.otaliastudios:autocomplete:1.1.0' From abfaa03a1ec4a14fb991fb28bcc67ae8c499017e Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 9 Dec 2021 21:16:23 +0100 Subject: [PATCH 05/20] Add explicit dependency location for jitpack.io --- build.gradle | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/build.gradle b/build.gradle index e477859c97..a09d485226 100644 --- a/build.gradle +++ b/build.gradle @@ -48,27 +48,14 @@ allprojects { maven { url 'https://jitpack.io' content { - // Use this repo only 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' - // DraggableView - includeGroupByRegex 'com\\.github\\.hyuwah' - - // Chat effects - includeGroupByRegex 'com\\.github\\.jetradarmobile' - includeGroupByRegex 'nl\\.dionsegijn' - - // Voice RecordView - includeGroupByRegex 'com\\.github\\.Armen101' + includeGroup 'com.github.Armen101' + includeGroup 'com.github.BillCarsonFr' + includeGroup 'com.github.chrisbanes' + includeGroup 'com.github.hyuwah' + includeGroup 'com.github.jetradarmobile' + includeGroup 'com.github.vector-im' + includeGroup 'com.github.yalantis' + includeGroup 'com.github.Zhuinden' } } maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } From 2b6618ab404a234302da0a4e829da889c9114780 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 9 Dec 2021 21:23:33 +0100 Subject: [PATCH 06/20] Add explicit dependency location for jitsi --- build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build.gradle b/build.gradle index a09d485226..8dc098ad55 100644 --- a/build.gradle +++ b/build.gradle @@ -64,6 +64,11 @@ allprojects { url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-3.10.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.10.0" + content { + includeGroup 'com.facebook.react' + includeGroup 'org.jitsi.react' + includeGroup 'org.webkit' + } } google() mavenCentral() From ced159b1b1ed8acf720acd3d680617dafef75605 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 9 Dec 2021 21:41:37 +0100 Subject: [PATCH 07/20] Add explicit dependency location for google --- build.gradle | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8dc098ad55..1c6c4d80a9 100644 --- a/build.gradle +++ b/build.gradle @@ -70,7 +70,14 @@ allprojects { includeGroup 'org.webkit' } } - google() + google { + content { + includeGroupByRegex "androidx\\..*" + includeGroupByRegex "com\\.google\\.android\\..*" + includeGroup 'com.android.tools.build' + includeGroup 'com.google.firebase' + } + } mavenCentral() jcenter { content { From 61625095cf6f9fa237c542fe8e87cd06a77411c9 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 9 Dec 2021 21:46:58 +0100 Subject: [PATCH 08/20] Cleanup --- build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.gradle b/build.gradle index 1c6c4d80a9..fe1d9f454f 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,6 @@ allprojects { includeGroup 'org.matrix.android' } } - maven { url 'https://jitpack.io' content { @@ -58,7 +57,6 @@ allprojects { includeGroup 'com.github.Zhuinden' } } - 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.10.0" From 3604b1cc63c34e376a0b3a0480db701b44f50b94 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 9 Dec 2021 22:16:20 +0100 Subject: [PATCH 09/20] Add explicit dependency location for mavencentral --- build.gradle | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index fe1d9f454f..3c125becf6 100644 --- a/build.gradle +++ b/build.gradle @@ -76,7 +76,84 @@ allprojects { includeGroup 'com.google.firebase' } } - mavenCentral() + mavenCentral { + content { + includeGroup 'com.airbnb.android' + includeGroup 'com.arthenica' + includeGroup 'com.atlassian.commonmark' + includeGroup 'com.atlassian.pom' + includeGroup 'com.davemorrissey.labs' + includeGroup 'com.dropbox.core' + includeGroup 'com.facebook.fresco' + includeGroup 'com.facebook.infer.annotation' + includeGroup 'com.facebook.soloader' + includeGroup 'com.facebook.stetho' + includeGroup 'com.fasterxml' + includeGroup 'com.fasterxml.jackson' + includeGroup 'com.fasterxml.jackson.core' + includeGroup 'com.gabrielittner.threetenbp' + includeGroup 'com.getkeepsafe.relinker' + includeGroup 'com.github.bumptech.glide' + includeGroup 'com.github.filippudak' + includeGroup 'com.github.filippudak.progresspieview' + includeGroup 'com.github.piasy' + includeGroup 'com.google.auto.service' + includeGroup 'com.google.code.findbugs' + includeGroup 'com.google.code.gson' + includeGroup 'com.google.dagger' + includeGroup 'com.google.devtools.ksp' + includeGroup 'com.google.errorprone' + includeGroup 'com.google.googlejavaformat' + includeGroup 'com.google.guava' + includeGroup 'com.google.j2objc' + includeGroup 'com.google.zxing' + includeGroup 'com.googlecode.htmlcompressor' + includeGroup 'com.googlecode.libphonenumber' + includeGroup 'com.jakewharton.timber' + includeGroup 'com.nulab-inc' + includeGroup 'com.otaliastudios.opengl' + includeGroup 'com.parse.bolts' + includeGroup 'com.squareup' + includeGroup 'com.squareup.duktape' + includeGroup 'com.squareup.moshi' + includeGroup 'com.squareup.okhttp3' + includeGroup 'com.squareup.okio' + includeGroup 'com.squareup.retrofit2' + includeGroup 'com.vanniktech' + includeGroup 'commons-cli' + includeGroup 'commons-codec' + includeGroup 'io.arrow-kt' + includeGroup 'io.github.reactivecircus.flowbinding' + includeGroup 'io.jsonwebtoken' + includeGroup 'io.kindedj' + includeGroup 'io.noties.markwon' + includeGroup 'io.reactivex.rxjava2' + includeGroup 'io.realm' + includeGroup 'javax.annotation' + includeGroup 'javax.inject' + includeGroup 'jp.wasabeef' + includeGroup 'me.leolin' + includeGroup 'me.saket' + includeGroup 'net.ltgt.gradle.incap' + includeGroup 'nl.dionsegijn' + includeGroup 'org.apache' + includeGroup 'org.apache.commons' + includeGroup 'org.apache.sanselan' + includeGroup 'org.checkerframework' + includeGroup 'org.jetbrains' + includeGroup 'org.jetbrains.intellij.deps' + includeGroup 'org.jetbrains.kotlin' + includeGroup 'org.jetbrains.kotlinx' + includeGroup 'org.mongodb' + includeGroup 'org.ow2' + includeGroup 'org.ow2.asm' + includeGroup 'org.ow2.asm' + includeGroup 'org.reactivestreams' + includeGroup 'org.slf4j' + includeGroup 'org.sonatype.oss' + includeGroup 'org.threeten' + } + } jcenter { content { includeGroup 'com.amulyakhare' From c32c0f8d7d1b06799754682ed8f93a0a29227c84 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 9 Dec 2021 23:11:54 +0100 Subject: [PATCH 10/20] Add missing dependency to run lint --- build.gradle | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3c125becf6..25f0bb210b 100644 --- a/build.gradle +++ b/build.gradle @@ -71,17 +71,21 @@ allprojects { google { content { includeGroupByRegex "androidx\\..*" + includeGroupByRegex 'com\\.android\\.tools\\..*' includeGroupByRegex "com\\.google\\.android\\..*" - includeGroup 'com.android.tools.build' includeGroup 'com.google.firebase' + includeGroup 'com.android' + includeGroup 'com.android.tools' } } mavenCentral { content { includeGroup 'com.airbnb.android' + includeGroup 'com.almworks.sqlite4java' includeGroup 'com.arthenica' includeGroup 'com.atlassian.commonmark' includeGroup 'com.atlassian.pom' + includeGroup 'com.beust' includeGroup 'com.davemorrissey.labs' includeGroup 'com.dropbox.core' includeGroup 'com.facebook.fresco' @@ -96,8 +100,10 @@ allprojects { includeGroup 'com.github.bumptech.glide' includeGroup 'com.github.filippudak' includeGroup 'com.github.filippudak.progresspieview' + includeGroup 'com.github.javaparser' includeGroup 'com.github.piasy' includeGroup 'com.google.auto.service' + includeGroup 'com.google.auto.value' includeGroup 'com.google.code.findbugs' includeGroup 'com.google.code.gson' includeGroup 'com.google.dagger' @@ -106,9 +112,13 @@ allprojects { includeGroup 'com.google.googlejavaformat' includeGroup 'com.google.guava' includeGroup 'com.google.j2objc' + includeGroup 'com.google.jimfs' + includeGroup 'com.google.protobuf' includeGroup 'com.google.zxing' includeGroup 'com.googlecode.htmlcompressor' + includeGroup 'com.googlecode.json-simple' includeGroup 'com.googlecode.libphonenumber' + includeGroup 'com.ibm.icu' includeGroup 'com.jakewharton.timber' includeGroup 'com.nulab-inc' includeGroup 'com.otaliastudios.opengl' @@ -119,39 +129,80 @@ allprojects { includeGroup 'com.squareup.okhttp3' includeGroup 'com.squareup.okio' includeGroup 'com.squareup.retrofit2' + includeGroup 'com.sun.activation' + includeGroup 'com.sun.istack' + includeGroup 'com.sun.xml.bind' + includeGroup 'com.sun.xml.bind.mvn' + includeGroup 'com.sun.xml.fastinfoset' + includeGroup 'com.thoughtworks.qdox' includeGroup 'com.vanniktech' includeGroup 'commons-cli' includeGroup 'commons-codec' + includeGroup 'commons-io' + includeGroup 'commons-logging' + includeGroup 'info.picocli' includeGroup 'io.arrow-kt' includeGroup 'io.github.reactivecircus.flowbinding' includeGroup 'io.jsonwebtoken' includeGroup 'io.kindedj' + includeGroup 'io.mockk' includeGroup 'io.noties.markwon' includeGroup 'io.reactivex.rxjava2' includeGroup 'io.realm' + includeGroup 'it.unimi.dsi' + includeGroup 'jakarta.activation' + includeGroup 'jakarta.xml.bind' includeGroup 'javax.annotation' includeGroup 'javax.inject' + includeGroup 'jline' includeGroup 'jp.wasabeef' + includeGroup 'junit' includeGroup 'me.leolin' includeGroup 'me.saket' + includeGroup 'net.bytebuddy' + includeGroup 'net.java' + includeGroup 'net.java.dev.jna' + includeGroup 'net.lachlanmckee' includeGroup 'net.ltgt.gradle.incap' + includeGroup 'net.sf.jopt-simple' + includeGroup 'net.sf.kxml' includeGroup 'nl.dionsegijn' + includeGroup 'org.amshove.kluent' includeGroup 'org.apache' + includeGroup 'org.apache.ant' includeGroup 'org.apache.commons' + includeGroup 'org.apache.httpcomponents' includeGroup 'org.apache.sanselan' + includeGroup 'org.bouncycastle' includeGroup 'org.checkerframework' + includeGroup 'org.codehaus' + includeGroup 'org.codehaus.groovy' + includeGroup 'org.codehaus.mojo' + includeGroup 'org.eclipse.ee4j' + includeGroup 'org.glassfish.jaxb' + includeGroup 'org.hamcrest' includeGroup 'org.jetbrains' includeGroup 'org.jetbrains.intellij.deps' includeGroup 'org.jetbrains.kotlin' includeGroup 'org.jetbrains.kotlinx' + includeGroup 'org.junit' + includeGroup 'org.junit.jupiter' + includeGroup 'org.junit.platform' + includeGroup 'org.jvnet.staxex' includeGroup 'org.mongodb' + includeGroup 'org.objenesis' + includeGroup 'org.opentest4j' includeGroup 'org.ow2' includeGroup 'org.ow2.asm' includeGroup 'org.ow2.asm' includeGroup 'org.reactivestreams' + includeGroup 'org.robolectric' includeGroup 'org.slf4j' includeGroup 'org.sonatype.oss' + includeGroup 'org.testng' includeGroup 'org.threeten' + includeGroup 'xerces' + includeGroup 'xml-apis' } } jcenter { From f69f303246222ed8942dc41b1cf7fcc0d51f747f Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 9 Dec 2021 23:23:12 +0100 Subject: [PATCH 11/20] Add missing dependency to compile Android tests --- build.gradle | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build.gradle b/build.gradle index 25f0bb210b..19f83673fc 100644 --- a/build.gradle +++ b/build.gradle @@ -80,6 +80,7 @@ allprojects { } mavenCentral { content { + includeGroup 'com.adevinta.android' includeGroup 'com.airbnb.android' includeGroup 'com.almworks.sqlite4java' includeGroup 'com.arthenica' @@ -102,6 +103,7 @@ allprojects { includeGroup 'com.github.filippudak.progresspieview' includeGroup 'com.github.javaparser' includeGroup 'com.github.piasy' + includeGroup 'com.google' includeGroup 'com.google.auto.service' includeGroup 'com.google.auto.value' includeGroup 'com.google.code.findbugs' @@ -119,7 +121,9 @@ allprojects { includeGroup 'com.googlecode.json-simple' includeGroup 'com.googlecode.libphonenumber' includeGroup 'com.ibm.icu' + includeGroup 'com.jakewharton.android.repackaged' includeGroup 'com.jakewharton.timber' + includeGroup 'com.linkedin.dexmaker' includeGroup 'com.nulab-inc' includeGroup 'com.otaliastudios.opengl' includeGroup 'com.parse.bolts' @@ -185,10 +189,12 @@ allprojects { includeGroup 'org.jetbrains.intellij.deps' includeGroup 'org.jetbrains.kotlin' includeGroup 'org.jetbrains.kotlinx' + includeGroup 'org.jsoup' includeGroup 'org.junit' includeGroup 'org.junit.jupiter' includeGroup 'org.junit.platform' includeGroup 'org.jvnet.staxex' + includeGroup 'org.mockito' includeGroup 'org.mongodb' includeGroup 'org.objenesis' includeGroup 'org.opentest4j' From 29837d48fe7999aa6f16538cc4644f227113f86e Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 9 Dec 2021 23:37:06 +0100 Subject: [PATCH 12/20] Alerter is now on Jitpack --- build.gradle | 2 +- vector/build.gradle | 3 +-- .../java/im/vector/app/features/popup/PopupAlertManager.kt | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 19f83673fc..6dd36f9d35 100644 --- a/build.gradle +++ b/build.gradle @@ -52,6 +52,7 @@ allprojects { includeGroup 'com.github.chrisbanes' includeGroup 'com.github.hyuwah' includeGroup 'com.github.jetradarmobile' + includeGroup 'com.github.tapadoo' includeGroup 'com.github.vector-im' includeGroup 'com.github.yalantis' includeGroup 'com.github.Zhuinden' @@ -216,7 +217,6 @@ allprojects { includeGroup 'com.amulyakhare' includeGroup 'com.danikula' includeGroup 'com.otaliastudios' - includeGroup 'com.tapadoo.android' includeGroup 'com.yqritc' includeGroup 'dk.ilios' includeGroup 'im.dlg' diff --git a/vector/build.gradle b/vector/build.gradle index f2247efc77..6c519d5cea 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -415,8 +415,7 @@ dependencies { implementation 'com.arthenica:ffmpeg-kit-audio:4.5.LTS' // Alerter - // TODO 7.2.4 is available - implementation 'com.tapadoo.android:alerter:7.0.1' + implementation 'com.github.tapadoo:alerter:7.2.4' implementation 'com.otaliastudios:autocomplete:1.1.0' diff --git a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt index f849d39bf8..22bbabf9e3 100644 --- a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt +++ b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt @@ -104,7 +104,7 @@ class PopupAlertManager @Inject constructor() { // we want to remove existing popup on previous activity and display it on new one if (currentAlerter != null) { weakCurrentActivity?.get()?.let { - Alerter.clearCurrent(it, null) + Alerter.clearCurrent(it, null, null) if (currentAlerter?.isLight == false) { setLightStatusBar() } From 0df11fc145f2abb2df6e7de1342340493f1d2d87 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 9 Dec 2021 23:47:04 +0100 Subject: [PATCH 13/20] Remove unused dependency videocache --- build.gradle | 1 - vector/build.gradle | 6 ------ vector/src/main/assets/open_source_licenses.html | 5 ----- 3 files changed, 12 deletions(-) diff --git a/build.gradle b/build.gradle index 6dd36f9d35..ae6967a1f8 100644 --- a/build.gradle +++ b/build.gradle @@ -215,7 +215,6 @@ allprojects { jcenter { content { includeGroup 'com.amulyakhare' - includeGroup 'com.danikula' includeGroup 'com.otaliastudios' includeGroup 'com.yqritc' includeGroup 'dk.ilios' diff --git a/vector/build.gradle b/vector/build.gradle index 6c519d5cea..283d71d3d9 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -317,11 +317,6 @@ android { } } -configurations { - // videocache includes a sl4j logger which causes mockk to attempt to call the static android Log - testImplementation.exclude group: 'org.slf4j', module: 'slf4j-android' -} - dependencies { implementation project(":matrix-sdk-android") @@ -433,7 +428,6 @@ dependencies { implementation libs.github.glide kapt libs.github.glideCompiler - implementation 'com.danikula:videocache:2.7.1' implementation 'com.github.yalantis:ucrop:2.2.7' // Badge for compatibility diff --git a/vector/src/main/assets/open_source_licenses.html b/vector/src/main/assets/open_source_licenses.html index 529b7da2f1..5afee2389e 100755 --- a/vector/src/main/assets/open_source_licenses.html +++ b/vector/src/main/assets/open_source_licenses.html @@ -333,11 +333,6 @@ SOFTWARE.
Copyright 2012 Square, Inc. -
  • - videocache -
    - Copyright 2014-2017 Alexey Danilov -
  • ShortcutBadger
    From b1f78004cf886fcc052360e97b7f887066b6c8cb Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 9 Dec 2021 23:59:16 +0100 Subject: [PATCH 14/20] Add comment --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index ae6967a1f8..51fcb83d5b 100644 --- a/build.gradle +++ b/build.gradle @@ -217,6 +217,7 @@ allprojects { includeGroup 'com.amulyakhare' includeGroup 'com.otaliastudios' includeGroup 'com.yqritc' + // https://github.com/cmelchior/realmfieldnameshelper/issues/42 includeGroup 'dk.ilios' includeGroup 'im.dlg' includeGroup 'me.dm7.barcodescanner' From 1267468704a8453411f74686381e32cb9ea7ad82 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 10 Dec 2021 00:04:10 +0100 Subject: [PATCH 15/20] Add missing dependency for ktlint --- build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build.gradle b/build.gradle index 51fcb83d5b..604b620197 100644 --- a/build.gradle +++ b/build.gradle @@ -104,6 +104,7 @@ allprojects { includeGroup 'com.github.filippudak.progresspieview' includeGroup 'com.github.javaparser' includeGroup 'com.github.piasy' + includeGroup 'com.github.shyiko.klob' includeGroup 'com.google' includeGroup 'com.google.auto.service' includeGroup 'com.google.auto.value' @@ -128,6 +129,8 @@ allprojects { includeGroup 'com.nulab-inc' includeGroup 'com.otaliastudios.opengl' includeGroup 'com.parse.bolts' + includeGroup 'com.pinterest' + includeGroup 'com.pinterest.ktlint' includeGroup 'com.squareup' includeGroup 'com.squareup.duktape' includeGroup 'com.squareup.moshi' @@ -147,6 +150,7 @@ allprojects { includeGroup 'commons-logging' includeGroup 'info.picocli' includeGroup 'io.arrow-kt' + includeGroup 'io.github.detekt.sarif4k' includeGroup 'io.github.reactivecircus.flowbinding' includeGroup 'io.jsonwebtoken' includeGroup 'io.kindedj' @@ -184,6 +188,7 @@ allprojects { includeGroup 'org.codehaus.groovy' includeGroup 'org.codehaus.mojo' includeGroup 'org.eclipse.ee4j' + includeGroup 'org.ec4j.core' includeGroup 'org.glassfish.jaxb' includeGroup 'org.hamcrest' includeGroup 'org.jetbrains' From 01cc7b7264fe40a1a2179d553bc1c3c9ebc148c5 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 10 Dec 2021 00:07:27 +0100 Subject: [PATCH 16/20] Changelog --- changelog.d/4670.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/4670.misc diff --git a/changelog.d/4670.misc b/changelog.d/4670.misc new file mode 100644 index 0000000000..6b1233145b --- /dev/null +++ b/changelog.d/4670.misc @@ -0,0 +1 @@ +Add explicit dependency location, regarding the several maven repository. Also update some libraries (flexbox and alerter), and do some cleanup. \ No newline at end of file From c514a3b063043fa71ed82f3af287cefda11a1cbb Mon Sep 17 00:00:00 2001 From: ariskotsomitopoulos Date: Fri, 10 Dec 2021 19:09:14 +0200 Subject: [PATCH 17/20] Enhance include groups implementation by decoupling them to a separate file --- build.gradle | 170 +++----------------------------------- includegroups.gradle | 188 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 197 insertions(+), 161 deletions(-) create mode 100644 includegroups.gradle diff --git a/build.gradle b/build.gradle index 604b620197..5eba557f6c 100644 --- a/build.gradle +++ b/build.gradle @@ -3,6 +3,7 @@ buildscript { apply from: 'dependencies.gradle' + apply from: 'includegroups.gradle' repositories { google() @@ -41,21 +42,13 @@ allprojects { maven { url 'https://gitlab.matrix.org/api/v4/projects/27/packages/maven' content { - includeGroup 'org.matrix.android' + includeGroups.maven["gitlab.matrix.org"].each { includeGroup it } } } maven { url 'https://jitpack.io' content { - includeGroup 'com.github.Armen101' - includeGroup 'com.github.BillCarsonFr' - includeGroup 'com.github.chrisbanes' - includeGroup 'com.github.hyuwah' - includeGroup 'com.github.jetradarmobile' - includeGroup 'com.github.tapadoo' - includeGroup 'com.github.vector-im' - includeGroup 'com.github.yalantis' - includeGroup 'com.github.Zhuinden' + includeGroups.maven["jitpack.io"].each { includeGroup it } } } // Jitsi repo @@ -64,169 +57,24 @@ allprojects { // Note: to test Jitsi release you can use a local file like this: // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-3.10.0" content { - includeGroup 'com.facebook.react' - includeGroup 'org.jitsi.react' - includeGroup 'org.webkit' + includeGroups.maven["github.com/vector-im"].each { includeGroup it } } } google { content { - includeGroupByRegex "androidx\\..*" - includeGroupByRegex 'com\\.android\\.tools\\..*' - includeGroupByRegex "com\\.google\\.android\\..*" - includeGroup 'com.google.firebase' - includeGroup 'com.android' - includeGroup 'com.android.tools' + includeGroups.google["all"].each { includeGroup it } + includeGroups.google["regex"].each { includeGroupByRegex it } } } mavenCentral { content { - includeGroup 'com.adevinta.android' - includeGroup 'com.airbnb.android' - includeGroup 'com.almworks.sqlite4java' - includeGroup 'com.arthenica' - includeGroup 'com.atlassian.commonmark' - includeGroup 'com.atlassian.pom' - includeGroup 'com.beust' - includeGroup 'com.davemorrissey.labs' - includeGroup 'com.dropbox.core' - includeGroup 'com.facebook.fresco' - includeGroup 'com.facebook.infer.annotation' - includeGroup 'com.facebook.soloader' - includeGroup 'com.facebook.stetho' - includeGroup 'com.fasterxml' - includeGroup 'com.fasterxml.jackson' - includeGroup 'com.fasterxml.jackson.core' - includeGroup 'com.gabrielittner.threetenbp' - includeGroup 'com.getkeepsafe.relinker' - includeGroup 'com.github.bumptech.glide' - includeGroup 'com.github.filippudak' - includeGroup 'com.github.filippudak.progresspieview' - includeGroup 'com.github.javaparser' - includeGroup 'com.github.piasy' - includeGroup 'com.github.shyiko.klob' - includeGroup 'com.google' - includeGroup 'com.google.auto.service' - includeGroup 'com.google.auto.value' - includeGroup 'com.google.code.findbugs' - includeGroup 'com.google.code.gson' - includeGroup 'com.google.dagger' - includeGroup 'com.google.devtools.ksp' - includeGroup 'com.google.errorprone' - includeGroup 'com.google.googlejavaformat' - includeGroup 'com.google.guava' - includeGroup 'com.google.j2objc' - includeGroup 'com.google.jimfs' - includeGroup 'com.google.protobuf' - includeGroup 'com.google.zxing' - includeGroup 'com.googlecode.htmlcompressor' - includeGroup 'com.googlecode.json-simple' - includeGroup 'com.googlecode.libphonenumber' - includeGroup 'com.ibm.icu' - includeGroup 'com.jakewharton.android.repackaged' - includeGroup 'com.jakewharton.timber' - includeGroup 'com.linkedin.dexmaker' - includeGroup 'com.nulab-inc' - includeGroup 'com.otaliastudios.opengl' - includeGroup 'com.parse.bolts' - includeGroup 'com.pinterest' - includeGroup 'com.pinterest.ktlint' - includeGroup 'com.squareup' - includeGroup 'com.squareup.duktape' - includeGroup 'com.squareup.moshi' - includeGroup 'com.squareup.okhttp3' - includeGroup 'com.squareup.okio' - includeGroup 'com.squareup.retrofit2' - includeGroup 'com.sun.activation' - includeGroup 'com.sun.istack' - includeGroup 'com.sun.xml.bind' - includeGroup 'com.sun.xml.bind.mvn' - includeGroup 'com.sun.xml.fastinfoset' - includeGroup 'com.thoughtworks.qdox' - includeGroup 'com.vanniktech' - includeGroup 'commons-cli' - includeGroup 'commons-codec' - includeGroup 'commons-io' - includeGroup 'commons-logging' - includeGroup 'info.picocli' - includeGroup 'io.arrow-kt' - includeGroup 'io.github.detekt.sarif4k' - includeGroup 'io.github.reactivecircus.flowbinding' - includeGroup 'io.jsonwebtoken' - includeGroup 'io.kindedj' - includeGroup 'io.mockk' - includeGroup 'io.noties.markwon' - includeGroup 'io.reactivex.rxjava2' - includeGroup 'io.realm' - includeGroup 'it.unimi.dsi' - includeGroup 'jakarta.activation' - includeGroup 'jakarta.xml.bind' - includeGroup 'javax.annotation' - includeGroup 'javax.inject' - includeGroup 'jline' - includeGroup 'jp.wasabeef' - includeGroup 'junit' - includeGroup 'me.leolin' - includeGroup 'me.saket' - includeGroup 'net.bytebuddy' - includeGroup 'net.java' - includeGroup 'net.java.dev.jna' - includeGroup 'net.lachlanmckee' - includeGroup 'net.ltgt.gradle.incap' - includeGroup 'net.sf.jopt-simple' - includeGroup 'net.sf.kxml' - includeGroup 'nl.dionsegijn' - includeGroup 'org.amshove.kluent' - includeGroup 'org.apache' - includeGroup 'org.apache.ant' - includeGroup 'org.apache.commons' - includeGroup 'org.apache.httpcomponents' - includeGroup 'org.apache.sanselan' - includeGroup 'org.bouncycastle' - includeGroup 'org.checkerframework' - includeGroup 'org.codehaus' - includeGroup 'org.codehaus.groovy' - includeGroup 'org.codehaus.mojo' - includeGroup 'org.eclipse.ee4j' - includeGroup 'org.ec4j.core' - includeGroup 'org.glassfish.jaxb' - includeGroup 'org.hamcrest' - includeGroup 'org.jetbrains' - includeGroup 'org.jetbrains.intellij.deps' - includeGroup 'org.jetbrains.kotlin' - includeGroup 'org.jetbrains.kotlinx' - includeGroup 'org.jsoup' - includeGroup 'org.junit' - includeGroup 'org.junit.jupiter' - includeGroup 'org.junit.platform' - includeGroup 'org.jvnet.staxex' - includeGroup 'org.mockito' - includeGroup 'org.mongodb' - includeGroup 'org.objenesis' - includeGroup 'org.opentest4j' - includeGroup 'org.ow2' - includeGroup 'org.ow2.asm' - includeGroup 'org.ow2.asm' - includeGroup 'org.reactivestreams' - includeGroup 'org.robolectric' - includeGroup 'org.slf4j' - includeGroup 'org.sonatype.oss' - includeGroup 'org.testng' - includeGroup 'org.threeten' - includeGroup 'xerces' - includeGroup 'xml-apis' + includeGroups.mavenCentral["all"].each { includeGroup it } } } + //noinspection JcenterRepositoryObsolete jcenter { content { - includeGroup 'com.amulyakhare' - includeGroup 'com.otaliastudios' - includeGroup 'com.yqritc' - // https://github.com/cmelchior/realmfieldnameshelper/issues/42 - includeGroup 'dk.ilios' - includeGroup 'im.dlg' - includeGroup 'me.dm7.barcodescanner' - includeGroup 'me.gujun.android' + includeGroups.jcenter["all"].each { includeGroup it } } } } diff --git a/includegroups.gradle b/includegroups.gradle new file mode 100644 index 0000000000..4707bf67c5 --- /dev/null +++ b/includegroups.gradle @@ -0,0 +1,188 @@ +ext.includeGroups = [ + maven : [ + 'jitpack.io' : [ + 'com.github.Armen101', + 'com.github.BillCarsonFr', + 'com.github.chrisbanes', + 'com.github.hyuwah', + 'com.github.jetradarmobile', + 'com.github.tapadoo', + 'com.github.vector-im', + 'com.github.yalantis', + 'com.github.Zhuinden' + ], + 'gitlab.matrix.org' : [ + 'org.matrix.android' + ], + 'github.com/vector-im': [ + 'com.facebook.react', + 'org.jitsi.react', + 'org.webkit' + ] + + ], + google : [ + 'all' : [ + 'com.google.firebase', + 'com.android', + 'com.android.tools' + ], + 'regex': [ + 'androidx\\..*', + 'com\\.android\\.tools\\..*', + 'com\\.google\\.android\\..*' + ] + ], + mavenCentral: [ + 'all': [ + 'com.adevinta.android', + 'com.airbnb.android', + 'com.almworks.sqlite4java', + 'com.arthenica', + 'com.atlassian.commonmark', + 'com.atlassian.pom', + 'com.beust', + 'com.davemorrissey.labs', + 'com.dropbox.core', + 'com.facebook.fresco', + 'com.facebook.infer.annotation', + 'com.facebook.soloader', + 'com.facebook.stetho', + 'com.fasterxml', + 'com.fasterxml.jackson', + 'com.fasterxml.jackson.core', + 'com.gabrielittner.threetenbp', + 'com.getkeepsafe.relinker', + 'com.github.bumptech.glide', + 'com.github.filippudak', + 'com.github.filippudak.progresspieview', + 'com.github.javaparser', + 'com.github.piasy', + 'com.github.shyiko.klob', + 'com.google', + 'com.google.auto.service', + 'com.google.auto.value', + 'com.google.code.findbugs', + 'com.google.code.gson', + 'com.google.dagger', + 'com.google.devtools.ksp', + 'com.google.errorprone', + 'com.google.googlejavaformat', + 'com.google.guava', + 'com.google.j2objc', + 'com.google.jimfs', + 'com.google.protobuf', + 'com.google.zxing', + 'com.googlecode.htmlcompressor', + 'com.googlecode.json-simple', + 'com.googlecode.libphonenumber', + 'com.ibm.icu', + 'com.jakewharton.android.repackaged', + 'com.jakewharton.timber', + 'com.linkedin.dexmaker', + 'com.nulab-inc', + 'com.otaliastudios.opengl', + 'com.parse.bolts', + 'com.pinterest', + 'com.pinterest.ktlint', + 'com.squareup', + 'com.squareup.duktape', + 'com.squareup.moshi', + 'com.squareup.okhttp3', + 'com.squareup.okio', + 'com.squareup.retrofit2', + 'com.sun.activation', + 'com.sun.istack', + 'com.sun.xml.bind', + 'com.sun.xml.bind.mvn', + 'com.sun.xml.fastinfoset', + 'com.thoughtworks.qdox', + 'com.vanniktech', + 'commons-cli', + 'commons-codec', + 'commons-io', + 'commons-logging', + 'info.picocli', + 'io.arrow-kt', + 'io.github.detekt.sarif4k', + 'io.github.reactivecircus.flowbinding', + 'io.jsonwebtoken', + 'io.kindedj', + 'io.mockk', + 'io.noties.markwon', + 'io.reactivex.rxjava2', + 'io.realm', + 'it.unimi.dsi', + 'jakarta.activation', + 'jakarta.xml.bind', + 'javax.annotation', + 'javax.inject', + 'jline', + 'jp.wasabeef', + 'junit', + 'me.leolin', + 'me.saket', + 'net.bytebuddy', + 'net.java', + 'net.java.dev.jna', + 'net.lachlanmckee', + 'net.ltgt.gradle.incap', + 'net.sf.jopt-simple', + 'net.sf.kxml', + 'nl.dionsegijn', + 'org.amshove.kluent', + 'org.apache', + 'org.apache.ant', + 'org.apache.commons', + 'org.apache.httpcomponents', + 'org.apache.sanselan', + 'org.bouncycastle', + 'org.checkerframework', + 'org.codehaus', + 'org.codehaus.groovy', + 'org.codehaus.mojo', + 'org.eclipse.ee4j', + 'org.ec4j.core', + 'org.glassfish.jaxb', + 'org.hamcrest', + 'org.jetbrains', + 'org.jetbrains.intellij.deps', + 'org.jetbrains.kotlin', + 'org.jetbrains.kotlinx', + 'org.jsoup', + 'org.junit', + 'org.junit.jupiter', + 'org.junit.platform', + 'org.jvnet.staxex', + 'org.mockito', + 'org.mongodb', + 'org.objenesis', + 'org.opentest4j', + 'org.ow2', + 'org.ow2.asm', + 'org.ow2.asm', + 'org.reactivestreams', + 'org.robolectric', + 'org.slf4j', + 'org.sonatype.oss', + 'org.testng', + 'org.threeten', + 'xerces', + 'xml-apis' + ] + ], + jcenter : [ + 'all': [ + 'com.amulyakhare', + 'com.otaliastudios', + 'com.yqritc', + // https://github.com/cmelchior/realmfieldnameshelper/issues/42 + 'dk.ilios', + 'im.dlg', + 'me.dm7.barcodescanner', + 'me.gujun.android' + ] + + ] +] + From 45ff069d664f33a82cbeef35690acbac9f514d82 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 10 Dec 2021 21:19:43 +0100 Subject: [PATCH 18/20] Rename the file to group them --- build.gradle | 3 +-- includegroups.gradle => dependencies_groups.gradle | 0 2 files changed, 1 insertion(+), 2 deletions(-) rename includegroups.gradle => dependencies_groups.gradle (100%) diff --git a/build.gradle b/build.gradle index 5eba557f6c..9c1c0b41c7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,8 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - apply from: 'dependencies.gradle' - apply from: 'includegroups.gradle' + apply from: 'dependencies_groups.gradle' repositories { google() diff --git a/includegroups.gradle b/dependencies_groups.gradle similarity index 100% rename from includegroups.gradle rename to dependencies_groups.gradle From a71f2415a633b17e312a810d099f696affcaa573 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 10 Dec 2021 21:35:48 +0100 Subject: [PATCH 19/20] Common struct for each maven repo --- build.gradle | 19 +++++++++----- dependencies_groups.gradle | 54 +++++++++++++++++++++++--------------- 2 files changed, 45 insertions(+), 28 deletions(-) diff --git a/build.gradle b/build.gradle index 9c1c0b41c7..27cf94bef9 100644 --- a/build.gradle +++ b/build.gradle @@ -41,13 +41,15 @@ allprojects { maven { url 'https://gitlab.matrix.org/api/v4/projects/27/packages/maven' content { - includeGroups.maven["gitlab.matrix.org"].each { includeGroup it } + groups.olm.regex.each { includeGroupByRegex it } + groups.olm.group.each { includeGroup it } } } maven { url 'https://jitpack.io' content { - includeGroups.maven["jitpack.io"].each { includeGroup it } + groups.jitpack.regex.each { includeGroupByRegex it } + groups.jitpack.group.each { includeGroup it } } } // Jitsi repo @@ -56,24 +58,27 @@ allprojects { // Note: to test Jitsi release you can use a local file like this: // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-3.10.0" content { - includeGroups.maven["github.com/vector-im"].each { includeGroup it } + groups.jitsi.regex.each { includeGroupByRegex it } + groups.jitsi.group.each { includeGroup it } } } google { content { - includeGroups.google["all"].each { includeGroup it } - includeGroups.google["regex"].each { includeGroupByRegex it } + groups.google.regex.each { includeGroupByRegex it } + groups.google.group.each { includeGroup it } } } mavenCentral { content { - includeGroups.mavenCentral["all"].each { includeGroup it } + groups.mavenCentral.regex.each { includeGroupByRegex it } + groups.mavenCentral.group.each { includeGroup it } } } //noinspection JcenterRepositoryObsolete jcenter { content { - includeGroups.jcenter["all"].each { includeGroup it } + groups.jcenter.regex.each { includeGroupByRegex it } + groups.jcenter.group.each { includeGroup it } } } } diff --git a/dependencies_groups.gradle b/dependencies_groups.gradle index 4707bf67c5..c677290adc 100644 --- a/dependencies_groups.gradle +++ b/dependencies_groups.gradle @@ -1,6 +1,8 @@ -ext.includeGroups = [ - maven : [ - 'jitpack.io' : [ +ext.groups = [ + jitpack : [ + regex: [ + ], + group: [ 'com.github.Armen101', 'com.github.BillCarsonFr', 'com.github.chrisbanes', @@ -9,32 +11,41 @@ ext.includeGroups = [ 'com.github.tapadoo', 'com.github.vector-im', 'com.github.yalantis', - 'com.github.Zhuinden' + 'com.github.Zhuinden', + ] + ], + olm : [ + regex: [ ], - 'gitlab.matrix.org' : [ - 'org.matrix.android' + group: [ + 'org.matrix.android', + ] + ], + jitsi : [ + regex: [ ], - 'github.com/vector-im': [ + group: [ 'com.facebook.react', 'org.jitsi.react', - 'org.webkit' + 'org.webkit', ] - ], google : [ - 'all' : [ - 'com.google.firebase', - 'com.android', - 'com.android.tools' - ], - 'regex': [ + regex: [ 'androidx\\..*', 'com\\.android\\.tools\\..*', - 'com\\.google\\.android\\..*' + 'com\\.google\\.android\\..*', + ], + group: [ + 'com.google.firebase', + 'com.android', + 'com.android.tools', ] ], mavenCentral: [ - 'all': [ + regex: [ + ], + group: [ 'com.adevinta.android', 'com.airbnb.android', 'com.almworks.sqlite4java', @@ -168,11 +179,13 @@ ext.includeGroups = [ 'org.testng', 'org.threeten', 'xerces', - 'xml-apis' + 'xml-apis', ] ], jcenter : [ - 'all': [ + regex: [ + ], + group: [ 'com.amulyakhare', 'com.otaliastudios', 'com.yqritc', @@ -180,9 +193,8 @@ ext.includeGroups = [ 'dk.ilios', 'im.dlg', 'me.dm7.barcodescanner', - 'me.gujun.android' + 'me.gujun.android', ] - ] ] From 7c2ed46dd74743c009da06fdb75b225b425e232e Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 10 Dec 2021 21:40:32 +0100 Subject: [PATCH 20/20] Remove jcenter from here, let's see what the CI will say --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index 27cf94bef9..e17f357905 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,6 @@ buildscript { repositories { google() - jcenter() maven { url "https://plugins.gradle.org/m2/" }