Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/android-app.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
name: Android app

# Reusable build/release pipeline for every personal-OS Android app. An app's own workflow
# Reusable build/release pipeline for every consuming Android app. An app's own workflow
# is a handful of lines that calls this one, so the version logic, signing and release steps
# exist once rather than in four slightly-diverged copies.
#
# jobs:
# android:
# uses: mountEvarus/android-config/.github/workflows/android-app.yml@main
# with:
# app-name: finance
# release-title: Finance (Android)
# app-name: foo
# release-title: Foo (Android)
# secrets: inherit

on:
Expand Down Expand Up @@ -215,7 +215,7 @@ jobs:

# One release per version, tagged android-v<VERSION>. `gh release create` creates the
# tag, so there is no separate tagging step. A predictable "latest" release and a fixed
# asset name are the contract the self-hosted F-Droid repo downloads against.
# asset name are the contract the downstream package index builds against.
- name: Publish signed APK to a versioned release
env:
GH_TOKEN: ${{ github.token }}
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,10 @@ building or releasing.

## Submodules

The workflow initialises **only** `packages/android-config`, not every submodule. A repo like
finance also carries private `js-config` and `go-config` submodules, and `submodules: recursive`
would fail trying to clone them with the default token. The Android build never reads them, so
it does not ask for them, and no PAT is needed anywhere in this pipeline.
The workflow initialises **only** `packages/android-config`, not every submodule. A consuming
repo may also carry private submodules for its other surfaces, and `submodules: recursive` would
fail trying to clone those with the default token. The Android build never reads them, so it does
not ask for them, and no PAT is needed anywhere in this pipeline.

## Environment config

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension

/**
* Everything identical across the personal-OS Android apps. An app applies this instead of
* Everything identical across the consuming Android apps. An app applies this instead of
* the android/kotlin/compose plugin stack, so its build file carries dependencies and
* genuinely app-specific config, and nothing else.
*/
Expand Down Expand Up @@ -77,10 +77,10 @@ class AndroidAppConventionPlugin : Plugin<Project> {

lint {
// Real lint errors fail the build. Warnings are reported but do not, which is
// deliberate: promoting them turned six cosmetic findings in film-roll (an
// inlined int constant, two forward-compatible widget attributes, three
// resource nits) into a red build. A gate that fires on themed-icon advice is
// one that gets switched off entirely.
// deliberate: promoting them turned a handful of cosmetic findings (an inlined
// int constant, forward-compatible widget attributes, resource nits) into a red
// build. A gate that fires on themed-icon advice is one that gets switched off
// entirely.
abortOnError = true
warningsAsErrors = false
// Dependency freshness is Renovate's job. Failing on it would make every app
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ object AppName {

require(name.matches(Regex("[a-z][a-z0-9]*"))) {
"$PROPERTY is '$name'. It becomes a package segment, so it must be lowercase " +
"letters and digits only, starting with a letter. 'film-roll' would be invalid; " +
"'filmroll' is what that app uses."
"letters and digits only, starting with a letter. 'long-name' would be " +
"invalid; 'longname' is the form to use."
}
return name
}
Expand Down
6 changes: 3 additions & 3 deletions libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Shared version catalog for every personal-OS Android app.
# Shared version catalog for every Android app that consumes this repo.
#
# This is the single source of truth. Apps consume it through the android-config
# submodule and declare no versions of their own. Renovate updates it here once and
Expand Down Expand Up @@ -42,8 +42,8 @@ glance = "1.1.1"

camerax = "1.5.0"
mlkit-barcode = "17.3.0"
# Runtime dependency of health's vendored Samsung Health Data SDK AAR, which references
# com.google.gson internally and declares no transitive dependencies of its own.
# Runtime dependency of a vendored AAR that references com.google.gson internally and
# declares no transitive dependencies of its own.
gson = "2.14.0"
health-connect = "1.1.0-rc02"
maps-compose = "6.4.1"
Expand Down