Merge branch 'tracedroid_jcenter' into 'master'

Update TraceDroid to jitpack

See merge request pixeldroid/PixelDroid!314

app/build.gradle

@@ -179,10 +179,9 @@ dependencies {
 
     implementation 'com.karumi:dexter:6.2.2'
 
-    implementation 'com.github.ligi.tracedroid:lib:3.0'
+    implementation 'com.github.ligi:tracedroid:4.1'
-    implementation 'com.github.ligi.tracedroid:supportemail:3.0'
 
-    implementation 'me.relex:circleindicator:2.1.4'
+    implementation 'me.relex:circleindicator:2.1.6'
 
     /**
      * Not in release, so not mentioned in licenses list

app/licenses.yml

@@ -110,11 +110,27 @@
   license: The Apache Software License, Version 2.0
   licenseUrl: http://www.apache.org/licenses/LICENSE-2.0
   url: https://github.com/Yalantis/uCrop
+- artifact: com.github.ligi:tracedroid:+
+  name: tracedroid
+  copyrightHolder: ligi
+  license: The Apache Software License, Version 2.0
+  url: https://github.com/ligi/tracedroid
 - artifact: com.github.ligi.tracedroid:supportemail:+
   name: supportemail
   copyrightHolder: ligi
   license: The Apache Software License, Version 2.0
   url: https://github.com/ligi/tracedroid
+- artifact: com.github.ligi.tracedroid:lib:+
+  name: lib
+  copyrightHolder: ligi
+  license: The Apache Software License, Version 2.0
+  url: https://github.com/ligi/tracedroid
+- artifact: com.jakewharton.timber:timber:+
+  name: timber
+  copyrightHolder: Jake Wharton and contributors
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: https://github.com/JakeWharton/timber
 - artifact: com.mikepenz:fastadapter-extensions-expandable:+
   name: fastadapter-extensions-expandable
   copyrightHolder: Mike Penz and contributors
@@ -619,11 +635,6 @@
   license: The Apache Software License, Version 2.0
   licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
   url: https://github.com/mikepenz/Android-Iconics
-- artifact: com.github.ligi.tracedroid:lib:+
-  name: lib
-  copyrightHolder: ligi
-  license: The Apache Software License, Version 2.0
-  url: https://github.com/ligi/tracedroid
 - artifact: org.jetbrains.kotlinx:kotlinx-coroutines-android:+
   name: kotlinx-coroutines-android
   copyrightHolder: JetBrains s.r.o. and contributors

app/src/main/java/com/h/pixeldroid/MainActivity.kt

@@ -39,7 +39,6 @@ import com.mikepenz.materialdrawer.model.interfaces.*
 import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader
 import com.mikepenz.materialdrawer.util.DrawerImageLoader
 import com.mikepenz.materialdrawer.widget.AccountHeaderView
-import org.ligi.tracedroid.sending.TraceDroidEmailSender
 import retrofit2.HttpException
 import java.io.IOException
 
@@ -69,8 +68,6 @@ class MainActivity : BaseActivity() {
             launchActivity(LoginActivity(), firstTime = true)
             finish()
         } else {
-            TraceDroidEmailSender.sendStackTraces("contact@pixeldroid.org", this)
-
             setupDrawer()
 
             val tabs: List<() -> Fragment> = listOf(

app/src/main/java/com/h/pixeldroid/utils/PixelDroidApplication.kt

@@ -5,6 +5,7 @@ import androidx.preference.PreferenceManager
 import com.h.pixeldroid.utils.di.*
 import com.mikepenz.iconics.Iconics
 import org.ligi.tracedroid.TraceDroid
+import org.ligi.tracedroid.sending.sendTraceDroidStackTracesIfExist
 
 
 class PixelDroidApplication: Application() {
@@ -13,7 +14,10 @@ class PixelDroidApplication: Application() {
 
     override fun onCreate() {
         super.onCreate()
+
         TraceDroid.init(this)
+        sendTraceDroidStackTracesIfExist("contact@pixeldroid.org", this)
+
         val sharedPreferences =
             PreferenceManager.getDefaultSharedPreferences(this)
         setThemeFromPreferences(sharedPreferences, resources)

build.gradle

@@ -1,10 +1,18 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.4.21'
+    ext.kotlin_version = '1.4.31'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
+        jcenter {
+            content {
+                // org.jetbrains.trove4j is only available in JCenter
+                //TODO remove JCenter repo:
+                // see issue https://gitlab.shinice.net/pixeldroid/PixelDroid/-/issues/278
+                includeGroup("org.jetbrains.trove4j")
+            }
+        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.2'
@@ -18,9 +26,21 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven { url "https://jitpack.io" }
+        jcenter {
+            content {
+                // info.androidhive:imagefilters is only available in JCenter
+                //TODO remove JCenter repo:
+                // see issue https://gitlab.shinice.net/pixeldroid/PixelDroid/-/issues/278
+                includeGroup("info.androidhive")
 
+                // org.jetbrains.trove4j is only available in JCenter
+                //TODO remove JCenter repo:
+                // see issue https://gitlab.shinice.net/pixeldroid/PixelDroid/-/issues/278
+                includeGroup("org.jetbrains.trove4j")
+            }
+        }
     }
 }