From e6d93ef0a19f04dd7a6aca78984c17e49e0f5b9f Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 15 Apr 2021 20:07:42 +0200
Subject: [PATCH] remove jcenter dependency

---
 build.gradle                  | 23 ++++++++---------------
 core/core_dependencies.gradle |  4 +---
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7b872f31b7..ac84daae56 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,11 +38,6 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        jcenter() {
-            content {
-                includeModule("org.jetbrains.trove4j", "trove4j")
-            }
-        }
         maven { url "https://plugins.gradle.org/m2/" } // jacoco 0.2
     }
     dependencies {
@@ -55,6 +50,11 @@ buildscript {
 
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.hiya:jacoco-android:0.2'
+        modules {
+            module("org.jetbrains.trove4j:trove4j") {
+                replacedBy("org.jetbrains.intellij.deps:trove4j")
+            }
+        }
     }
 }
 
@@ -62,22 +62,15 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        maven {
-            url "https://maven.google.com"
-        }
+        maven { url "https://maven.google.com" }
+        maven { url 'https://jitpack.io' }
+        maven { url "https://google.bintray.com/flexbox-layout" }
         ivy {
             url 'https://github.com/'
             patternLayout {
                 artifact '/[organisation]/[module]/archive/[revision].[ext]'
             }
         }
-        maven { url 'https://jitpack.io' }
-        jcenter() {
-            content {
-                includeModule("com.google.android", "flexbox")
-                includeModule("org.jetbrains.trove4j", "trove4j")
-            }
-        }
     }
     //Support @JvmDefault
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
diff --git a/core/core_dependencies.gradle b/core/core_dependencies.gradle
index 552aa32c15..6fa2e179f9 100644
--- a/core/core_dependencies.gradle
+++ b/core/core_dependencies.gradle
@@ -87,9 +87,7 @@ dependencies {
     api 'com.google.android.gms:play-services-wearable:17.0.0'
     api 'com.google.android.gms:play-services-location:17.1.0'
 
-    api("com.google.android:flexbox:0.3.0") {
-        exclude group: "com.android.support"
-    }
+    api("com.google.android:flexbox:2.0.1")
     api("io.socket:socket.io-client:1.0.0") {
         // excluding org.json which is provided by Android
         exclude group: "org.json", module: "json"