Default libVersion to 1.2 (#9014)

Ashuyomi · Sep 9, 2021 · bc7d8c8 · bc7d8c8
1 parent 4f59751
commit bc7d8c8
Show file tree

Hide file tree

Showing 259 changed files with 24 additions and 275 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -78,7 +78,6 @@ ext {
     pkgNameSuffix = '<lang>.<mysourcename>'
     extClass = '.<MySourceName>'
     extVersionCode = 1
-    libVersion = '1.2'
     containsNsfw = true
 }
 
@@ -91,7 +90,7 @@ apply from: "$rootDir/common.gradle"
 | `pkgNameSuffix` | A unique suffix added to `eu.kanade.tachiyomi.extension`. The language and the site name should be enough. Remember your extension code implementation must be placed in this package. |
 | `extClass` | Points to the class that implements `Source`. You can use a relative path starting with a dot (the package name is the base path). This is used to find and instantiate the source(s). |
 | `extVersionCode` | The extension version code. This must be a positive integer and incremented with any change to the code. |
-| `libVersion` | The version of the [extensions library](https://github.com/tachiyomiorg/extensions-lib) used. |
+| `libVersion` | (Optional, defaults to `1.2`) The version of the [extensions library](https://github.com/tachiyomiorg/extensions-lib) used. |
 | `containsNsfw` | (Optional, defaults to `false`) Flag to indicate that a source contains NSFW content. |
 
 The extension's version name is generated automatically by concatenating `libVersion` and `extVersionCode`. With the example used above, the version would be `1.2.1`.
@@ -309,18 +308,17 @@ multisrc
 There are three steps in running and testing a theme source:
 
 1. Generate the sources
-    - **Option 1: Only generate sources from one theme** 
+    - **Option 1: Only generate sources from one theme**
         - **Method 1:** Find and run `<ThemeName>Generator` run configuration form the `Run/Debug Configuration` menu.
         - **Method 2:** Directly run `<themepkg>.<ThemeName>Generator.main` by pressing the play button in front of the method shown inside Android Studio's Code Editor to generate sources from the said theme.
-    - **Option 2: Generate sources from all themes** 
+    - **Option 2: Generate sources from all themes**
         - **Method 1:** Run `./gradlew multisrc:generateExtensions` from a terminal window to generate all sources.
         - **Method 2:** Directly run `Generator.GeneratorMain.main` by pressing the play button in front of the method shown inside Android Studio's Code Editor to generate all sources.
-    - 
 2. Sync gradle to import the new generated sources inside `generated-src`
     - **Method 1:** Android Studio might prompt to sync the gradle. Click on `Sync Now`.
     - **Method 2:** Manually re-sync by opening `File` -> `Sync Project with Gradle Files` or by pressing `Alt+f` then `g`.
 3. Build and test the generated Extention like normal `src` sources.
-    - It's recommended to make changes here to skip going through step 1 and 2 multiple times, and when you are done, copying the changes back to `multisrc`. 
+    - It's recommended to make changes here to skip going through step 1 and 2 multiple times, and when you are done, copying the changes back to `multisrc`.
 
 ### Scaffolding overrides
 You can use this python script to generate scaffolds for source overrides. Put it inside `multisrc/overrides/<themepkg>/` as `scaffold.py`.

diff --git a/common.gradle b/common.gradle
@@ -28,7 +28,7 @@ android {
         targetSdkVersion AndroidConfig.targetSdk
         applicationIdSuffix pkgNameSuffix
         versionCode extVersionCode
-        versionName "$libVersion.$extVersionCode"
+        versionName project.ext.properties.getOrDefault("libVersion", "1.2") + ".$extVersionCode"
         setProperty("archivesBaseName", "tachiyomi-$pkgNameSuffix-v$versionName")
         manifestPlaceholders = [
                 appName : "Tachiyomi: $extName",

diff --git a/multisrc/src/main/java/generator/ThemeSourceGenerator.kt b/multisrc/src/main/java/generator/ThemeSourceGenerator.kt
@@ -72,7 +72,6 @@ interface ThemeSourceGenerator {
                     extClass = '.${source.className}'
                     extFactory = '$themePkg'
                     extVersionCode = ${baseVersionCode + source.overrideVersionCode + multisrcLibraryVersion}
-                    libVersion = '1.2'
                     ${if (source.isNsfw) "containsNsfw = true\n" else ""}
                 }
                 $defaultAdditionalGradleText

diff --git a/src/all/batoto/build.gradle b/src/all/batoto/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'all.batoto'
     extClass = '.BatoToFactory'
     extVersionCode = 14
-    libVersion = '1.2'
     containsNsfw = true
 }
 

diff --git a/src/all/comickfun/build.gradle b/src/all/comickfun/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'all.comickfun'
     extClass = '.ComickFunFactory'
     extVersionCode = 6
-    libVersion = '1.2'
     containsNsfw = true
 }
 

diff --git a/src/all/commitstrip/build.gradle b/src/all/commitstrip/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'all.commitstrip'
     extClass = '.CommitStripFactory'
     extVersionCode = 3
-    libVersion = '1.2'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/all/cubari/build.gradle b/src/all/cubari/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = "all.cubari"
     extClass = '.CubariFactory'
     extVersionCode = 9
-    libVersion = '1.2'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/all/dragonball_multiverse/build.gradle b/src/all/dragonball_multiverse/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'all.dragonball_multiverse'
     extClass = '.DbMFactory'
     extVersionCode = 4
-    libVersion = '1.2'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/all/ehentai/build.gradle b/src/all/ehentai/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'all.ehentai'
     extClass = '.EHFactory'
     extVersionCode = 14
-    libVersion = '1.2'
     containsNsfw = true
 }
 

diff --git a/src/all/genkanio/build.gradle b/src/all/genkanio/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = "all.genkanio"
     extClass = '.GenkanIO'
     extVersionCode = 3
-    libVersion = '1.2'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/all/hentaihand/build.gradle b/src/all/hentaihand/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'all.hentaihand'
     extClass = '.HentaiHandFactory'
     extVersionCode = 4
-    libVersion = '1.2'
     containsNsfw = true
 }
 

diff --git a/src/all/hitomi/build.gradle b/src/all/hitomi/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'all.hitomi'
     extClass = '.HitomiFactory'
     extVersionCode = 10
-    libVersion = '1.2'
     containsNsfw = true
 }
 

