Merge branch '33' into 'master'

Update Blokada to 3.3

See merge request fdroid/fdroiddata!3094
This commit is contained in:
Marcus 2018-04-19 14:11:23 +00:00
commit 9a54bd00c2

View file

@ -6,6 +6,8 @@ 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
Donate:https://blokada.org/docs/donate.html
LiberapayID:35205
Bitcoin:16rJ49uNKCohVhHvWNganP6Y48Ba9BTyKd
Name:Blokada v3 (ad blocker)
@ -104,7 +106,16 @@ Build:3.2.4,302180405
sed -i -e "/maven.fabric.io/d" ../build.gradle && \
sed -i -e "/classpath 'io.fabric.tools:gradle/d" ../build.gradle
Build:3.3,303241800
commit=3.3
subdir=app
gradle=AdblockerFdroid
srclibs=gscore@1.6
prebuild=echo -e "ext {\n extVersionName = \"3.3\"\n extVersionCode = 303241800 \n }" >> ../version.gradle && \
echo "project(':gscore').projectDir = new File('$PWD/../../srclib/gscore')" >> ../paths.gradle && \
echo -e "ext {\n extVersionName = \"1.6\"\n extVersionCode = 106041700 \n }" >> ../../srclib/gscore/version.gradle
Auto Update Mode:Version v%v
Update Check Mode:Tags
Current Version:3.2.4
Current Version Code:302180405
Current Version:3.3
Current Version Code:303241800