Merge branch 'master' into 'master'

Updated I2P to 0.9.25. Leave current version code for testing



See merge request !1353

metadata/net.i2p.android.router.txt

@@ -1,7 +1,7 @@
 Categories:Security,Internet
 License:Apache2
 Web Site:https://geti2p.net
-Source Code:https://gitlab.com/i2p
+Source Code:https://github.com/i2p
 Issue Tracker:https://trac.i2p2.de
 Donate:https://geti2p.net/en/get-involved/donate
 FlattrID:13523
@@ -18,7 +18,7 @@ trusted parties.
 .
 
 Repo Type:git
-Repo:https://gitlab.com/I2P/i2p.android.base.git
+Repo:https://github.com/i2p/i2p.android.base.git
 
 Build:0.9.8.1,4734976
     commit=788445f6ceb0d0c165e98b9b7d1aa732c98d37ac
@@ -196,6 +196,17 @@ Build:0.9.22,4745231
         popd && \
         cp $$GradleWitness$$/build/libs/GradleWitness.jar ../gradle/libs/gradle-witness.jar
 
+Build:0.9.25,4745232
+    commit=02030454d10144a390928c88798ac453a23315b0
+    subdir=app
+    gradle=legacy
+    srclibs=I2P@49ff78cf0e535dd81bf2046cf930ac1e13b0813d
+    prebuild=echo -e "i2psrc=../$$I2P$$" >> ../lib/client/local.properties && \
+        echo -e "sdk.dir=$$SDK$$\nndk.dir=$$NDK$$\ni2psrc=$$I2P$$" >> ../routerjars/local.properties && \
+        sed -i '31i checkReleaseBuilds false\n' build.gradle && \
+        curl https://gmplib.org/download/gmp/gmp-5.0.2.tar.xz | tar xJv -C $$I2P$$/core/c/jbigi/
+    scandelete=lib/client/src/main/jniLibs
+
 Maintainer Notes:
 The version code and name is in app/build.gradle
 Android version code is an integer. So we have 31 bits.

srclibs/I2P.txt

@@ -1,2 +1,2 @@
 Repo Type:git
-Repo:https://gitlab.com/I2P/i2p.i2p.git
+Repo:https://github.com/i2p/i2p.i2p.git