From ab467d96e30a0b15d78446fafce112eab21fc07a Mon Sep 17 00:00:00 2001 From: Tuomas Airaksinen Date: Mon, 23 Dec 2019 12:44:16 +0200 Subject: [PATCH 1/7] Prepare new And Bible version (3.2) --- metadata/net.bible.android.activity.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/metadata/net.bible.android.activity.yml b/metadata/net.bible.android.activity.yml index cf204f2bee..7d313259a4 100644 --- a/metadata/net.bible.android.activity.yml +++ b/metadata/net.bible.android.activity.yml @@ -498,6 +498,26 @@ Builds: - cd - - cp $$AndBibleJSwordTweaks$$/jsword.jar libs/jsword.jar + - versionName: 3.2.326 + versionCode: 326 + commit: v3.2.326 + subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y -t stretch-backports npm g++ build-essential + gradle: + - yes + srclibs: + - AndBibleJSword@build-2 + - AndBibleJSwordTweaks@v0.1.3 + rm: + - app/libs/* + build: + - cd $$AndBibleJSwordTweaks$$ + - TARGET_DIR="." JSWORD_PATH=$$AndBibleJSword$$ gradle install + - cd - + - cp $$AndBibleJSwordTweaks$$/jsword.jar libs/jsword.jar + AutoUpdateMode: None UpdateCheckMode: Tags CurrentVersion: 3.1.325.0-beta From 51f44779d584d6b9582180793b15826fd17bea45 Mon Sep 17 00:00:00 2001 From: Tuomas Airaksinen Date: Fri, 27 Dec 2019 07:36:37 +0200 Subject: [PATCH 2/7] Update And Bible description (as in Play) --- metadata/net.bible.android.activity.yml | 43 +++++++++++++++++++------ 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/metadata/net.bible.android.activity.yml b/metadata/net.bible.android.activity.yml index 7d313259a4..b68beb5876 100644 --- a/metadata/net.bible.android.activity.yml +++ b/metadata/net.bible.android.activity.yml @@ -1,7 +1,7 @@ Categories: - Reading License: GPL-3.0-or-later -AuthorName: Bible for Android +AuthorName: And Bible Open Source Project AuthorEmail: and-bible-support@googlegroups.com WebSite: https://andbible.github.io/ SourceCode: https://github.com/AndBible/and-bible @@ -10,14 +10,39 @@ Translation: https://www.transifex.com/mjdenham/andbible/ AutoName: And Bible Description: |- - * Read the bible and refer to commentaries wherever you are - * Over 40 English versions of the bible including ESV, KJV and NET - * Totally offline after initial downloads - * The bible in over 50 different languages - * 26 commentaries - * Uses the JSword engine from CrossWire - * User interface translated into many different languages - * You can add more bibles to the list via the CrossWire site + And Bible is an open source, offline, totally free Bible application with no advertisements to enable as many people in all countries to read, listen to, and study Scripture as easily as possible and with the greatest personal blessing. + + * Bibles, Commentaries, Theological Dictionaries, Maps, and Christian books in over 700 languages + * Off-line for everything after initial download including search, notes, commentaries, etc. + * Interface in Chinese, Russian, German, French, Hungarian, Czech, Polish, Hebrew, Hindi, ... + * Various Bible reading plans + * Totally free, no ads, no e-mails + * Over 40 English Bibles including KJV and NET + * 29 Bible commentaries + * Extensive dictionary and Christian book collection + * All documents legally distributed (the reason documents like NKJV and NIV are not available) + * Strong's integration allows Greek and Hebrew word analysis + * Split screen + * Write personal notes + * Select any interface language from a list of over 25 + * Flexible search + * Bookmarks + * Maps of the bible lands + * Listen to any document read out for you + * Automatic scrolling, automatic day/night mode + * Compare all Bible translations on a single screen + * One of the fastest Bible apps on Android + * Open source - improve or change the code if you like + * Uses the powerful JSword engine from CrossWire + + We are all volunteers; we don't send out nagging e-mails; don't display annoying advertisements; never ask for or receive donations; don't ask for registration; And Bible does not collect any data from your mobile. + + The provenance of all documents is thoroughly researched to ensure all documents can be legally distributed or permission has been granted by the copyright holder. That is also the reason And Bible can not contain documents like NIV and NKJV. + + Notes + * Like And Bible in Facebook: https://www.facebook.com/AndBible/ + * The And Bible FAQ is here: https://github.com/AndBible/and-bible/wiki/FAQ + * Project page at Github: https://github.com/AndBible/and-bible RepoType: git Repo: https://github.com/AndBible/and-bible.git From 144f39aa72be65c0e2a5b6702c64c6bc27d02cec Mon Sep 17 00:00:00 2001 From: Tuomas Airaksinen Date: Fri, 27 Dec 2019 07:42:04 +0200 Subject: [PATCH 3/7] Start using AutoUpdateMode --- metadata/net.bible.android.activity.yml | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/metadata/net.bible.android.activity.yml b/metadata/net.bible.android.activity.yml index 595f0cdb5f..1715967032 100644 --- a/metadata/net.bible.android.activity.yml +++ b/metadata/net.bible.android.activity.yml @@ -523,27 +523,7 @@ Builds: - cd - - cp $$AndBibleJSwordTweaks$$/jsword.jar libs/jsword.jar - - versionName: 3.2.326 - versionCode: 326 - commit: v3.2.326 - subdir: app - sudo: - - apt-get update || apt-get update - - apt-get install -y -t stretch-backports npm g++ build-essential - gradle: - - yes - srclibs: - - AndBibleJSword@build-2 - - AndBibleJSwordTweaks@v0.1.3 - rm: - - app/libs/* - build: - - cd $$AndBibleJSwordTweaks$$ - - TARGET_DIR="." JSWORD_PATH=$$AndBibleJSword$$ gradle install - - cd - - - cp $$AndBibleJSwordTweaks$$/jsword.jar libs/jsword.jar - -AutoUpdateMode: None +AutoUpdateMode: Version +-fdroid v%v UpdateCheckMode: Tags CurrentVersion: 3.2.326 CurrentVersionCode: 326 From b3238776cc78a83753974a3de5c8eaedadd16d73 Mon Sep 17 00:00:00 2001 From: Tuomas Airaksinen Date: Fri, 27 Dec 2019 07:49:15 +0200 Subject: [PATCH 4/7] Lint fixes --- metadata/net.bible.android.activity.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/metadata/net.bible.android.activity.yml b/metadata/net.bible.android.activity.yml index 1715967032..b45b6b48f9 100644 --- a/metadata/net.bible.android.activity.yml +++ b/metadata/net.bible.android.activity.yml @@ -11,7 +11,7 @@ Translation: https://www.transifex.com/mjdenham/andbible/ AutoName: And Bible Description: |- And Bible is an open source, offline, totally free Bible application with no advertisements to enable as many people in all countries to read, listen to, and study Scripture as easily as possible and with the greatest personal blessing. - + * Bibles, Commentaries, Theological Dictionaries, Maps, and Christian books in over 700 languages * Off-line for everything after initial download including search, notes, commentaries, etc. * Interface in Chinese, Russian, German, French, Hungarian, Czech, Polish, Hebrew, Hindi, ... @@ -34,11 +34,11 @@ Description: |- * One of the fastest Bible apps on Android * Open source - improve or change the code if you like * Uses the powerful JSword engine from CrossWire - + We are all volunteers; we don't send out nagging e-mails; don't display annoying advertisements; never ask for or receive donations; don't ask for registration; And Bible does not collect any data from your mobile. - + The provenance of all documents is thoroughly researched to ensure all documents can be legally distributed or permission has been granted by the copyright holder. That is also the reason And Bible can not contain documents like NIV and NKJV. - + Notes * Like And Bible in Facebook: https://www.facebook.com/AndBible/ * The And Bible FAQ is here: https://github.com/AndBible/and-bible/wiki/FAQ From 08940fae31558bd3b9d44360cbc039af9e33f98c Mon Sep 17 00:00:00 2001 From: Tuomas Airaksinen Date: Sun, 5 Jan 2020 19:11:48 +0200 Subject: [PATCH 5/7] Remove description to use fastlane data instead --- metadata/net.bible.android.activity.yml | 36 ------------------------- 1 file changed, 36 deletions(-) diff --git a/metadata/net.bible.android.activity.yml b/metadata/net.bible.android.activity.yml index 1bf9eab735..f7b71010d2 100644 --- a/metadata/net.bible.android.activity.yml +++ b/metadata/net.bible.android.activity.yml @@ -7,43 +7,7 @@ WebSite: https://andbible.github.io/ SourceCode: https://github.com/AndBible/and-bible IssueTracker: https://github.com/AndBible/and-bible/issues Translation: https://www.transifex.com/mjdenham/andbible/ - AutoName: And Bible -Description: |- - And Bible is an open source, offline, totally free Bible application with no advertisements to enable as many people in all countries to read, listen to, and study Scripture as easily as possible and with the greatest personal blessing. - - * Bibles, Commentaries, Theological Dictionaries, Maps, and Christian books in over 700 languages - * Off-line for everything after initial download including search, notes, commentaries, etc. - * Interface in Chinese, Russian, German, French, Hungarian, Czech, Polish, Hebrew, Hindi, ... - * Various Bible reading plans - * Totally free, no ads, no e-mails - * Over 40 English Bibles including KJV and NET - * 29 Bible commentaries - * Extensive dictionary and Christian book collection - * All documents legally distributed (the reason documents like NKJV and NIV are not available) - * Strong's integration allows Greek and Hebrew word analysis - * Split screen - * Write personal notes - * Select any interface language from a list of over 25 - * Flexible search - * Bookmarks - * Maps of the bible lands - * Listen to any document read out for you - * Automatic scrolling, automatic day/night mode - * Compare all Bible translations on a single screen - * One of the fastest Bible apps on Android - * Open source - improve or change the code if you like - * Uses the powerful JSword engine from CrossWire - - We are all volunteers; we don't send out nagging e-mails; don't display annoying advertisements; never ask for or receive donations; don't ask for registration; And Bible does not collect any data from your mobile. - - The provenance of all documents is thoroughly researched to ensure all documents can be legally distributed or permission has been granted by the copyright holder. That is also the reason And Bible can not contain documents like NIV and NKJV. - - Notes - * Like And Bible in Facebook: https://www.facebook.com/AndBible/ - * The And Bible FAQ is here: https://github.com/AndBible/and-bible/wiki/FAQ - * Project page at Github: https://github.com/AndBible/and-bible - RepoType: git Repo: https://github.com/AndBible/and-bible.git From 794839c40763ba2c675ffad8e6ce294b46d644f5 Mon Sep 17 00:00:00 2001 From: Tuomas Airaksinen Date: Sun, 5 Jan 2020 19:18:39 +0200 Subject: [PATCH 6/7] Fix picky lint --- metadata/net.bible.android.activity.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/metadata/net.bible.android.activity.yml b/metadata/net.bible.android.activity.yml index f7b71010d2..ba58b63802 100644 --- a/metadata/net.bible.android.activity.yml +++ b/metadata/net.bible.android.activity.yml @@ -7,7 +7,9 @@ WebSite: https://andbible.github.io/ SourceCode: https://github.com/AndBible/and-bible IssueTracker: https://github.com/AndBible/and-bible/issues Translation: https://www.transifex.com/mjdenham/andbible/ + AutoName: And Bible + RepoType: git Repo: https://github.com/AndBible/and-bible.git From c87e3e0de176f79c1fc98f6c7c66ceaa08dfcd44 Mon Sep 17 00:00:00 2001 From: Tuomas Airaksinen Date: Sun, 5 Jan 2020 21:49:12 +0200 Subject: [PATCH 7/7] Add manually 3.2.333 and fix AutoUpdateMode --- metadata/net.bible.android.activity.yml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/metadata/net.bible.android.activity.yml b/metadata/net.bible.android.activity.yml index ba58b63802..a5544ce866 100644 --- a/metadata/net.bible.android.activity.yml +++ b/metadata/net.bible.android.activity.yml @@ -489,7 +489,27 @@ Builds: - cd - - cp $$AndBibleJSwordTweaks$$/jsword.jar libs/jsword.jar -AutoUpdateMode: Version +-fdroid v%v + - versionName: 3.2.333 + versionCode: 333 + commit: v3.2.333-fdroid + subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y -t stretch-backports npm g++ build-essential + gradle: + - yes + srclibs: + - AndBibleJSword@build-2 + - AndBibleJSwordTweaks@v0.1.3 + rm: + - app/libs/* + build: + - cd $$AndBibleJSwordTweaks$$ + - TARGET_DIR="." JSWORD_PATH=$$AndBibleJSword$$ gradle install + - cd - + - cp $$AndBibleJSwordTweaks$$/jsword.jar libs/jsword.jar + +AutoUpdateMode: Version v%v-fdroid UpdateCheckMode: Tags CurrentVersion: 3.2.333 CurrentVersionCode: 333