diff --git a/src/all/imhentai/build.gradle b/src/all/imhentai/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'all.imhentai'
     extClass = '.IMHentaiFactory'
     extVersionCode = 3
-    libVersion = '1.2'
     containsNsfw = true
 }
 

diff --git a/src/all/komga/build.gradle b/src/all/komga/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'all.komga'
     extClass = '.KomgaFactory'
     extVersionCode = 30
-    libVersion = '1.2'
 }
 
 dependencies {

diff --git a/src/all/lanraragi/build.gradle b/src/all/lanraragi/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'all.lanraragi'
     extClass = '.LANraragi'
     extVersionCode = 6
-    libVersion = '1.2'
 }
 
 dependencies {

diff --git a/src/all/mangadex/build.gradle b/src/all/mangadex/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'all.mangadex'
     extClass = '.MangaDexFactory'
     extVersionCode = 131
-    libVersion = '1.2'
     containsNsfw = true
 }
 

diff --git a/src/all/mangapark/build.gradle b/src/all/mangapark/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'all.mangapark'
     extClass = '.MangaParkFactory'
     extVersionCode = 8
-    libVersion = '1.2'
     containsNsfw = true
 }
 

diff --git a/src/all/mangaplus/build.gradle b/src/all/mangaplus/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'all.mangaplus'
     extClass = '.MangaPlusFactory'
     extVersionCode = 23
-    libVersion = '1.2'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/all/mangatoon/build.gradle b/src/all/mangatoon/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'all.mangatoon'
     extClass = '.MangaToonFactory'
     extVersionCode = 2
-    libVersion = '1.2'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/all/mango/build.gradle b/src/all/mango/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'all.mango'
     extClass = '.Mango'
     extVersionCode = 4
