diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3eb08d6..b76118c 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -35,8 +35,8 @@ android { applicationId = "uk.ewancroft.inkwell" minSdk = 26 targetSdk = 36 - versionCode = 1 - versionName = "1.0.0" + versionCode = 2 + versionName = "1.0.1" manifestPlaceholders["appAuthRedirectScheme"] = "uk.ewancroft.inkwell" } diff --git a/app/src/main/java/uk/ewancroft/inkwell/ui/discover/DiscoverScreen.kt b/app/src/main/java/uk/ewancroft/inkwell/ui/discover/DiscoverScreen.kt index ae0a79c..97f58f2 100644 --- a/app/src/main/java/uk/ewancroft/inkwell/ui/discover/DiscoverScreen.kt +++ b/app/src/main/java/uk/ewancroft/inkwell/ui/discover/DiscoverScreen.kt @@ -35,7 +35,7 @@ fun DiscoverScreen( try { val pkg = context.packageManager.getPackageInfo(context.packageName, 0) "Version ${pkg.versionName} (${pkg.longVersionCode})" - } catch (_: Exception) { "Version 1.0.0 (1)" } + } catch (_: Exception) { "Version 1.0.1 (2)" } } Scaffold( diff --git a/app/src/main/java/uk/ewancroft/inkwell/ui/reader/ReaderScreen.kt b/app/src/main/java/uk/ewancroft/inkwell/ui/reader/ReaderScreen.kt index 2948a6f..df11001 100644 --- a/app/src/main/java/uk/ewancroft/inkwell/ui/reader/ReaderScreen.kt +++ b/app/src/main/java/uk/ewancroft/inkwell/ui/reader/ReaderScreen.kt @@ -39,7 +39,7 @@ fun ReaderScreen( try { val pkg = context.packageManager.getPackageInfo(context.packageName, 0) "Version ${pkg.versionName} (${pkg.longVersionCode})" - } catch (_: Exception) { "Version 1.0.0 (1)" } + } catch (_: Exception) { "Version 1.0.1 (2)" } } Scaffold( diff --git a/app/src/main/java/uk/ewancroft/inkwell/ui/writer/WriterScreen.kt b/app/src/main/java/uk/ewancroft/inkwell/ui/writer/WriterScreen.kt index d18a553..5ffa52a 100644 --- a/app/src/main/java/uk/ewancroft/inkwell/ui/writer/WriterScreen.kt +++ b/app/src/main/java/uk/ewancroft/inkwell/ui/writer/WriterScreen.kt @@ -31,7 +31,7 @@ fun WriterScreen( try { val pkg = context.packageManager.getPackageInfo(context.packageName, 0) "Version ${pkg.versionName} (${pkg.longVersionCode})" - } catch (_: Exception) { "Version 1.0.0 (1)" } + } catch (_: Exception) { "Version 1.0.1 (2)" } } LaunchedEffect(Unit) { diff --git a/fdroid-repo/metadata/uk.ewancroft.inkwell.yml b/fdroid-repo/metadata/uk.ewancroft.inkwell.yml index 7b4b42d..816ce23 100644 --- a/fdroid-repo/metadata/uk.ewancroft.inkwell.yml +++ b/fdroid-repo/metadata/uk.ewancroft.inkwell.yml @@ -51,5 +51,5 @@ Description: |- # still-pending submission. AutoUpdateMode: None UpdateCheckMode: None -CurrentVersion: '1.0.0' -CurrentVersionCode: 1 +CurrentVersion: '1.0.1' +CurrentVersionCode: 2 diff --git a/fdroid/README.md b/fdroid/README.md index 59e65dd..87418dc 100644 --- a/fdroid/README.md +++ b/fdroid/README.md @@ -28,7 +28,7 @@ This directory contains the F-Droid build metadata file ready for submission to ## Prerequisites -- [ ] **TODO — not yet done:** git tag `v1.0.0` must be created and pushed to the `main` branch of the inkwell-android repo before this metadata can be submitted. It does not exist yet as of writing (only `v0.1.1`, `v0.2.0`, and dated `v2026-*` tags exist). `uk.ewancroft.inkwell.yml`'s `Builds.commit` references `v1.0.0` to match `app/build.gradle.kts`'s `versionName = "1.0.0"` / `versionCode = 1` — F-Droid's build system will fail to check out a nonexistent tag, so do not submit until the tag exists. +- [ ] **TODO — not yet done:** git tag `v1.0.1` must be created and pushed to the `main` branch of the inkwell-android repo before this metadata can be submitted. It does not exist yet as of writing. `uk.ewancroft.inkwell.yml`'s `Builds.commit` references `v1.0.1` to match `app/build.gradle.kts`'s `versionName = "1.0.1"` / `versionCode = 2` — F-Droid's build system will fail to check out a nonexistent tag, so do not submit until the tag exists. - [x] Fastlane metadata is present in `fastlane/metadata/android/en-GB/` (already in this repo). - [x] Confirmed all dependencies are FOSS — `./gradlew app:dependencies --configuration releaseRuntimeClasspath` resolved cleanly with no Firebase/GMS. The only `com.google.*` packages present (Gson, Guava, Tink, Dagger/Hilt, Accompanist) are FOSS, Apache 2.0-licensed. Re-run this check before actually submitting if dependencies have changed since. - [ ] `./gradlew assembleRelease` builds cleanly (verified — see repo history), but there is no `signingConfigs` block in `app/build.gradle.kts`, so the release build is currently unsigned. F-Droid signs its own builds from source, so this is fine for F-Droid specifically — but confirm this is still true (or add one) before using the same build for any other signed-release channel. diff --git a/fdroid/uk.ewancroft.inkwell.yml b/fdroid/uk.ewancroft.inkwell.yml index 3728f6d..0bcd949 100644 --- a/fdroid/uk.ewancroft.inkwell.yml +++ b/fdroid/uk.ewancroft.inkwell.yml @@ -13,17 +13,17 @@ RepoType: git Repo: https://github.com/ewanc26/inkwell-android.git Builds: - # NOTE: tag v1.0.0 does not exist yet — it must be created and pushed + # NOTE: tag v1.0.1 does not exist yet — it must be created and pushed # (matching app/build.gradle.kts versionName) before this build entry # is valid. See fdroid/README.md Prerequisites. - - versionName: '1.0.0' - versionCode: 1 - commit: v1.0.0 + - versionName: '1.0.1' + versionCode: 2 + commit: v1.0.1 subdir: app gradle: - yes AutoUpdateMode: Version UpdateCheckMode: Tags -CurrentVersion: '1.0.0' -CurrentVersionCode: 1 +CurrentVersion: '1.0.1' +CurrentVersionCode: 2