Merge Mihon 0.21.2 updates and use BookOasis updater
Build & Test / Build & Test App (push) Has been cancelled
Release / Extract tag name (push) Has been cancelled
Update website / update_website (release) Has been cancelled
Release / Build (push) Has been cancelled
Release / Build (FOSS) (push) Has been cancelled
Release / Create GitHub Release (push) Has been cancelled
Build & Test / Build & Test App (push) Has been cancelled
Release / Extract tag name (push) Has been cancelled
Update website / update_website (release) Has been cancelled
Release / Build (push) Has been cancelled
Release / Build (FOSS) (push) Has been cancelled
Release / Create GitHub Release (push) Has been cancelled
This commit is contained in:
+119
-26
@@ -1,11 +1,14 @@
|
||||
import com.android.build.api.variant.ApplicationVariant
|
||||
import com.android.build.api.variant.BuildConfigField
|
||||
import com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsExtension
|
||||
import mihon.gradle.Config
|
||||
import mihon.gradle.getBuildTime
|
||||
import mihon.gradle.getCurrentTime
|
||||
import mihon.gradle.getLatestCommitCount
|
||||
import mihon.gradle.getLatestCommitSha
|
||||
import mihon.gradle.getLatestCommitTime
|
||||
import mihon.gradle.tasks.ReplaceShortcutsPlaceholderTask
|
||||
import java.io.FileInputStream
|
||||
import java.util.Properties
|
||||
import kotlin.io.encoding.Base64
|
||||
|
||||
plugins {
|
||||
alias(mihonx.plugins.android.application)
|
||||
@@ -16,6 +19,7 @@ plugins {
|
||||
alias(libs.plugins.aboutLibraries)
|
||||
alias(libs.plugins.androidx.baselineProfile)
|
||||
alias(libs.plugins.kotlin.serialization)
|
||||
alias(libs.plugins.apollo)
|
||||
}
|
||||
|
||||
if (Config.includeTelemetry) {
|
||||
@@ -25,7 +29,7 @@ if (Config.includeTelemetry) {
|
||||
}
|
||||
}
|
||||
|
||||
val keystorePropertiesFile = rootProject.file("keystore.properties")
|
||||
val keystorePropertiesFile = layout.settingsDirectory.file("keystore.properties").asFile
|
||||
|
||||
android {
|
||||
namespace = "eu.kanade.tachiyomi"
|
||||
@@ -33,12 +37,9 @@ android {
|
||||
defaultConfig {
|
||||
applicationId = "app.mihon"
|
||||
|
||||
versionCode = 31
|
||||
versionName = "0.20.5"
|
||||
versionCode = 38
|
||||
versionName = "0.21.2-bookoasis-r15"
|
||||
|
||||
buildConfigField("String", "COMMIT_COUNT", "\"${getLatestCommitCount()}\"")
|
||||
buildConfigField("String", "COMMIT_SHA", "\"${getLatestCommitSha()}\"")
|
||||
buildConfigField("String", "BUILD_TIME", "\"${getBuildTime(useLatestCommitTime = false)}\"")
|
||||
buildConfigField("boolean", "TELEMETRY_INCLUDED", "${Config.includeTelemetry}")
|
||||
buildConfigField("boolean", "UPDATER_ENABLED", "${Config.enableUpdater}")
|
||||
|
||||
@@ -46,14 +47,9 @@ android {
|
||||
}
|
||||
|
||||
if (System.getenv("MIHON_GITHUB_RELEASE").toBoolean()) {
|
||||
val tempStoreFile = file(System.getenv("RUNNER_TEMP")).resolve("antsy.keystore")
|
||||
|
||||
val storeFileBytes = System.getenv("storeFileBase64").let(Base64::decode)
|
||||
tempStoreFile.outputStream().use { it.write(storeFileBytes) }
|
||||
|
||||
signingConfigs {
|
||||
named("debug") {
|
||||
storeFile = tempStoreFile
|
||||
storeFile = file(System.getenv("storeFile"))
|
||||
storePassword = System.getenv("storePassword")
|
||||
keyAlias = System.getenv("keyAlias")
|
||||
keyPassword = System.getenv("keyPassword")
|
||||
@@ -75,7 +71,6 @@ android {
|
||||
buildTypes {
|
||||
val debug = getByName("debug") {
|
||||
applicationIdSuffix = ".dev"
|
||||
versionNameSuffix = "-${getLatestCommitCount()}"
|
||||
isPseudoLocalesEnabled = true
|
||||
}
|
||||
val release = getByName("release") {
|
||||
@@ -87,8 +82,6 @@ android {
|
||||
isProfileable = true
|
||||
|
||||
proguardFiles("proguard-android-optimize.txt", "proguard-rules.pro")
|
||||
|
||||
buildConfigField("String", "BUILD_TIME", "\"${getBuildTime(useLatestCommitTime = true)}\"")
|
||||
}
|
||||
|
||||
val commonMatchingFallbacks = listOf(release.name)
|
||||
@@ -105,11 +98,7 @@ android {
|
||||
|
||||
applicationIdSuffix = ".debug"
|
||||
|
||||
versionNameSuffix = debug.versionNameSuffix
|
||||
|
||||
matchingFallbacks.addAll(commonMatchingFallbacks)
|
||||
|
||||
buildConfigField("String", "BUILD_TIME", "\"${getBuildTime(useLatestCommitTime = false)}\"")
|
||||
}
|
||||
create("benchmark") {
|
||||
initWith(release)
|
||||
@@ -119,6 +108,14 @@ android {
|
||||
|
||||
matchingFallbacks.addAll(commonMatchingFallbacks)
|
||||
}
|
||||
|
||||
if (Config.includeTelemetry) {
|
||||
configureEach {
|
||||
configure<CrashlyticsExtension> {
|
||||
mappingFileUploadEnabled = Config.uploadCrashlyticsMapping
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
@@ -208,6 +205,7 @@ dependencies {
|
||||
baselineProfile(projects.baselineProfile)
|
||||
|
||||
implementation(projects.i18n)
|
||||
implementation(projects.icons.customMaterialSymbols)
|
||||
implementation(projects.icons.materialSymbols)
|
||||
implementation(projects.icons.simpleIcons)
|
||||
implementation(projects.core.archive)
|
||||
@@ -216,7 +214,6 @@ dependencies {
|
||||
implementation(projects.coreMetadata)
|
||||
implementation(projects.sourceApi)
|
||||
implementation(projects.sourceLocal)
|
||||
implementation(libs.jsoup)
|
||||
implementation(projects.data)
|
||||
implementation(projects.domain)
|
||||
implementation(projects.presentationCore)
|
||||
@@ -232,20 +229,17 @@ dependencies {
|
||||
debugImplementation(libs.androidx.compose.uiTooling)
|
||||
implementation(libs.androidx.compose.uiToolingPreview)
|
||||
implementation(libs.androidx.compose.uiUtil)
|
||||
implementation(libs.androidx.navigationEvent)
|
||||
|
||||
implementation(libs.androidx.interpolator)
|
||||
|
||||
implementation(libs.androidx.paging.runtime)
|
||||
implementation(libs.androidx.paging.compose)
|
||||
|
||||
implementation(libs.androidx.sqlite.bundled)
|
||||
|
||||
implementation(libs.kotlin.reflect)
|
||||
|
||||
implementation(libs.bundles.kotlinx.coroutines)
|
||||
|
||||
implementation(libs.sqldelight.async)
|
||||
|
||||
implementation(libs.kotlinx.datetime)
|
||||
|
||||
// AndroidX libraries
|
||||
@@ -327,6 +321,10 @@ dependencies {
|
||||
// String similarity
|
||||
implementation(libs.stringSimilarity)
|
||||
|
||||
// GraphQL generation
|
||||
implementation(libs.apollo)
|
||||
implementation(libs.apollo.adapters)
|
||||
|
||||
// Tests
|
||||
testImplementation(libs.bundles.test)
|
||||
testRuntimeOnly(libs.junit.platform.launcher)
|
||||
@@ -338,7 +336,102 @@ dependencies {
|
||||
testImplementation(libs.kotlinx.coroutines.test)
|
||||
}
|
||||
|
||||
apollo {
|
||||
val schemaBasePath = "src/main/graphql/mihon/graphql"
|
||||
service("anilist") {
|
||||
packageName.set("mihon.graphql.anilist")
|
||||
val srcDir = "$schemaBasePath/anilist"
|
||||
srcDir(file(srcDir))
|
||||
|
||||
introspection {
|
||||
endpointUrl.set("https://graphql.anilist.co")
|
||||
schemaFile.set(file("$srcDir/anilist.graphqls"))
|
||||
}
|
||||
|
||||
// ISO 3166-1 alpha-2 country code
|
||||
mapScalarToKotlinString("CountryCode")
|
||||
}
|
||||
|
||||
service("kitsu") {
|
||||
packageName.set("mihon.graphql.kitsu")
|
||||
val srcDir = "$schemaBasePath/kitsu"
|
||||
srcDir(file(srcDir))
|
||||
android.defaultConfig.versionCode
|
||||
|
||||
introspection {
|
||||
// Kitsu doesn't like requests without a UA
|
||||
headers.put(
|
||||
"User-Agent",
|
||||
"Mihon v${android.defaultConfig.versionName} (${android.defaultConfig.applicationId})",
|
||||
)
|
||||
endpointUrl.set("https://kitsu.app/api/graphql")
|
||||
schemaFile.set(file("$srcDir/kitsu.graphqls"))
|
||||
}
|
||||
|
||||
// A date, expressed as an ISO8601 string
|
||||
mapScalarToKotlinString("Date")
|
||||
// An ISO 8601-encoded datetime
|
||||
mapScalar("ISO8601DateTime", "kotlin.time.Instant", "com.apollographql.adapter.core.KotlinInstantAdapter")
|
||||
// A loose key-value map in GraphQL
|
||||
mapScalar(
|
||||
"Map",
|
||||
"kotlin.collections.Map<String, Any?>",
|
||||
"mihon.graphql.kitsu.adapter.KitsuMapAdapter",
|
||||
)
|
||||
}
|
||||
|
||||
service("shikimori") {
|
||||
packageName.set("mihon.graphql.shikimori")
|
||||
val srcDir = "$schemaBasePath/shikimori"
|
||||
srcDir(file(srcDir))
|
||||
|
||||
introspection {
|
||||
endpointUrl.set("https://shikimori.io/api/graphql")
|
||||
schemaFile.set(file("$srcDir/shikimori.graphqls"))
|
||||
}
|
||||
|
||||
// An ISO 8601-encoded date
|
||||
mapScalarToKotlinString("ISO8601Date")
|
||||
}
|
||||
|
||||
service("suwayomi") {
|
||||
packageName.set("mihon.graphql.suwayomi")
|
||||
val srcDir = "$schemaBasePath/suwayomi"
|
||||
srcDir(file(srcDir))
|
||||
|
||||
introspection {
|
||||
endpointUrl.set("http://localhost:4567/api/graphql")
|
||||
schemaFile.set(file("$srcDir/suwayomi.graphqls"))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
val latestCommitCount = getLatestCommitCount()
|
||||
val latestCommitSha = getLatestCommitSha()
|
||||
val latestCommitTime = getLatestCommitTime()
|
||||
val currentTime = getCurrentTime()
|
||||
|
||||
fun ApplicationVariant.buildConfigField(type: String, name: String, value: Provider<String>) {
|
||||
buildConfigFields?.put(name, value.map { BuildConfigField(type, it, null) })
|
||||
}
|
||||
|
||||
androidComponents {
|
||||
onVariants { variant ->
|
||||
val isUnstableBuild = variant.buildType == "debug" || variant.buildType == "nightly"
|
||||
val buildTime = if (isUnstableBuild) currentTime else latestCommitTime
|
||||
|
||||
variant.buildConfigField("String", "COMMIT_COUNT", latestCommitCount.map { "\"$it\"" })
|
||||
variant.buildConfigField("String", "COMMIT_SHA", latestCommitSha.map { "\"$it\"" })
|
||||
variant.buildConfigField("String", "BUILD_TIME", buildTime.map { "\"$it\"" })
|
||||
|
||||
if (isUnstableBuild) {
|
||||
variant.outputs.forEach { output ->
|
||||
val versionName = output.versionName.get()
|
||||
output.versionName.set(latestCommitCount.map { "$versionName-$it" })
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
onVariants { variant ->
|
||||
val resSource = variant.sources.res ?: return@onVariants
|
||||
|
||||
|
||||
Reference in New Issue
Block a user