Merge branch '311' into 'master'

Update Blokada to 3.1.1

See merge request fdroid/fdroiddata!3030

metadata/org.blokada.alarm.txt

@@ -5,17 +5,16 @@ Author Email:hello@blokada.org
 Web Site:https://blokada.org
 Source Code:https://github.com/blokadaorg/blokada
 Issue Tracker:https://github.com/blokadaorg/blokada/issues
+Changelog:https://blokada.org/api/v3/content/en/changelog.html
 Bitcoin:16rJ49uNKCohVhHvWNganP6Y48Ba9BTyKd
 
-Name:Blokada ad blocker
+Name:Blokada v3 (ad blocker)
 Summary:The ad blocker - battery efficient, fast, powerful and simple to use
 Description:
 Block ads without killing the battery
 
-Blokada uses clever techniques to minimize impact on battery life. In fact, most
-users tell us they don't see any battery drain whatsoever. We also put great
-effort to make sure network speed is not affected by ad blocking. Test it
-yourself!
+Try the new version of Blokada to experience even higher level of stability,
+speed and battery efficiency of one of the best ad blockers out there!
 
 Ad blocker you can trust
 
@@ -77,7 +76,21 @@ Build:3.0.0,32
         sed -i -e "/firebaseImplementation/d" build.gradle && \
         sed -i -e "/apply plugin: 'com.google.gms.google-services/d" build.gradle
 
+Build:3.1.1,34
+    commit=3.1.1
+    subdir=app
+    gradle=AdblockerFdroid
+    srclibs=gscore@1.3
+    prebuild=echo -e "ext {\n extVersionName = \"3.1.1\"\n extVersionCode = 34 \n }" >> ../version.gradle && \
+        echo "project(':gscore').projectDir = new File('$PWD/../../srclib/gscore')" >> ../paths.gradle && \
+        echo -e "ext {\n extVersionName = \"1.3\"\n extVersionCode = 13 \n }" >> ../../srclib/gscore/version.gradle && \
+        sed -i -e "/officialImplementation/d" build.gradle && \
+        sed -i -e "/apply plugin: 'com.google.gms.google-services/d" build.gradle && \
+        sed -i -e "/apply plugin: 'io.fabric/d" build.gradle && \
+        sed -i -e "/maven.fabric.io/d" ../build.gradle && \
+        sed -i -e "/classpath 'io.fabric.tools:gradle/d" ../build.gradle
+
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
-Current Version:3.0.0
-Current Version Code:32
+Current Version:3.1.1
+Current Version Code:34