mirror of
https://github.com/mihonapp/mihon.git
synced 2025-06-27 11:37:51 +02:00
Change 'include-analytics' to 'include-telemetry' (#1874)
This commit is contained in:
2
.github/workflows/build_push.yml
vendored
2
.github/workflows/build_push.yml
vendored
@ -32,7 +32,7 @@ jobs:
|
|||||||
run: ./gradlew spotlessCheck
|
run: ./gradlew spotlessCheck
|
||||||
|
|
||||||
- name: Build app
|
- name: Build app
|
||||||
run: ./gradlew assembleRelease -Pinclude-analytics -Penable-updater
|
run: ./gradlew assembleRelease -Pinclude-telemetry -Penable-updater
|
||||||
|
|
||||||
- name: Run unit tests
|
- name: Run unit tests
|
||||||
run: ./gradlew testReleaseUnitTest
|
run: ./gradlew testReleaseUnitTest
|
||||||
|
@ -11,7 +11,7 @@ plugins {
|
|||||||
alias(libs.plugins.aboutLibraries)
|
alias(libs.plugins.aboutLibraries)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Config.includeAnalytics) {
|
if (Config.includeTelemetry) {
|
||||||
pluginManager.apply {
|
pluginManager.apply {
|
||||||
apply(libs.plugins.google.services.get().pluginId)
|
apply(libs.plugins.google.services.get().pluginId)
|
||||||
apply(libs.plugins.firebase.crashlytics.get().pluginId)
|
apply(libs.plugins.firebase.crashlytics.get().pluginId)
|
||||||
@ -32,7 +32,7 @@ android {
|
|||||||
buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
|
buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
|
||||||
buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"")
|
buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"")
|
||||||
buildConfigField("String", "BUILD_TIME", "\"${getBuildTime()}\"")
|
buildConfigField("String", "BUILD_TIME", "\"${getBuildTime()}\"")
|
||||||
buildConfigField("boolean", "ANALYTICS_INCLUDED", "${Config.includeAnalytics}")
|
buildConfigField("boolean", "TELEMETRY_INCLUDED", "${Config.includeTelemetry}")
|
||||||
buildConfigField("boolean", "UPDATER_ENABLED", "${Config.enableUpdater}")
|
buildConfigField("boolean", "UPDATER_ENABLED", "${Config.enableUpdater}")
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
@ -37,8 +37,8 @@ import androidx.lifecycle.LifecycleOwner
|
|||||||
import androidx.lifecycle.compose.LocalLifecycleOwner
|
import androidx.lifecycle.compose.LocalLifecycleOwner
|
||||||
import eu.kanade.presentation.util.rememberRequestPackageInstallsPermissionState
|
import eu.kanade.presentation.util.rememberRequestPackageInstallsPermissionState
|
||||||
import eu.kanade.tachiyomi.core.security.PrivacyPreferences
|
import eu.kanade.tachiyomi.core.security.PrivacyPreferences
|
||||||
import eu.kanade.tachiyomi.util.system.analyticsIncluded
|
|
||||||
import eu.kanade.tachiyomi.util.system.launchRequestPackageInstallsPermission
|
import eu.kanade.tachiyomi.util.system.launchRequestPackageInstallsPermission
|
||||||
|
import eu.kanade.tachiyomi.util.system.telemetryIncluded
|
||||||
import tachiyomi.i18n.MR
|
import tachiyomi.i18n.MR
|
||||||
import tachiyomi.presentation.core.i18n.stringResource
|
import tachiyomi.presentation.core.i18n.stringResource
|
||||||
import tachiyomi.presentation.core.util.collectAsState
|
import tachiyomi.presentation.core.util.collectAsState
|
||||||
@ -118,7 +118,7 @@ internal class PermissionStep : OnboardingStep {
|
|||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
if (!analyticsIncluded) return@Column
|
if (!telemetryIncluded) return@Column
|
||||||
|
|
||||||
HorizontalDivider(
|
HorizontalDivider(
|
||||||
modifier = Modifier.padding(vertical = 8.dp, horizontal = 16.dp),
|
modifier = Modifier.padding(vertical = 8.dp, horizontal = 16.dp),
|
||||||
|
@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.core.security.PrivacyPreferences
|
|||||||
import eu.kanade.tachiyomi.core.security.SecurityPreferences
|
import eu.kanade.tachiyomi.core.security.SecurityPreferences
|
||||||
import eu.kanade.tachiyomi.util.system.AuthenticatorUtil.authenticate
|
import eu.kanade.tachiyomi.util.system.AuthenticatorUtil.authenticate
|
||||||
import eu.kanade.tachiyomi.util.system.AuthenticatorUtil.isAuthenticationSupported
|
import eu.kanade.tachiyomi.util.system.AuthenticatorUtil.isAuthenticationSupported
|
||||||
import eu.kanade.tachiyomi.util.system.analyticsIncluded
|
import eu.kanade.tachiyomi.util.system.telemetryIncluded
|
||||||
import kotlinx.collections.immutable.persistentListOf
|
import kotlinx.collections.immutable.persistentListOf
|
||||||
import kotlinx.collections.immutable.toImmutableMap
|
import kotlinx.collections.immutable.toImmutableMap
|
||||||
import tachiyomi.core.common.i18n.stringResource
|
import tachiyomi.core.common.i18n.stringResource
|
||||||
@ -34,7 +34,7 @@ object SettingsSecurityScreen : SearchableSettings {
|
|||||||
val privacyPreferences = remember { Injekt.get<PrivacyPreferences>() }
|
val privacyPreferences = remember { Injekt.get<PrivacyPreferences>() }
|
||||||
return buildList(2) {
|
return buildList(2) {
|
||||||
add(getSecurityGroup(securityPreferences))
|
add(getSecurityGroup(securityPreferences))
|
||||||
if (!analyticsIncluded) return@buildList
|
if (!telemetryIncluded) return@buildList
|
||||||
add(getFirebaseGroup(privacyPreferences))
|
add(getFirebaseGroup(privacyPreferences))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,8 +4,8 @@ package eu.kanade.tachiyomi.util.system
|
|||||||
|
|
||||||
import eu.kanade.tachiyomi.BuildConfig
|
import eu.kanade.tachiyomi.BuildConfig
|
||||||
|
|
||||||
val analyticsIncluded: Boolean
|
val telemetryIncluded: Boolean
|
||||||
inline get() = BuildConfig.ANALYTICS_INCLUDED
|
inline get() = BuildConfig.TELEMETRY_INCLUDED
|
||||||
|
|
||||||
val updaterEnabled: Boolean
|
val updaterEnabled: Boolean
|
||||||
inline get() = BuildConfig.UPDATER_ENABLED
|
inline get() = BuildConfig.UPDATER_ENABLED
|
||||||
|
@ -3,14 +3,14 @@ package mihon.buildlogic
|
|||||||
import org.gradle.api.Project
|
import org.gradle.api.Project
|
||||||
|
|
||||||
interface BuildConfig {
|
interface BuildConfig {
|
||||||
val includeAnalytics: Boolean
|
val includeTelemetry: Boolean
|
||||||
val enableUpdater: Boolean
|
val enableUpdater: Boolean
|
||||||
val enableCodeShrink: Boolean
|
val enableCodeShrink: Boolean
|
||||||
val includeDependencyInfo: Boolean
|
val includeDependencyInfo: Boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
val Project.Config: BuildConfig get() = object : BuildConfig {
|
val Project.Config: BuildConfig get() = object : BuildConfig {
|
||||||
override val includeAnalytics: Boolean = project.hasProperty("include-analytics")
|
override val includeTelemetry: Boolean = project.hasProperty("include-telemetry")
|
||||||
override val enableUpdater: Boolean = project.hasProperty("enable-updater")
|
override val enableUpdater: Boolean = project.hasProperty("enable-updater")
|
||||||
override val enableCodeShrink: Boolean = !project.hasProperty("disable-code-shrink")
|
override val enableCodeShrink: Boolean = !project.hasProperty("disable-code-shrink")
|
||||||
override val includeDependencyInfo: Boolean = project.hasProperty("include-dependency-info")
|
override val includeDependencyInfo: Boolean = project.hasProperty("include-dependency-info")
|
||||||
|
@ -10,7 +10,7 @@ android {
|
|||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
getByName("main") {
|
getByName("main") {
|
||||||
val dir = if (Config.includeAnalytics) "firebase" else "noop"
|
val dir = if (Config.includeTelemetry) "firebase" else "noop"
|
||||||
kotlin.srcDirs("src/$dir/kotlin")
|
kotlin.srcDirs("src/$dir/kotlin")
|
||||||
manifest.srcFile("src/$dir/AndroidManifext.xml")
|
manifest.srcFile("src/$dir/AndroidManifext.xml")
|
||||||
}
|
}
|
||||||
@ -18,7 +18,7 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
if (Config.includeAnalytics) {
|
if (Config.includeTelemetry) {
|
||||||
implementation(platform(libs.firebase.bom))
|
implementation(platform(libs.firebase.bom))
|
||||||
implementation(libs.firebase.analytics)
|
implementation(libs.firebase.analytics)
|
||||||
implementation(libs.firebase.crashlytics)
|
implementation(libs.firebase.crashlytics)
|
||||||
|
Reference in New Issue
Block a user