diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e8a9da..fccedd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,15 @@ The format of this changelog is based on [Keep a Changelog](https://keepachangel
This project aims to adhere to [Semantic Versioning](https://server.org).
-Regarding project commits as of 2024-08-23, this project aims to adhere to the [Conventional Commits](https://www.conventionalcommits.org) standard. While the standard makes recommendations, it does not limit commit type or scope; consequently, usage in the project's commits are not necessarily so limited.
+Regarding project commits: As of 2024-08-23, this project aims to adhere to the [Conventional Commits](https://www.conventionalcommits.org) standard. While the standard makes recommendations, it does not limit commit type or scope; consequently, neither type nor scope is limited to those recommendations in the project commits.
+
+## [1.1.1]
+
+### Changed
+
+* Location of versionName definition from strings.xml to app/build.gradle.kts; this facilitates building with systems (e.g. F-Droid) for which definition from a string reference is problematic.
+* AboutActivity to fetch versionName for display from app/build.gradle.kts rather than from a string reference.
+* Fastlane full_description to improve readability of reference to the README.md file.
## [1.1.0]
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 5a4f7f6..b6638fc 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -10,8 +10,8 @@ android {
applicationId = "net.diffengine.romandigitalclock"
minSdk = 21
targetSdk = 34
- versionCode = 2
- versionName = "@string/app_version"
+ versionCode = 3
+ versionName = "1.1.1"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
@@ -28,6 +28,7 @@ android {
}
buildFeatures {
viewBinding = true
+ buildConfig = true
}
}
diff --git a/app/src/main/java/net/diffengine/romandigitalclock/AboutActivity.java b/app/src/main/java/net/diffengine/romandigitalclock/AboutActivity.java
index 138f79b..5e46207 100644
--- a/app/src/main/java/net/diffengine/romandigitalclock/AboutActivity.java
+++ b/app/src/main/java/net/diffengine/romandigitalclock/AboutActivity.java
@@ -35,7 +35,10 @@ protected void onCreate(Bundle savedInstanceState) {
TextView tv = findViewById(R.id.tvVersion);
- tv.setText(getString(R.string.app_version_label, getString(R.string.app_version)));
+ // BuildConfig full package name is to prevent any possible future confusion with org.acra.BuildConfig
+ String appversion = net.diffengine.romandigitalclock.BuildConfig.VERSION_NAME;
+
+ tv.setText(getString(R.string.app_version_label, appversion));
ActionBar actionBar = getSupportActionBar();
if (actionBar != null) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9155a8d..e13b50f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -25,7 +25,6 @@