diff --git a/.github/workflows/testflight.yaml b/.github/workflows/testflight.yaml index 14db0cc..747a887 100644 --- a/.github/workflows/testflight.yaml +++ b/.github/workflows/testflight.yaml @@ -3,9 +3,13 @@ name: Deploy to Testflight on: workflow_dispatch: inputs: + storeVersionNumber: + description: 'Store Version Number' + required: true + default: "" buildNumber: description: 'Build Number' - required: false + required: true default: "" jobs: @@ -42,7 +46,7 @@ jobs: run: | export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 - bundle exec fastlane beta build_number:${{ github.event.inputs.buildNumber }} + bundle exec fastlane beta store_version_number:${{ github.event.inputs.storeVersionNumber }} build_number:${{ github.event.inputs.buildNumber }} env: APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }} APP_STORE_CONNECT_KEY_CONTENT: ${{ secrets.APP_STORE_CONNECT_KEY_CONTENT }} diff --git a/Bark.xcodeproj/project.pbxproj b/Bark.xcodeproj/project.pbxproj index a4f7d4f..538aa18 100644 --- a/Bark.xcodeproj/project.pbxproj +++ b/Bark.xcodeproj/project.pbxproj @@ -935,7 +935,7 @@ INFOPLIST_FILE = NotificationContentExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 1.1.6; + MARKETING_VERSION = 1.0.0; PRODUCT_BUNDLE_IDENTIFIER = me.fin.bark.NotificationContent; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "match AppStore me.fin.bark.NotificationContent"; @@ -956,7 +956,7 @@ INFOPLIST_FILE = NotificationContentExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 1.1.6; + MARKETING_VERSION = 1.0.0; PRODUCT_BUNDLE_IDENTIFIER = me.fin.bark.NotificationContent; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "match AppStore me.fin.bark.NotificationContent"; @@ -1093,7 +1093,7 @@ INFOPLIST_FILE = Bark/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 1.1.6; + MARKETING_VERSION = 1.0.0; PRODUCT_BUNDLE_IDENTIFIER = me.fin.bark; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "match AppStore me.fin.bark"; @@ -1116,7 +1116,7 @@ INFOPLIST_FILE = Bark/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 1.1.6; + MARKETING_VERSION = 1.0.0; PRODUCT_BUNDLE_IDENTIFIER = me.fin.bark; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "match AppStore me.fin.bark"; @@ -1138,7 +1138,7 @@ INFOPLIST_FILE = NotificationServiceExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 1.1.6; + MARKETING_VERSION = 1.0.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = me.fin.bark.NotificationServiceExtension; @@ -1163,7 +1163,7 @@ INFOPLIST_FILE = NotificationServiceExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 1.1.6; + MARKETING_VERSION = 1.0.0; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = me.fin.bark.NotificationServiceExtension; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/View/SoundCell.swift b/View/SoundCell.swift index b2bdac6..3087cef 100644 --- a/View/SoundCell.swift +++ b/View/SoundCell.swift @@ -60,7 +60,7 @@ class SoundCell: BaseTableViewCell { .bind(to: nameLabel.rx.text) .disposed(by: rx.reuseBag) viewModel.duration - .map { String(format: "%.2f", CMTimeGetSeconds($0) ) } + .map { String(format: "%.2g second(s)", CMTimeGetSeconds($0) ) } .bind(to: durationLabel.rx.text) .disposed(by: rx.reuseBag) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 95064e6..3d5aefa 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -20,6 +20,11 @@ platform :ios do lane :beta do | options | setup_ci + version = options[:store_version_number] + if !version.nil? && !version.empty? + increment_version_number(version_number: version) + end + build = options[:build_number] if !build.nil? && !build.empty? increment_build_number(build_number: build.to_i)