Skip to content

Upgrade version to 1.2.0 #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ricky9667 wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Upgrade version to 1.2.0 #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
982554a
chore: 🤖 upgrade packages
ricky9667 Feb 9, 2026
b177c90
chore: 🤖 bump version to 1.2.0
ricky9667 Feb 9, 2026
4b4e46a
feat: 🎸 add 1.2.0 changelog
ricky9667 Feb 9, 2026
2d32987
fix: fix grammar
ricky9667 Feb 9, 2026
d824c8e
Initial plan
Copilot Feb 10, 2026
1f6297f
chore: 🤖 update desktop package version and version code to 1.2.0
Copilot Feb 10, 2026
16d23bb
Merge pull request #103 from ricky9667/copilot/sub-pr-102
ricky9667 Feb 10, 2026
83f09be
fix: 🐛 add buildkonfig.flavor to switch build types
ricky9667 Feb 15, 2026
a873002
chore: 🤖 update iOS project for building product archive
ricky9667 Feb 17, 2026
47b6415
fix: 🐛 remove build phase to pass ipa upload
ricky9667 Feb 18, 2026
1211c7b
fix: 🐛 modify isReleaseBuild calculation
ricky9667 Feb 23, 2026
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
5 changes: 3 additions & 2 deletions composeApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ compose.desktop {
nativeDistributions {
targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
packageName = "Hush Timer"
packageVersion = "1.0.3"
packageVersion = "1.2.0"

linux {
iconFile.set(project.file("desktopAppIcons/LinuxIcon.png"))
Expand Down Expand Up @@ -217,7 +217,8 @@ if (localPropertiesFile.exists()) {
}
}

val isReleaseBuild = project.hasProperty("mode") && project.property("mode") == "release"
val flavor = project.findProperty("buildkonfig.flavor")?.toString()
val isReleaseBuild = flavor == "release" || (project.hasProperty("mode") && project.property("mode") == "release")

fun getSecret(
key: String,
Expand Down
11 changes: 11 additions & 0 deletions composeApp/src/commonMain/kotlin/com/rickyhu/hushtimer/core/domain/ChangelogData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,17 @@ data class VersionChangelog(
object ChangelogData {
private val changelogs =
listOf(
VersionChangelog(
version = Version(1, 2, 0),
changes =
listOf(
"Improve scramble generation speed",
"UI improvement for scramble preview",
"Keep screen awake during timer runs",
"Check for updates automatically and notify users of new versions",
"Add Libraries screen in Settings page to show open-source libraries",
),
),
VersionChangelog(
version = Version(1, 1, 0),
changes =
Expand Down
6 changes: 3 additions & 3 deletions composeApp/src/jvmMain/kotlin/com/rickyhu/hushtimer/core/domain/AppVersionImpl.jvm.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ package com.rickyhu.hushtimer.core.domain
import io.github.z4kn4fein.semver.Version

class AppVersionImpl : AppVersion {
override fun getVersionName(): Version? {
override fun getVersionName(): Version {
// NOTE: Update this when changing packageVersion in build.gradle.kts desktop configuration
return Version(1, 0, 4)
return Version(1, 2, 0)
}
Comment on lines +6 to 9
Copy link

Copilot AI Feb 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The desktop/JVM app version is hardcoded here, but the Gradle desktop distribution packageVersion (see composeApp/build.gradle.kts) is still on an older value. To keep update checks and distributed artifact metadata consistent, bump the desktop packageVersion alongside this change or source this value from a single build-time constant.

Copilot uses AI. Check for mistakes.

override fun getVersionCode(): Int {
// NOTE: Update this when changing versionCode in build.gradle.kts android configuration
return 5
return 6
}
}
7 changes: 5 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,11 @@ android.generateSyncIssueWhenLibraryConstraintsAreEnabled=false
org.jetbrains.compose.experimental.jscanvas.enabled=true

#Release Version
appVersionName=1.1.0
appBuildNumber=5
appVersionName=1.2.0
appBuildNumber=7

#Build Flavor (only change to release when you want to publish a release build)
buildkonfig.flavor=debug

kotlin.mpp.enableCInteropCommonization.nowarn=true
kotlin.mpp.enableCInteropCommonization=true
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ kotlinx-coroutines = "1.10.2"
kotlinx-datetime = "0.7.1"
kotlinx-serialization = "1.10.0"
ksp = "2.3.4"
material-kolor = "4.1.0"
material-kolor = "4.1.1"
multiplatform-settings = "1.3.0"
navigation-compose = "2.9.1"
room = "2.8.4"
Expand Down
4 changes: 2 additions & 2 deletions iosApp/Versions.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// GENERATED FILE - DO NOT EDIT
MARKETING_VERSION = 1.1.0
CURRENT_PROJECT_VERSION = 5
MARKETING_VERSION = 1.2.0
CURRENT_PROJECT_VERSION = 7
36 changes: 15 additions & 21 deletions iosApp/iosApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,8 @@
A93A953F29CC810D00F8E227 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A93A953E29CC810D00F8E227 /* Assets.xcassets */; };
A93A954229CC810D00F8E227 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A93A954129CC810D00F8E227 /* Preview Assets.xcassets */; };
E18A4C532F23149800FA27BC /* TNoodle.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = E18A4C512F23149200FA27BC /* TNoodle.xcframework */; };
E18A4C542F23149800FA27BC /* TNoodle.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E18A4C512F23149200FA27BC /* TNoodle.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
E18BD1AF2F116BC800244547 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
dstPath = "";
dstSubfolder = Frameworks;
files = (
E18A4C542F23149800FA27BC /* TNoodle.xcframework in Embed Frameworks */,
);
name = "Embed Frameworks";
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
A2E8B6332EB353420091921A /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
A93A953729CC810C00F8E227 /* Hush Timer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Hush Timer.app"; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -46,10 +33,10 @@
A93A953429CC810C00F8E227 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
files = (
E18A4C532F23149800FA27BC /* TNoodle.xcframework in Frameworks */,
A2E8B6372EB354980091921A /* FirebaseAnalytics in Frameworks */,
A2E8B63D2EB354980091921A /* FirebaseCrashlytics in Frameworks */,
A2E8B63B2EB354980091921A /* FirebaseCore in Frameworks */,
E18A4C532F23149800FA27BC /* TNoodle.xcframework in Frameworks */,
A2E8B6392EB354980091921A /* FirebaseAnalyticsCore in Frameworks */,
);
};
Expand Down Expand Up @@ -115,7 +102,6 @@
A93A953529CC810C00F8E227 /* Resources */,
D8F134DBF3B24C6E9849CF36 /* Sync Version Info */,
A2E8B63E2EB3581E0091921A /* Run Script */,
E18BD1AF2F116BC800244547 /* Embed Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -389,10 +375,12 @@
CFBundleShortVersionString = "$(MARKETING_VERSION)";
CFBundleVersion = "$(CURRENT_PROJECT_VERSION)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++23";
CODE_SIGN_STYLE = Automatic;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
DEVELOPMENT_TEAM = 6838583E88;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8DPH862SRB;
DRIVERKIT_DEPLOYMENT_TARGET = 25.0;
ENABLE_PREVIEWS = YES;
FRAMEWORK_SEARCH_PATHS = "";
Expand All @@ -417,8 +405,10 @@
"-framework",
Security,
);
PRODUCT_BUNDLE_IDENTIFIER = com.rickyhu.hushtimer.iosApp;
PRODUCT_BUNDLE_IDENTIFIER = com.rickyhu.hushtimer;
PRODUCT_NAME = "Hush Timer";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = HUSH_Timer_AppStore_Profile;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OBJC_INTEROP_MODE = objcxx;
SWIFT_STRICT_MEMORY_SAFETY = YES;
Expand All @@ -441,9 +431,11 @@
CFBundleShortVersionString = "$(MARKETING_VERSION)";
CFBundleVersion = "$(CURRENT_PROJECT_VERSION)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++23";
CODE_SIGN_STYLE = Automatic;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
DEVELOPMENT_TEAM = 6838583E88;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8DPH862SRB;
DRIVERKIT_DEPLOYMENT_TARGET = 25.0;
ENABLE_PREVIEWS = YES;
FRAMEWORK_SEARCH_PATHS = "";
Expand All @@ -468,8 +460,10 @@
"-framework",
Security,
);
PRODUCT_BUNDLE_IDENTIFIER = com.rickyhu.hushtimer.iosApp;
PRODUCT_BUNDLE_IDENTIFIER = com.rickyhu.hushtimer;
PRODUCT_NAME = "Hush Timer";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = HUSH_Timer_AppStore_Profile;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OBJC_INTEROP_MODE = objcxx;
SWIFT_STRICT_MEMORY_SAFETY = YES;
Expand Down
Loading