-    libVersion = '1.2'
 }
 
 dependencies {

diff --git a/src/all/myreadingmanga/build.gradle b/src/all/myreadingmanga/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'all.myreadingmanga'
     extClass = '.MyReadingMangaFactory'
     extVersionCode = 43
-    libVersion = '1.2'
     containsNsfw = true
 }
 

diff --git a/src/all/nhentai/build.gradle b/src/all/nhentai/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'all.nhentai'
     extClass = '.NHFactory'
     extVersionCode = 29
-    libVersion = '1.2'
     containsNsfw = true
 }
 

diff --git a/src/all/nhentaicom/build.gradle b/src/all/nhentaicom/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'all.nhentaicom'
     extClass = '.NHentaiComFactory'
     extVersionCode = 2
-    libVersion = '1.2'
     containsNsfw = true
 }
 

diff --git a/src/all/nhentaicom/src/eu/kanade/tachiyomi/extension/all/nhentaicom/NHentaiCom.kt b/src/all/nhentaicom/src/eu/kanade/tachiyomi/extension/all/nhentaicom/NHentaiCom.kt
@@ -152,9 +152,9 @@ class NHentaiCom(override val lang: String) : HttpSource() {
             description = jsonObject["description"]!!.jsonPrimitive.content
             status = SManga.COMPLETED
             thumbnail_url = jsonObject["image_url"]!!.jsonPrimitive.content
-            genre = runCatching{ jsonObject["tags"]!!.jsonArray.joinToString { it.jsonObject["name"]!!.jsonPrimitive.content }}.getOrNull()
-            artist = runCatching{ jsonObject["artists"]!!.jsonArray.joinToString { it.jsonObject["name"]!!.jsonPrimitive.content }}.getOrNull()
-            author = runCatching{ jsonObject["authors"]!!.jsonArray.joinToString { it.jsonObject["name"]!!.jsonPrimitive.content }}.getOrNull()
+            genre = runCatching { jsonObject["tags"]!!.jsonArray.joinToString { it.jsonObject["name"]!!.jsonPrimitive.content } }.getOrNull()
+            artist = runCatching { jsonObject["artists"]!!.jsonArray.joinToString { it.jsonObject["name"]!!.jsonPrimitive.content } }.getOrNull()
+            author = runCatching { jsonObject["authors"]!!.jsonArray.joinToString { it.jsonObject["name"]!!.jsonPrimitive.content } }.getOrNull()
         }
     }
 

diff --git a/src/all/ninehentai/build.gradle b/src/all/ninehentai/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'all.ninehentai'
     extClass = '.NineHentai'
     extVersionCode = 13
-    libVersion = '1.2'
     containsNsfw = true
 }
 

diff --git a/src/all/ninehentai/src/eu/kanade/tachiyomi/extension/all/ninehentai/NineHentai.kt b/src/all/ninehentai/src/eu/kanade/tachiyomi/extension/all/ninehentai/NineHentai.kt
@@ -56,7 +56,7 @@ class NineHentai : HttpSource() {
     ): Request {
         val request = SearchRequest(
             text = searchText,
-            page = page - 1,    // Source starts counting from 0, not 1
+            page = page - 1, // Source starts counting from 0, not 1
             sort = sort,
             pages = Range(range),
             tag = Items(

diff --git a/src/all/ninemanga/build.gradle b/src/all/ninemanga/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = "all.ninemanga"
     extClass = '.NineMangaFactory'
     extVersionCode = 15
-    libVersion = '1.2'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/all/noisemanga/build.gradle b/src/all/noisemanga/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'all.noisemanga'
     extClass = '.NoiseMangaFactory'
     extVersionCode = 4
-    libVersion = '1.2'
 }
 
 dependencies {

diff --git a/src/all/simplyhentai/build.gradle b/src/all/simplyhentai/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'all.simplyhentai'
     extClass = '.SimplyHentaiFactory'
     extVersionCode = 4
-    libVersion = '1.2'
     containsNsfw = true
 }
 

diff --git a/src/all/tachidesk/build.gradle b/src/all/tachidesk/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'all.tachidesk'
     extClass = '.Tachidesk'
     extVersionCode = 2
-    libVersion = '1.2'
     containsNsfw = true
 }
 

diff --git a/src/all/toomics/build.gradle b/src/all/toomics/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'all.toomics'
     extClass = '.ToomicsFactory'
     extVersionCode = 6
-    libVersion = '1.2'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/all/vinnieVeritas/build.gradle b/src/all/vinnieVeritas/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'all.vinnieVeritas'
     extClass = '.vinnieVeritasFactory'
     extVersionCode = 2
-    libVersion = '1.2'
 }
 
 dependencies {

diff --git a/src/ar/asgardteam/build.gradle b/src/ar/asgardteam/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'ar.asgardteam'
     extClass = '.AsgardTeam'
     extVersionCode = 11
-    libVersion = '1.2'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/ar/gmanga/build.gradle b/src/ar/gmanga/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'ar.gmanga'
     extClass = '.Gmanga'
     extVersionCode = 6
-    libVersion = '1.2'
     containsNsfw = false
 }
 

