[tor-commits] [orbot/master] start migration away from jcenter and gpmaven repos

[n8fr8 at torproject.org]

commit a6cd5b00e9404617c7803a2988f8c71fa202e7fd
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Tue May 4 14:39:46 2021 +0200

    start migration away from jcenter and gpmaven repos
    
    This enables Maven Central and allows jcenter and gpmaven only for libs
    that are only on those repos. Ultimately, those libs will have to be moved
    to Maven Central or replaced.
---
 app-mini/build.gradle     |  8 ++++++++
 app/build.gradle          | 11 ++++++++++-
 build.gradle              | 18 +++++++++++++++---
 orbotservice/build.gradle |  4 ----
 4 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/app-mini/build.gradle b/app-mini/build.gradle
index 5617f1a0..0b60ccb1 100644
--- a/app-mini/build.gradle
+++ b/app-mini/build.gradle
@@ -104,6 +104,14 @@ android {
     }
 }
 
+repositories {
+    jcenter {
+        content {
+            includeGroup('com.jraska')
+            includeGroup('tools.fastlane')
+        }
+    }
+}
 
 dependencies {
     implementation project(':orbotservice')
diff --git a/app/build.gradle b/app/build.gradle
index 8d5e3ea7..823c119e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -116,6 +116,15 @@ android {
     }
 }
 
+repositories {
+    jcenter {
+        content {
+            includeGroup('com.jraska')
+            includeGroup('tools.fastlane')
+        }
+    }
+}
+
 dependencies {
     implementation project(':orbotservice')
     implementation 'com.google.android.material:material:1.2.1'
@@ -125,7 +134,7 @@ dependencies {
     implementation project(path: ':intentintegrator')
     androidTestImplementation "tools.fastlane:screengrab:1.2.0"
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
-    implementation 'com.android.volley:volley:1.1.1'
+    implementation 'com.android.volley:volley:1.2.0'
     implementation 'com.github.tladesignz:IPtProxy:0.5.2'
 }
 
diff --git a/build.gradle b/build.gradle
index 642dd701..e840c979 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,8 +4,15 @@ buildscript {
         kotlin_version = '1.4.21'
     }
     repositories {
-        jcenter()
+        mavenCentral()
         google()
+        maven { url 'https://jitpack.io' }
+        maven {
+            url "https://raw.githubusercontent.com/guardianproject/gpmaven/master"
+            content {
+                includeGroup('info.pluggabletransports.aptds')
+            }
+        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0-rc01'
@@ -15,9 +22,14 @@ buildscript {
 
 allprojects {
     repositories {
+        mavenCentral()
         google()
-        jcenter()
-        maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" }
         maven { url 'https://jitpack.io' }
+        maven {
+            url "https://raw.githubusercontent.com/guardianproject/gpmaven/master"
+            content {
+                includeGroup('info.pluggabletransports.aptds')
+            }
+        }
     }
 }
diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle
index 165c4d07..c2704caa 100644
--- a/orbotservice/build.gradle
+++ b/orbotservice/build.gradle
@@ -49,10 +49,6 @@ android {
 dependencies {
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
 
-    /**
-    implementation 'info.pluggabletransports.aptds:apt-dispatch-library:1.0.9'
-    implementation 'info.pluggabletransports.aptds:apt-meek-obfs4-legacy:1.0.9'
-     **/
     implementation 'info.pluggabletransports.aptds:jsocksAndroid:1.0.4'
 
     implementation 'com.jaredrummler:android-shell:1.0.0'