Extractorsfix

.github/scripts/bump-versions.py

@@ -11,8 +11,8 @@
 VERSION_REGEX = re.compile(f"{VERSION_STR} (\\d+)")
 BUMPED_FILES: list[Path] = []
 
-BOT_EMAIL = "[email protected]"
-BOT_NAME = "aniyomi-bot[bot]"
+BOT_EMAIL = "[email protected]"
+BOT_NAME = "animetail-bot[bot]"
 
 def has_match(query: str, file: Path) -> tuple[Path, bool]:
     return (file, query in file.read_text())
@@ -42,7 +42,7 @@ def bump_version(file: Path):
         print(f"\n{file}: ", end="")
         text = VERSION_REGEX.sub(replace_version, f.read())
         # Move the cursor to the start again, to prevent writing at the end
-        f.seek(0) 
+        f.seek(0)
         f.write(text)
 
 def bump_lib_multisrc(theme: str):

.github/scripts/commit-repo.sh

@@ -1,17 +1,17 @@
 #!/bin/bash
 set -e
 
-rsync -a --delete --exclude .git --exclude .gitignore ../master/repo/ .
-git config --global user.email "[email protected]"
-git config --global user.name "aniyomi-bot[bot]"
+rsync -a --delete --exclude .git --exclude .gitignore --exclude repo.json ../master/repo/ .
+git config --global user.email "[email protected]"
+git config --global user.name "Animetail-Bot"
 git status
 if [ -n "$(git status --porcelain)" ]; then
     git add .
-    git commit -S -m "Update extensions repo"
+    git commit -m "Update extensions repo"
     git push
 
     # Purge cached index on jsDelivr
-    curl https://purge.jsdelivr.net/gh/aniyomiorg/aniyomi-extensions@repo/index.min.json
+    curl https://purge.jsdelivr.net/gh/Dark25/aniyomi-extensions@repo/index.min.json
 else
     echo "No changes to commit"
 fi

.github/workflows/build_push.yml

@@ -29,7 +29,7 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
           ref: master
-          token: ${{ secrets.ANIYOMIORG_BOT_PAT }}
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Find lib changes
         id: modified-libs
@@ -41,7 +41,7 @@ jobs:
           safe_output: false
 
       - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@01dd5d3ca463c7f10f7f4f7b4f177225ac661ee4 # v6.1.0
+        uses: crazy-max/ghaction-import-gpg@v6  # v6.1.0
         with:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
@@ -97,8 +97,7 @@ jobs:
           distribution: temurin
 
       - name: Prepare signing key
-        run: |
-          echo ${{ secrets.SIGNING_KEY }} | base64 -d > signingkey.jks
+        run: echo "${{ secrets.SIGNING_KEY }}" | base64 --decode > signingkey.jks
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3
@@ -113,7 +112,6 @@ jobs:
 
       - name: Upload APKs (chunk ${{ matrix.chunk }})
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4
-        if: "github.repository == 'aniyomiorg/aniyomi-extensions'"
         with:
           name: "individual-apks-${{ matrix.chunk }}"
           path: "**/*.apk"
@@ -126,7 +124,6 @@ jobs:
     name: Publish repo
     needs:
       - build_individual
-    if: "github.repository == 'aniyomiorg/aniyomi-extensions'"
     runs-on: ubuntu-latest
     steps:
       - name: Download APK artifacts
@@ -150,21 +147,21 @@ jobs:
         run: |
           cd master
           python ./.github/scripts/move-apks.py
-          INSPECTOR_LINK="$(curl -s "https://api.github.com/repos/aniyomiorg/aniyomi-extensions-inspector/releases/latest" | jq -r '.assets[0].browser_download_url')"
+          INSPECTOR_LINK="$(curl -s "https://api.github.com/repos/Dark25/aniyomi-extensions-inspector/releases/latest" | jq -r '.assets[0].browser_download_url')"
           curl -L "$INSPECTOR_LINK" -o ./Inspector.jar
           java -jar ./Inspector.jar "repo/apk" "output.json" "tmp"
           python ./.github/scripts/create-repo.py
 
       - name: Checkout repo branch
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
-          repository: aniyomiorg/aniyomi-extensions
-          token: ${{ secrets.ANIYOMIORG_BOT_PAT }}
+          repository: Dark25/aniyomi-extensions
+          token: ${{ secrets.GITHUB_TOKEN }}
           ref: repo
           path: repo
 
       - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@01dd5d3ca463c7f10f7f4f7b4f177225ac661ee4 # v6.1.0