diff --git a/src/ar/mangaae/build.gradle b/src/ar/mangaae/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'ar.mangaae'
     extClass = '.MangaAe'
     extVersionCode = 8
-    libVersion = '1.2'
 }
 
 dependencies {

diff --git a/src/ar/mangaalarab/build.gradle b/src/ar/mangaalarab/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'ar.mangaalarab'
     extClass = '.MangaAlarab'
     extVersionCode = 6
-    libVersion = '1.2'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/ar/mangalink/build.gradle b/src/ar/mangalink/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'ar.mangalink'
     extClass = '.MangaLink'
     extVersionCode = 4
-    libVersion = '1.2'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/ar/mangalink/src/eu/kanade/tachiyomi/extension/ar/mangalink/MangaLink.kt b/src/ar/mangalink/src/eu/kanade/tachiyomi/extension/ar/mangalink/MangaLink.kt
@@ -134,5 +134,4 @@ class MangaLink : ParsedHttpSource() {
         Type("كوميك", "5"),
         Type("غير معروف", "6"),
     )
-
 }
diff --git a/src/ar/remanga/build.gradle b/src/ar/remanga/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'ar.remanga'
     extClass = '.REManga'
     extVersionCode = 1
-    libVersion = '1.2'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/ar/shqqaa/build.gradle b/src/ar/shqqaa/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'ar.shqqaa'
     extClass = '.Shqqaa'
     extVersionCode = 2
-    libVersion = '1.2'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/ca/fansubscat/build.gradle b/src/ca/fansubscat/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'ca.fansubscat'
     extClass = '.FansubsCat'
     extVersionCode = 1
-    libVersion = '1.2'
     containsNsfw = true
 }
 

diff --git a/src/de/mangatube/build.gradle b/src/de/mangatube/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'de.mangatube'
     extClass = '.MangaTube'
     extVersionCode = 1
-    libVersion = '1.2'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/de/wiemanga/build.gradle b/src/de/wiemanga/build.gradle
@@ -6,7 +6,6 @@ ext {
     pkgNameSuffix = 'de.wiemanga'
     extClass = '.WieManga'
     extVersionCode = 4
-    libVersion = '1.2'
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/en/bilibilicomics/build.gradle b/src/en/bilibilicomics/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'en.bilibilicomics'
     extClass = '.BilibiliComics'
     extVersionCode = 7
-    libVersion = '1.2'
     containsNsfw = true
 }
 

diff --git a/src/en/brewingscans/build.gradle b/src/en/brewingscans/build.gradle
@@ -7,7 +7,6 @@ ext {
     pkgNameSuffix = 'en.brewingscans'
     extClass = '.BrewingScans'
     extVersionCode = 1
-    libVersion = '1.2'
     containsNsfw = true
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -134,5 +134,4 @@ class MangaLink : ParsedHttpSource() { @@
             Type("كوميك", "5"),
             Type("غير معروف", "6"),
         )
     }