Draff/Tachiyomi-Extensions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reinstate versionId field in index.json (#10293)

Browse Source 
* Reinstate versionId field in index.json

* address deprecation
This commit is contained in:
stevenyomi 2025-08-26 17:36:42 +00:00 committed by Draff
parent b59f8b5c53
commit 0d51803f91
Signed by: Draff
GPG Key ID: E8A89F3211677653
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/scripts/create-repo.py vendored
View File

@ -79,6 +79,7 @@ for apk in REPO_APK_DIR.iterdir():
"lang": source["lang"], "lang": source["lang"],
"id": source["id"], "id": source["id"],
"baseUrl": source["baseUrl"], "baseUrl": source["baseUrl"],
"versionId": source["versionId"],
} }
) )

4
.github/scripts/merge-repo.py vendored
View File

@ -38,6 +38,10 @@ index.sort(key=lambda x: x["pkg"])
with REMOTE_REPO.joinpath("index.json").open("w", encoding="utf-8") as index_file: with REMOTE_REPO.joinpath("index.json").open("w", encoding="utf-8") as index_file:
json.dump(index, index_file, ensure_ascii=False, indent=2) json.dump(index, index_file, ensure_ascii=False, indent=2)
for item in index:
for source in item["sources"]:
source.pop("versionId", None)
with REMOTE_REPO.joinpath("index.min.json").open("w", encoding="utf-8") as index_min_file: with REMOTE_REPO.joinpath("index.min.json").open("w", encoding="utf-8") as index_min_file:
json.dump(index, index_min_file, ensure_ascii=False, separators=(",", ":")) json.dump(index, index_min_file, ensure_ascii=False, separators=(",", ":"))

4
buildSrc/src/main/kotlin/lib-android.gradle.kts
View File

@ -13,9 +13,7 @@ android {
namespace = "eu.kanade.tachiyomi.lib.${project.name}" namespace = "eu.kanade.tachiyomi.lib.${project.name}"
buildFeatures { androidResources.enable = false
androidResources = false
}
} }
dependencies { dependencies {

20
gradle/libs.versions.toml
View File

@ -1,22 +1,22 @@
[versions] [versions]
kotlin_version = "1.7.21" kotlin = "1.7.21"
coroutines_version = "1.6.4" coroutines = "1.6.4"
serialization_version = "1.4.0" serialization = "1.4.0"
[libraries] [libraries]
gradle-agp = { module = "com.android.tools.build:gradle", version = "8.12.1" } gradle-agp = { module = "com.android.tools.build:gradle", version = "8.12.1" }
gradle-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin_version" } gradle-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
gradle-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin_version" } gradle-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
gradle-kotlinter = { module = "org.jmailen.gradle:kotlinter-gradle", version = "3.13.0" } gradle-kotlinter = { module = "org.jmailen.gradle:kotlinter-gradle", version = "3.13.0" }
tachiyomi-lib = { module = "com.github.keiyoushi:extensions-lib", version = "v1.4.2.1" } tachiyomi-lib = { module = "com.github.keiyoushi:extensions-lib", version = "v1.4.2.1" }
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin_version" } kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
kotlin-protobuf = { module = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf", version.ref = "serialization_version" } kotlin-protobuf = { module = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf", version.ref = "serialization" }
kotlin-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization_version" } kotlin-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines_version" } coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines_version" } coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
injekt-core = { module = "com.github.null2264.injekt:injekt-core", version = "4135455a2a" } injekt-core = { module = "com.github.null2264.injekt:injekt-core", version = "4135455a2a" }
rxjava = { module = "io.reactivex:rxjava", version = "1.3.8" } rxjava = { module = "io.reactivex:rxjava", version = "1.3.8" }