+        uses: crazy-max/ghaction-import-gpg@v6        # v6.1.0
         with:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
@@ -174,5 +171,6 @@ jobs:
 
       - name: Deploy repo
         run: |
-          cd repo
-          ../master/.github/scripts/commit-repo.sh
+            cd repo
+            chmod +x ../master/.github/scripts/commit-repo.sh
+            ../master/.github/scripts/commit-repo.sh

README.md

@@ -1,12 +1,18 @@
-| Install | Build | Support Server |
-|---------|-------|----------------|
-| [![Install](https://img.shields.io/badge/Click%20here%20to%20install%20this%20repo-green&style=flat)](https://intradeus.github.io/http-protocol-redirector/?r=aniyomi://add-repo?url=https://raw.githubusercontent.com/aniyomiorg/aniyomi-extensions/repo/index.min.json) | ![CI](https://github.com/aniyomiorg/aniyomi-extensions/workflows/CI/badge.svg?event=push) | [![Discord](https://img.shields.io/discord/841701076242530374?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/F32UjdJZrR) |
+| Install on aniyomi                                                                                                                                                                                                                                                   | Install on Animetail| Build | Support Server |
+|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|-------|----------------|
+| [![Install](https://img.shields.io/badge/Click%20here%20to%20install%20this%20repo-blue&style=flat)](https://intradeus.github.io/http-protocol-redirector/?r=aniyomi://add-repo?url=https://raw.githubusercontent.com/Dark25/aniyomi-extensions/repo/index.min.json) | [![Install](https://img.shields.io/badge/Click%20here%20to%20install%20repo-gray?style=flat&labelColor=red)](https://intradeus.github.io/http-protocol-redirector/?r=animetail://add-repo?url=https://raw.githubusercontent.com/Dark25/aniyomi-extensions/repo/index.min.json) | ![CI](https://github.com/dark25/aniyomi-extensions/workflows/CI/badge.svg?event=push) | [![Discord](https://img.shields.io/discord/841701076242530374?label=discord&labelColor=7289da&color=2c2f33&style=flat)](https://discord.gg/F32UjdJZrR) |
+
 
 # ![app icon](./.github/readme-images/app-icon.png)Aniyomi Extensions
 Aniyomi is a free and open source manga reader for Android 6.0 and above.
 
 This repository contains the available extension catalogues for the [Aniyomi](https://github.com/aniyomiorg/aniyomi) fork.
 
+# Manual install
+```
+https://raw.githubusercontent.com/Dark25/aniyomi-extensions/repo/index.min.json
+```
+
 # Usage
 
 Extension sources can be downloaded, installed, and uninstalled via the main Aniyomi app. They are installed and uninstalled like regular apps, in `.apk` format.

gradle/libs.versions.toml

@@ -1,8 +1,9 @@
 [versions]
-agp_version = "8.2.1"
-coroutines_version = "1.7.1"
-kotlin_version = "1.8.22"
-serialization_version = "1.5.1"
+agp_version = "8.5.1"
+coroutines_version = "1.8.1"
+jsunpackerVersion = "1.0.1"
+kotlin_version = "2.0.0"
+serialization_version = "1.7.1"
 
 [libraries]
 gradle-agp = { module = "com.android.tools.build:gradle", version.ref = "agp_version" }
@@ -12,6 +13,7 @@ gradle-kotlinter = { module = "org.jmailen.gradle:kotlinter-gradle", version = "
 
 aniyomi-lib = { module = "com.github.aniyomiorg:extensions-lib", version = "14" }
 
+jsunpacker = { module = "dev.datlag.jsunpacker:jsunpacker", version.ref = "jsunpackerVersion" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin_version" }
 kotlin-protobuf = { module = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf", version.ref = "serialization_version" }
 kotlin-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization_version" }
@@ -21,8 +23,8 @@ coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-androi
 
 injekt-core = { module = "com.github.inorichi.injekt:injekt-core", version = "65b0440" }
 rxjava = { module = "io.reactivex:rxjava", version = "1.3.8" }
-jsoup = { module = "org.jsoup:jsoup", version = "1.16.1" }
-okhttp = { module = "com.squareup.okhttp3:okhttp", version = "5.0.0-alpha.11" }
+jsoup = { module = "org.jsoup:jsoup", version = "1.18.1" }
+okhttp = { module = "com.squareup.okhttp3:okhttp", version = "5.0.0-alpha.14" }
 quickjs = { module = "app.cash.quickjs:quickjs-android", version = "0.9.2" }
 
 [bundles]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME