vrr/hammer-editor
2
0
Fork 0
mirror of https://github.com/Darkrock-Studios/hammer-editor.git synced 2026-10-19 09:34:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'develop' into release

Browse source
This commit is contained in:
Wavesonics 2026-09-04 20:10:31 -07:00
commit d6d3bc9131
15 changed files with 66 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
.github/workflows/publish-ios-app-store.yml vendored
View file

@ -15,6 +15,18 @@ on:
required: false
workflow_call:
# Serialized against the Mac App Store publish: since iOS moved onto the macOS
# app record for Universal Purchase, both publishes target the SAME App Store
# Connect record, and deliver edits record-level App Information (categories,
# copyright) as well as the per-platform version. A full release tag — one with
# no `+platform` suffix — starts both in parallel, so they must queue instead.
# The group name is deliberately constant, not per-tag: two overlapping releases
# would collide the same way. cancel-in-progress stays false; aborting a publish
# part-way through a review submission is far worse than waiting for a slot.
concurrency:
group: app-store-connect
cancel-in-progress: false
jobs:
publish-ios-app-store:
runs-on: macos-latest

12
.github/workflows/publish-mac-app-store.yml vendored
View file

@ -15,6 +15,18 @@ on:
required: false
workflow_call:
# Serialized against the Mac App Store publish: since iOS moved onto the macOS
# app record for Universal Purchase, both publishes target the SAME App Store
# Connect record, and deliver edits record-level App Information (categories,
# copyright) as well as the per-platform version. A full release tag — one with
# no `+platform` suffix — starts both in parallel, so they must queue instead.
# The group name is deliberately constant, not per-tag: two overlapping releases
# would collide the same way. cancel-in-progress stays false; aborting a publish
# part-way through a review submission is far worse than waiting for a slot.
concurrency:
group: app-store-connect
cancel-in-progress: false
jobs:
publish-mac-app-store:
runs-on: macos-latest

5
CHANGELOG.md
View file

@ -1,5 +1,10 @@
# Changelog
## [3.9.7] - 2026-9-4
iOS Release fix
## [3.9.6] - 2026-9-3
Release fix

4
common/src/commonMain/composeResources/files/changelog.md
View file

@ -1,3 +1,3 @@
## [3.9.6] - 2026-9-3
## [3.9.7] - 2026-9-4
Release fix
iOS Release fix

6
fastlane/Appfile
View file

@ -8,3 +8,9 @@ for_platform :mac do
apple_id("adamwbrown@gmail.com")
team_id("8P3G3HT4J5")
end
for_platform :ios do
app_identifier("com.darkrockstudios.apps.hammer")
apple_id("adamwbrown@gmail.com")
team_id("8P3G3HT4J5")
end

17
fastlane/Fastfile
View file

@ -209,11 +209,18 @@ platform :ios do
lane :ios_submit do |options|
params = {
api_key: appstore_api_key,
app_identifier: "com.darkrockstudios.apps.hammer.ios",
app_identifier: "com.darkrockstudios.apps.hammer",
platform: "ios",
app_version: app_marketing_version,
skip_binary_upload: true,
skip_screenshots: true,
# Screenshots must be uploaded, unlike the :mac lane. iOS moved onto the
# macOS app record for Universal Purchase, and that record's iOS platform
# started with no screenshots at all — nothing carried over from the old
# standalone iOS listing. App Store Connect refuses to submit a version
# with no iPhone screenshots, and the failure lands after the binary is
# already uploaded. Uploading every release also keeps the store in sync
# with fastlane/metadata/ios.
skip_screenshots: false,
metadata_path: "fastlane/metadata/ios",
submit_for_review: true,
automatic_release: true,
@ -233,7 +240,7 @@ platform :ios do
if build_number.nil? || build_number.empty?
latest = latest_testflight_build_number(
api_key: api_key,
app_identifier: "com.darkrockstudios.apps.hammer.ios",
app_identifier: "com.darkrockstudios.apps.hammer",
platform: "ios",
initial_build_number: 0,
)
@ -262,7 +269,7 @@ platform :ios do
teamID: "8P3G3HT4J5",
signingStyle: "manual",
provisioningProfiles: {
"com.darkrockstudios.apps.hammer.ios" => "Hammer AppStore iOS",
"com.darkrockstudios.apps.hammer" => "Hammer AppStore iOS",
},
},
clean: true,
@ -276,7 +283,7 @@ platform :ios do
# cutting off a legitimately slow processing run at a tighter deadline.
upload_to_testflight(
api_key: api_key,
app_identifier: "com.darkrockstudios.apps.hammer.ios",
app_identifier: "com.darkrockstudios.apps.hammer",
app_platform: "ios",
ipa: lane_context[SharedValues::IPA_OUTPUT_PATH],
skip_waiting_for_build_processing: !options[:wait],

4
fastlane/metadata/android/en-US/changelogs/309080000.txt Normal file
View file

@ -0,0 +1,4 @@
iOS Release fix
Full changelog:
https://github.com/Darkrock-Studios/hammer-editor/releases/tag/v3.9.7+ios-app-store

2
fastlane/metadata/ios/en-US/name.txt
View file

@ -1 +1 @@
Hammer-Editor
Hammer Editor

2
fastlane/metadata/ios/en-US/release_notes.txt
View file

@ -1 +1 @@
Release fix
iOS Release fix

2
fastlane/metadata/osx/en-US/release_notes.txt
View file

@ -1 +1 @@
Release fix
iOS Release fix

5
flatpak/studio.darkrock.hammer.metainfo.xml
View file

@ -32,6 +32,11 @@
<content_rating type="oars-1.1" />
<releases>
<release version="3.9.7" date="2026-09-04">
<description>
<p>iOS Release fix</p>
</description>
</release>
<release version="3.9.6" date="2026-09-03">
<description>
<p>Release fix</p>

2
gradle/libs.versions.toml
View file

@ -1,6 +1,6 @@
[versions]
# App Versions
app = "3.9.6"
app = "3.9.7"
data_version = "1.0"
# Kotlin

4
ios/ios.xcodeproj/project.pbxproj
View file

@ -492,7 +492,7 @@
"-framework",
Hammer,
);
PRODUCT_BUNDLE_IDENTIFIER = com.darkrockstudios.apps.hammer.ios;
PRODUCT_BUNDLE_IDENTIFIER = com.darkrockstudios.apps.hammer;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Hammer AppStore iOS";
@ -525,7 +525,7 @@
"-framework",
Hammer,
);
PRODUCT_BUNDLE_IDENTIFIER = com.darkrockstudios.apps.hammer.ios;
PRODUCT_BUNDLE_IDENTIFIER = com.darkrockstudios.apps.hammer;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Hammer AppStore iOS";

2
ios/ios/Info.plist
View file

@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>3.9.6</string>
<string>3.9.7</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>ITSAppUsesNonExemptEncryption</key>

2
snap/snapcraft.yaml
View file

@ -7,7 +7,7 @@ name: hammer-editor
# core26 would give more headroom, but the gnome extension has no 2604 content
# snap yet.
base: core24
version: '3.9.6'
version: '3.9.7'
summary: A simple tool for building stories
description: |
Hammer is a multi-platform story editor application. It's designed for