Kei Merge + 1.6 + NF Update to 1.6

.github/ISSUE_TEMPLATE/01_report_issue.yml

@@ -63,7 +63,7 @@ body:
       description: |
         You can find your Tsundoku/Tsundoku fork version number in **More → About**.
       placeholder: |
-        Example: "Tsundoku 0.1.0"
+        Example: "Tsundoku 0.2.0"
     validations:
       required: true
 
@@ -95,7 +95,7 @@ body:
           required: true
         - label: I have written a short but informative title.
           required: true
-        - label: I have updated the app to version **[0.1.0](https://github.com/tsundoku-otaku/tsundoku/releases/latest)**.
+        - label: I have updated the app to version **[0.2.0](https://github.com/tsundoku-otaku/tsundoku/releases/latest)**.
           required: true
         - label: I have updated the extension to the latest version (as listed on the [extensions listing](https://novelsourcery.github.io/extensions/) page).
           required: true

.github/ISSUE_TEMPLATE/05_request_feature.yml

@@ -53,7 +53,7 @@ body:
           required: true
         - label: If this is an issue with the app itself, I should be opening an issue in the [app repository](https://github.com/tsundoku-otaku/tsundoku/issues/).
           required: true
-        - label: I have updated the app to version **[0.1.1](https://github.com/tsundoku-otaku/tsundoku/releases/latest)**.
+        - label: I have updated the app to version **[0.2.0](https://github.com/tsundoku-otaku/tsundoku/releases/latest)**.
           required: true
         - label: I will correctly fill out all of the requested information in this form.
           required: true

.github/ISSUE_TEMPLATE/06_request_meta.yml

@@ -33,7 +33,7 @@ body:
           required: true
         - label: If this is an issue with the app itself, I should be opening an issue in the [app repository](https://github.com/tsundoku-otaku/tsundoku/issues/).
           required: true
-        - label: I have updated the app to version **[0.1.1](https://github.com/tsundoku-otaku/tsundoku/releases/latest)**.
+        - label: I have updated the app to version **[0.2.0](https://github.com/tsundoku-otaku/tsundoku/releases/latest)**.
           required: true
         - label: I have updated the extension to the latest version (as listed on the [extensions listing](https://novelsourcery.github.io/extensions/) page).
           required: true

.github/pull_request_template.md

@@ -1,9 +1,9 @@
 Checklist:
 
-- [ ] Updated `extVersionCode` value in `build.gradle` for individual extensions
-- [ ] Updated `overrideVersionCode` or `baseVersionCode` as needed for all multisrc extensions
+- [ ] Updated `versionCode` value in `build.gradle.kts`
+- [ ] Updated `baseVersionCode` in `build.gradle.kts` (if updated multisrc theme code)
 - [ ] Referenced all related issues in the PR body (e.g. "Closes #xyz")
-- [ ] Added the `isNsfw = true` flag in `build.gradle` when appropriate
+- [ ] Set the `contentWarning` configuration in `build.gradle.kts` appropriately
 - [ ] Have not changed source names
 - [ ] Have explicitly kept the `id` if a source's name or language were changed
 - [ ] Have tested the modifications by compiling and running the extension through Android Studio

.github/scripts/generate-build-matrices.py

@@ -5,14 +5,13 @@
 import subprocess
 import sys
 from pathlib import Path
-from typing import NoReturn
 
 EXTENSION_REGEX = re.compile(r"^src/(?P<lang>\w+)/(?P<extension>\w+)")
 MULTISRC_LIB_REGEX = re.compile(r"^lib-multisrc/(?P<multisrc>\w+)")
 LIB_REGEX = re.compile(r"^lib/(?P<lib>\w+)")
 MODULE_REGEX = re.compile(r"^:src:(?P<lang>\w+):(?P<extension>\w+)$")
 CORE_FILES_REGEX = re.compile(
-    r"^(common/|core/|gradle/|build\.gradle\.kts|common\.gradle|gradle\.properties|settings\.gradle\.kts|.github/scripts)"
+    r"^(common/|compiler/|core/|gradle/|build\.gradle\.kts|gradle\.properties|settings\.gradle\.kts|.github/scripts)"
 )
 
 def run_command(command: str) -> str:
@@ -98,7 +97,10 @@ def resolve_ext(multisrcs: set[str], libs: set[str]) -> set[tuple[str, str]]:
 
     patterns = []
     if multisrc_pattern:
+        # Most extensions still use the legacy Groovy `themePkg` property; only a
+        # handful have migrated to the modern DSL's `theme` property so far.
         patterns.append(rf"themePkg\s*=\s*['\"]({multisrc_pattern})['\"]")
+        patterns.append(rf"theme\s*=\s*['\"]({multisrc_pattern})['\"]")
     if lib_pattern:
         patterns.append(rf"project\([\"']:(?:lib):({lib_pattern})[\"']\)")
 
@@ -108,7 +110,9 @@ def resolve_ext(multisrcs: set[str], libs: set[str]) -> set[tuple[str, str]]:
 
     for lang in Path("src").iterdir():
         for extension in lang.iterdir():
-            build_file = extension / "build.gradle"
+            build_file = extension / "build.gradle.kts"
+            if not build_file.is_file():
+                build_file = extension / "build.gradle"
             if not build_file.is_file():
                 continue
 
@@ -179,13 +183,6 @@ def get_module_list(ref: str) -> tuple[list[str], list[str]]:
     modules.update([f":src:{lang}:{extension}" for lang, extension in extensions])
     deleted.update([f"{lang}.{extension}" for lang, extension in extensions])
 
-    if os.getenv("IS_PR_CHECK") != "true":
-        with Path(".github/always_build.json").open() as always_build_file:
-            always_build = json.load(always_build_file)
-        for extension in always_build:
-            modules.add(":src:" + extension.replace(".", ":"))
-            deleted.add(extension)
-
     return list(modules), list(deleted)
 
 def get_all_modules() -> tuple[list[str], list[str]]:

.github/scripts/index.proto

@@ -0,0 +1,65 @@
+syntax = "proto3";
+
+// Upstream source: https://github.com/mihonapp/tachiyomix/blob/e4d546c/index/index.proto
+//
+// divergence: Resources.jarUrl (field 501), Extension.isNovel (field 8000, reserved 8000+ block
+// for fork fields so they never collide with new upstream fields)
+//
+// Regenerate the Python bindings after editing:
+//   protoc --python_out=. --pyi_out=. index.proto
+
+message Index {
+  string name = 1;
+  string badgeLabel = 2;
+  string signingKey = 3;
+  Contact contact = 4;
+  oneof extensions {
+    ExtensionList extensionList = 101;
+    string extensionListUrl = 102;
+  }
+}
+
+message Contact {
+  string website = 1;
+  optional string discord = 2;
+}
+
+message ExtensionList {
+  repeated Extension extensions = 1;
+}
+
+message Extension {
+  string name = 1;
+  string packageName = 2;
+  Resources resources = 3;
+  string extensionLib = 4;
+  int64 versionCode = 5;
+  string versionName = 6;
+  ContentWarning contentWarning = 7;
+  repeated Source sources = 8;
+
+  // Fork field, reserved 8000+ block so it never collides with new upstream fields.
+  bool isNovel = 8000;
+}
+
+message Resources {
+  string apkUrl = 1;
+  string iconUrl = 2;
+  string jarUrl = 501;
+}
+
+message Source {
+  int64 id = 1;
+  string name = 2;
+  string language = 3;
+  string homeUrl = 4;
+  repeated string mirrorUrls = 5;
+  optional string message = 7;
+}
+
+enum ContentWarning {
+  CONTENT_WARNING_UNSPECIFIED = 0;
+  CONTENT_WARNING_SAFE = 1;
+  CONTENT_WARNING_MIXED = 2;
+  CONTENT_WARNING_NSFW = 3;
+}

.github/scripts/index_pb2.pyi

@@ -9,9 +9,11 @@ DESCRIPTOR: _descriptor.FileDescriptor
 
 class ContentWarning(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
     __slots__ = ()
+    CONTENT_WARNING_UNSPECIFIED: _ClassVar[ContentWarning]
     CONTENT_WARNING_SAFE: _ClassVar[ContentWarning]
     CONTENT_WARNING_MIXED: _ClassVar[ContentWarning]
     CONTENT_WARNING_NSFW: _ClassVar[ContentWarning]
+CONTENT_WARNING_UNSPECIFIED: ContentWarning
 CONTENT_WARNING_SAFE: ContentWarning
 CONTENT_WARNING_MIXED: ContentWarning
 CONTENT_WARNING_NSFW: ContentWarning
@@ -47,7 +49,7 @@ class ExtensionList(_message.Message):
     def __init__(self, extensions: _Optional[_Iterable[_Union[Extension, _Mapping]]] = ...) -> None: ...
 
 class Extension(_message.Message):
-    __slots__ = ("name", "packageName", "resources", "extensionLib", "versionCode", "versionName", "contentWarning", "sources")
+    __slots__ = ("name", "packageName", "resources", "extensionLib", "versionCode", "versionName", "contentWarning", "sources", "isNovel")
     NAME_FIELD_NUMBER: _ClassVar[int]
     PACKAGENAME_FIELD_NUMBER: _ClassVar[int]
     RESOURCES_FIELD_NUMBER: _ClassVar[int]
@@ -56,6 +58,7 @@ class Extension(_message.Message):
     VERSIONNAME_FIELD_NUMBER: _ClassVar[int]
     CONTENTWARNING_FIELD_NUMBER: _ClassVar[int]
     SOURCES_FIELD_NUMBER: _ClassVar[int]
+    ISNOVEL_FIELD_NUMBER: _ClassVar[int]
     name: str
     packageName: str
     resources: Resources
@@ -64,15 +67,18 @@ class Extension(_message.Message):
     versionName: str
     contentWarning: ContentWarning
     sources: _containers.RepeatedCompositeFieldContainer[Source]
-    def __init__(self, name: _Optional[str] = ..., packageName: _Optional[str] = ..., resources: _Optional[_Union[Resources, _Mapping]] = ..., extensionLib: _Optional[str] = ..., versionCode: _Optional[int] = ..., versionName: _Optional[str] = ..., contentWarning: _Optional[_Union[ContentWarning, str]] = ..., sources: _Optional[_Iterable[_Union[Source, _Mapping]]] = ...) -> None: ...
+    isNovel: bool
+    def __init__(self, name: _Optional[str] = ..., packageName: _Optional[str] = ..., resources: _Optional[_Union[Resources, _Mapping]] = ..., extensionLib: _Optional[str] = ..., versionCode: _Optional[int] = ..., versionName: _Optional[str] = ..., contentWarning: _Optional[_Union[ContentWarning, str]] = ..., sources: _Optional[_Iterable[_Union[Source, _Mapping]]] = ..., isNovel: _Optional[bool] = ...) -> None: ...
 
 class Resources(_message.Message):
-    __slots__ = ("apkUrl", "iconUrl")
+    __slots__ = ("apkUrl", "iconUrl", "jarUrl")
     APKURL_FIELD_NUMBER: _ClassVar[int]
     ICONURL_FIELD_NUMBER: _ClassVar[int]
+    JARURL_FIELD_NUMBER: _ClassVar[int]
     apkUrl: str
     iconUrl: str
-    def __init__(self, apkUrl: _Optional[str] = ..., iconUrl: _Optional[str] = ...) -> None: ...
+    jarUrl: str
+    def __init__(self, apkUrl: _Optional[str] = ..., iconUrl: _Optional[str] = ..., jarUrl: _Optional[str] = ...) -> None: ...
 
 class Source(_message.Message):
     __slots__ = ("id", "name", "language", "homeUrl", "mirrorUrls", "message")