From d43327251a086c0caaa6f756ce6e595d98214a61 Mon Sep 17 00:00:00 2001 From: Francesco Virga Date: Sat, 21 Jan 2023 14:23:49 -0700 Subject: [PATCH 01/10] feat: setup fastlane --- Gemfile | 3 + Gemfile.lock | 218 ++++++++++++++++++ fastlane/Appfile | 8 + fastlane/Fastfile | 86 +++++++ .../en-CA/apple_tv_privacy_policy.txt | 1 + fastlane/metadata/en-CA/name.txt | 1 + fastlane/metadata/en-CA/privacy_url.txt | 1 + fastlane/metadata/en-CA/subtitle.txt | 1 + 8 files changed, 319 insertions(+) create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 fastlane/Appfile create mode 100644 fastlane/Fastfile create mode 100644 fastlane/metadata/en-CA/apple_tv_privacy_policy.txt create mode 100644 fastlane/metadata/en-CA/name.txt create mode 100644 fastlane/metadata/en-CA/privacy_url.txt create mode 100644 fastlane/metadata/en-CA/subtitle.txt diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..7a118b4 --- /dev/null +++ b/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "fastlane" diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..a4d9b3b --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,218 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.5) + rexml + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) + artifactory (3.0.15) + atomos (0.1.3) + aws-eventstream (1.2.0) + aws-partitions (1.697.0) + aws-sdk-core (3.169.0) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.62.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.118.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.4) + aws-sigv4 (1.5.2) + aws-eventstream (~> 1, >= 1.0.2) + babosa (1.0.4) + claide (1.1.0) + colored (1.2) + colored2 (3.1.2) + commander (4.6.0) + highline (~> 2.0.0) + declarative (0.0.20) + digest-crc (0.6.4) + rake (>= 12.0.0, < 14.0.0) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + dotenv (2.8.1) + emoji_regex (3.2.3) + excon (0.97.2) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) + http-cookie (~> 1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) + faraday (~> 1.0) + fastimage (2.2.6) + fastlane (2.211.0) + CFPropertyList (>= 2.3, < 4.0.0) + addressable (>= 2.8, < 3.0.0) + artifactory (~> 3.0) + aws-sdk-s3 (~> 1.0) + babosa (>= 1.0.3, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) + colored + commander (~> 4.6) + dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (>= 0.1, < 4.0) + excon (>= 0.71.0, < 1.0.0) + faraday (~> 1.0) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 1.0) + fastimage (>= 2.1.0, < 3.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.3) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-storage (~> 1.31) + highline (~> 2.0) + json (< 3.0.0) + jwt (>= 2.1.0, < 3) + mini_magick (>= 4.9.4, < 5.0.0) + multipart-post (~> 2.0.0) + naturally (~> 2.2) + optparse (~> 0.1.1) + plist (>= 3.1.0, < 4.0.0) + rubyzip (>= 2.0.0, < 3.0.0) + security (= 0.1.3) + simctl (~> 1.6.3) + terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-table (>= 1.4.5, < 2.0.0) + tty-screen (>= 0.6.3, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) + xcpretty (~> 0.3.0) + xcpretty-travis-formatter (>= 0.0.3) + gh_inspector (1.1.3) + google-apis-androidpublisher_v3 (0.32.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-core (0.9.5) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.a) + rexml + webrick + google-apis-iamcredentials_v1 (0.16.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-playcustomapp_v1 (0.12.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-storage_v1 (0.19.0) + google-apis-core (>= 0.9.0, < 2.a) + google-cloud-core (1.6.0) + google-cloud-env (~> 1.0) + google-cloud-errors (~> 1.0) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.3.0) + google-cloud-storage (1.44.0) + addressable (~> 2.8) + digest-crc (~> 0.4) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.19.0) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) + mini_mime (~> 1.0) + googleauth (1.3.0) + faraday (>= 0.17.3, < 3.a) + jwt (>= 1.4, < 3.0) + memoist (~> 0.16) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + highline (2.0.3) + http-cookie (1.0.5) + domain_name (~> 0.5) + httpclient (2.8.3) + jmespath (1.6.2) + json (2.6.3) + jwt (2.6.0) + memoist (0.16.2) + mini_magick (4.12.0) + mini_mime (1.1.2) + multi_json (1.15.0) + multipart-post (2.0.0) + nanaimo (0.3.0) + naturally (2.2.1) + optparse (0.1.1) + os (1.1.4) + plist (3.6.0) + public_suffix (5.0.1) + rake (13.0.6) + representable (3.2.0) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rexml (3.2.5) + rouge (2.0.7) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) + security (0.1.3) + signet (0.17.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + simctl (1.6.8) + CFPropertyList + naturally + terminal-notifier (2.0.0) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + trailblazer-option (0.1.2) + tty-cursor (0.7.1) + tty-screen (0.8.1) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + uber (0.1.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.8.2) + unicode-display_width (1.8.0) + webrick (1.7.0) + word_wrap (1.0.0) + xcodeproj (1.22.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.3.0) + rexml (~> 3.2.4) + xcpretty (0.3.0) + rouge (~> 2.0.7) + xcpretty-travis-formatter (1.0.1) + xcpretty (~> 0.2, >= 0.0.7) + +PLATFORMS + x86_64-darwin-22 + +DEPENDENCIES + fastlane + +BUNDLED WITH + 2.4.2 diff --git a/fastlane/Appfile b/fastlane/Appfile new file mode 100644 index 0000000..2edd1fa --- /dev/null +++ b/fastlane/Appfile @@ -0,0 +1,8 @@ +app_identifier("io.airtv.Converter") # The bundle identifier of your app +apple_id("francescod.virga@gmail.com") # Your Apple email address + +itc_team_id("872163") # App Store Connect Team ID TODO verify this +team_id("85N3S3DG8M") # Developer Portal Team ID + +# For more information about the Appfile, see: +# https://docs.fastlane.tools/advanced/#appfile diff --git a/fastlane/Fastfile b/fastlane/Fastfile new file mode 100644 index 0000000..a05aaac --- /dev/null +++ b/fastlane/Fastfile @@ -0,0 +1,86 @@ +# TODOS REMAINING FOR SETUP +# - Download screenshots from App store (need to wait till app is not in a pending state): fastlane deliver download_screenshots +# - Finish setting up auth by creating app_store_connect_api_key.json: https://docs.fastlane.tools/app-store-connect-api/ +# - Download any other metadata we want to track in git +# - Setup match for code signing https://docs.fastlane.tools/codesigning/getting-started/ + + +# This file contains the fastlane.tools configuration +# You can find the documentation at https://docs.fastlane.tools +# +# For a list of all available actions, check out +# +# https://docs.fastlane.tools/actions +# +# For a list of all available plugins, check out +# +# https://docs.fastlane.tools/plugins/available-plugins +# + +# Uncomment the line if you want fastlane to automatically update itself +# update_fastlane + +default_platform(:ios) + +# uncomment for a specific xcode version +# xcode_select "/Applications/Xcode_13.2.1.app" + +platform :ios do + + desc "Push a new release build to the App Store" + lane :release do + match(type: "appstore", readonly: true) + # https://docs.fastlane.tools/actions/build_app/#parameters + build_app( + project: "Converter.xcodeproj", + scheme: "Converter (Production)", + # silent: true, + # suppress_xcode_output: true, + ) + + upload_to_app_store( + skip_metadata: false, + skip_screenshots: true, # Can change this if we want to change screenshots locally, or capture with fastlane + force: true, # Skip HTML report verification + automatic_release: false, + submit_for_review: false, + submission_information: { + add_id_info_uses_idfa: false + }, + precheck_include_in_app_purchases: false, + api_key_path: "app_store_connect_api_key.json" + ) + end + + desc "Push a new beta build to TestFlight" + lane :beta do + match(type: "appstore", readonly: true) + + # https://docs.fastlane.tools/actions/build_app/#parameters + build_app( + project: "Converter.xcodeproj", + scheme: "Converter (Development)", + # silent: true, + # suppress_xcode_output: true, + ) + + upload_to_testflight( + skip_waiting_for_build_processing: true, + api_key_path: "app_store_connect_api_key.json" + ) + end + + # TODO: These should get auto executed as part of beta and release lanes + desc "Bump build number" + lane :bump_build do + # TODO: Double check this is working right + increment_version_number(xcodeproj: "Bounce.xcodeproj") + increment_build_number(xcodeproj: "Bounce.xcodeproj") + end + + desc "Commit version bump to repo" + lane :commit_bump do + commit_version_bump(xcodeproj: "Bounce.xcodeproj", force: true, message: "build: version bump") + end + +end diff --git a/fastlane/metadata/en-CA/apple_tv_privacy_policy.txt b/fastlane/metadata/en-CA/apple_tv_privacy_policy.txt new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/fastlane/metadata/en-CA/apple_tv_privacy_policy.txt @@ -0,0 +1 @@ + diff --git a/fastlane/metadata/en-CA/name.txt b/fastlane/metadata/en-CA/name.txt new file mode 100644 index 0000000..2cd1f4d --- /dev/null +++ b/fastlane/metadata/en-CA/name.txt @@ -0,0 +1 @@ +Video Converter diff --git a/fastlane/metadata/en-CA/privacy_url.txt b/fastlane/metadata/en-CA/privacy_url.txt new file mode 100644 index 0000000..8aff45b --- /dev/null +++ b/fastlane/metadata/en-CA/privacy_url.txt @@ -0,0 +1 @@ +https://converter.airtv.io/privacy.html diff --git a/fastlane/metadata/en-CA/subtitle.txt b/fastlane/metadata/en-CA/subtitle.txt new file mode 100644 index 0000000..eaf915e --- /dev/null +++ b/fastlane/metadata/en-CA/subtitle.txt @@ -0,0 +1 @@ +All-in-One Video Conversion From 6801b03ef02423599e2cebfccd0c73638437b446 Mon Sep 17 00:00:00 2001 From: Francesco Virga Date: Sat, 21 Jan 2023 21:23:09 -0700 Subject: [PATCH 02/10] feat: ignore api key, update docs --- .gitignore | 3 +++ fastlane/Fastfile | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e902ae5..7025388 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,6 @@ dist # XCUserData xcuserdata/ + +# Fastlane +app_store_connect_api_key.json \ No newline at end of file diff --git a/fastlane/Fastfile b/fastlane/Fastfile index a05aaac..fc0f430 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -1,9 +1,7 @@ # TODOS REMAINING FOR SETUP # - Download screenshots from App store (need to wait till app is not in a pending state): fastlane deliver download_screenshots -# - Finish setting up auth by creating app_store_connect_api_key.json: https://docs.fastlane.tools/app-store-connect-api/ # - Download any other metadata we want to track in git -# - Setup match for code signing https://docs.fastlane.tools/codesigning/getting-started/ - +# - Setup match for code signing https://codesigning.guide/ https://docs.fastlane.tools/actions/match/ # This file contains the fastlane.tools configuration # You can find the documentation at https://docs.fastlane.tools From 436e6caa5794facc5ec687341516a831c7177f13 Mon Sep 17 00:00:00 2001 From: Francesco Virga Date: Tue, 24 Jan 2023 17:15:52 -0700 Subject: [PATCH 03/10] featL fix project refs --- fastlane/Fastfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index fc0f430..15be6c1 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -72,13 +72,13 @@ platform :ios do desc "Bump build number" lane :bump_build do # TODO: Double check this is working right - increment_version_number(xcodeproj: "Bounce.xcodeproj") - increment_build_number(xcodeproj: "Bounce.xcodeproj") + increment_version_number(project: "Converter.xcodeproj") + increment_build_number(project: "Converter.xcodeproj") end desc "Commit version bump to repo" lane :commit_bump do - commit_version_bump(xcodeproj: "Bounce.xcodeproj", force: true, message: "build: version bump") + commit_version_bump(project: "Converter.xcodeproj", force: true, message: "build: version bump") end end From 86cac2744a93fa85284312e394b60de53d368af8 Mon Sep 17 00:00:00 2001 From: Francesco Virga Date: Tue, 24 Jan 2023 17:56:38 -0700 Subject: [PATCH 04/10] feat: add matchfile --- fastlane/Fastfile | 12 +++++++++++- fastlane/Matchfile | 13 +++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 fastlane/Matchfile diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 15be6c1..1c4a9df 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -28,6 +28,9 @@ platform :ios do desc "Push a new release build to the App Store" lane :release do match(type: "appstore", readonly: true) + + increment_build_number(project: "Converter.xcodeproj") + # https://docs.fastlane.tools/actions/build_app/#parameters build_app( project: "Converter.xcodeproj", @@ -48,11 +51,17 @@ platform :ios do precheck_include_in_app_purchases: false, api_key_path: "app_store_connect_api_key.json" ) + + increment_version_number(project: "Converter.xcodeproj") + + # TODO: Commit & push version bump end desc "Push a new beta build to TestFlight" lane :beta do match(type: "appstore", readonly: true) + + increment_build_number(project: "Converter.xcodeproj") # https://docs.fastlane.tools/actions/build_app/#parameters build_app( @@ -66,6 +75,8 @@ platform :ios do skip_waiting_for_build_processing: true, api_key_path: "app_store_connect_api_key.json" ) + + # TODO: Commit & push version bump end # TODO: These should get auto executed as part of beta and release lanes @@ -73,7 +84,6 @@ platform :ios do lane :bump_build do # TODO: Double check this is working right increment_version_number(project: "Converter.xcodeproj") - increment_build_number(project: "Converter.xcodeproj") end desc "Commit version bump to repo" diff --git a/fastlane/Matchfile b/fastlane/Matchfile new file mode 100644 index 0000000..0facd23 --- /dev/null +++ b/fastlane/Matchfile @@ -0,0 +1,13 @@ +git_url("https://github.com/inter-ops/converter-code-signing") + +storage_mode("git") + +type("development") # The default type, can be: appstore, adhoc, enterprise or development + +app_identifier("io.airtv.Converter") +# username("user@fastlane.tools") # Your Apple Developer Portal username + +# For all available options run `fastlane match --help` +# Remove the # in the beginning of the line to enable the other options + +# The docs are available on https://docs.fastlane.tools/actions/match From 58b12083df19eb192a8699af17b378aef78e93fc Mon Sep 17 00:00:00 2001 From: Francesco Virga Date: Tue, 24 Jan 2023 18:09:30 -0700 Subject: [PATCH 05/10] feat: setup versions --- Converter.xcodeproj/project.pbxproj | 4 +++ Converter/Info.plist | 8 +++-- fastlane/README.md | 56 +++++++++++++++++++++++++++++ fastlane/report.xml | 13 +++++++ 4 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 fastlane/README.md create mode 100644 fastlane/report.xml diff --git a/Converter.xcodeproj/project.pbxproj b/Converter.xcodeproj/project.pbxproj index 20dcb79..2bf2346 100644 --- a/Converter.xcodeproj/project.pbxproj +++ b/Converter.xcodeproj/project.pbxproj @@ -703,6 +703,7 @@ PRODUCT_NAME = "Video Converter"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; }; name = "Development Debug"; }; @@ -792,6 +793,7 @@ PRODUCT_NAME = "Video Converter"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; }; name = "Development Release"; }; @@ -940,6 +942,7 @@ PRODUCT_NAME = "Video Converter"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; }; name = "Production Debug"; }; @@ -973,6 +976,7 @@ PRODUCT_NAME = "Video Converter"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; }; name = "Production Release"; }; diff --git a/Converter/Info.plist b/Converter/Info.plist index 1b583fd..2de10ce 100644 --- a/Converter/Info.plist +++ b/Converter/Info.plist @@ -2,8 +2,10 @@ - Configuration - $(CONFIGURATION) + CFBundleShortVersionString + 1.1.3 + CFBundleVersion + 10 CFBundleDocumentTypes @@ -27,6 +29,8 @@ + Configuration + $(CONFIGURATION) ITSAppUsesNonExemptEncryption diff --git a/fastlane/README.md b/fastlane/README.md new file mode 100644 index 0000000..26947fb --- /dev/null +++ b/fastlane/README.md @@ -0,0 +1,56 @@ +fastlane documentation +---- + +# Installation + +Make sure you have the latest version of the Xcode command line tools installed: + +```sh +xcode-select --install +``` + +For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane) + +# Available Actions + +## iOS + +### ios release + +```sh +[bundle exec] fastlane ios release +``` + +Push a new release build to the App Store + +### ios beta + +```sh +[bundle exec] fastlane ios beta +``` + +Push a new beta build to TestFlight + +### ios bump_build + +```sh +[bundle exec] fastlane ios bump_build +``` + +Bump build number + +### ios commit_bump + +```sh +[bundle exec] fastlane ios commit_bump +``` + +Commit version bump to repo + +---- + +This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run. + +More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools). + +The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools). diff --git a/fastlane/report.xml b/fastlane/report.xml new file mode 100644 index 0000000..1e3fa84 --- /dev/null +++ b/fastlane/report.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + From 772b3e6bb1399985fdc4280dba5a07ea7cfb9856 Mon Sep 17 00:00:00 2001 From: Francesco Virga Date: Tue, 24 Jan 2023 18:12:25 -0700 Subject: [PATCH 06/10] feat: clear marketing versions --- Converter.xcodeproj/project.pbxproj | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Converter.xcodeproj/project.pbxproj b/Converter.xcodeproj/project.pbxproj index 2bf2346..3532105 100644 --- a/Converter.xcodeproj/project.pbxproj +++ b/Converter.xcodeproj/project.pbxproj @@ -683,7 +683,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 10; + CURRENT_PROJECT_VERSION = 0; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = N23ZS9W2Y5; ENABLE_HARDENED_RUNTIME = YES; @@ -698,7 +698,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.1.3; + MARKETING_VERSION = 1; PRODUCT_BUNDLE_IDENTIFIER = io.airtv.Converter; PRODUCT_NAME = "Video Converter"; SWIFT_EMIT_LOC_STRINGS = YES; @@ -773,7 +773,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 10; + CURRENT_PROJECT_VERSION = 0; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = N23ZS9W2Y5; ENABLE_HARDENED_RUNTIME = YES; @@ -788,7 +788,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.1.3; + MARKETING_VERSION = 1; PRODUCT_BUNDLE_IDENTIFIER = io.airtv.Converter; PRODUCT_NAME = "Video Converter"; SWIFT_EMIT_LOC_STRINGS = YES; @@ -922,7 +922,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 10; + CURRENT_PROJECT_VERSION = 0; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = N23ZS9W2Y5; ENABLE_HARDENED_RUNTIME = YES; @@ -937,7 +937,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.1.3; + MARKETING_VERSION = 1; PRODUCT_BUNDLE_IDENTIFIER = io.airtv.Converter; PRODUCT_NAME = "Video Converter"; SWIFT_EMIT_LOC_STRINGS = YES; @@ -956,7 +956,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 10; + CURRENT_PROJECT_VERSION = 0; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = N23ZS9W2Y5; ENABLE_HARDENED_RUNTIME = YES; @@ -971,7 +971,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.1.3; + MARKETING_VERSION = 1; PRODUCT_BUNDLE_IDENTIFIER = io.airtv.Converter; PRODUCT_NAME = "Video Converter"; SWIFT_EMIT_LOC_STRINGS = YES; From 092638d0a78b6be2493a4931664ab432ea91b75d Mon Sep 17 00:00:00 2001 From: Francesco Virga Date: Tue, 24 Jan 2023 18:16:06 -0700 Subject: [PATCH 07/10] feat: cleanup --- fastlane/Fastfile | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 1c4a9df..a41b50f 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -29,7 +29,7 @@ platform :ios do lane :release do match(type: "appstore", readonly: true) - increment_build_number(project: "Converter.xcodeproj") + increment_build_number(xcodeproj: "Converter.xcodeproj") # https://docs.fastlane.tools/actions/build_app/#parameters build_app( @@ -52,16 +52,18 @@ platform :ios do api_key_path: "app_store_connect_api_key.json" ) - increment_version_number(project: "Converter.xcodeproj") + increment_version_number(xcodeproj: "Converter.xcodeproj") - # TODO: Commit & push version bump + # commit_version_bump(xcodeproj: "Converter.xcodeproj", force: true, message: "build: version bump") + + # TODO: Push end desc "Push a new beta build to TestFlight" lane :beta do match(type: "appstore", readonly: true) - increment_build_number(project: "Converter.xcodeproj") + increment_build_number(xcodeproj: "Converter.xcodeproj") # https://docs.fastlane.tools/actions/build_app/#parameters build_app( @@ -76,19 +78,9 @@ platform :ios do api_key_path: "app_store_connect_api_key.json" ) - # TODO: Commit & push version bump - end - - # TODO: These should get auto executed as part of beta and release lanes - desc "Bump build number" - lane :bump_build do - # TODO: Double check this is working right - increment_version_number(project: "Converter.xcodeproj") - end - - desc "Commit version bump to repo" - lane :commit_bump do - commit_version_bump(project: "Converter.xcodeproj", force: true, message: "build: version bump") + # commit_version_bump(xcodeproj: "Converter.xcodeproj", force: true, message: "build: version bump") + + # TODO: Push end end From 2126a32f04c1674a81cfade76969033862295acc Mon Sep 17 00:00:00 2001 From: Francesco Virga Date: Tue, 24 Jan 2023 18:20:09 -0700 Subject: [PATCH 08/10] fix: fix versions --- Converter.xcodeproj/project.pbxproj | 8 ++++---- Converter/Info.plist | 2 +- fastlane/Fastfile | 1 + fastlane/README.md | 16 ---------------- fastlane/report.xml | 19 ++++++++++++++++++- 5 files changed, 24 insertions(+), 22 deletions(-) diff --git a/Converter.xcodeproj/project.pbxproj b/Converter.xcodeproj/project.pbxproj index 3532105..64ce4b0 100644 --- a/Converter.xcodeproj/project.pbxproj +++ b/Converter.xcodeproj/project.pbxproj @@ -683,7 +683,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 0; + CURRENT_PROJECT_VERSION = 10; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = N23ZS9W2Y5; ENABLE_HARDENED_RUNTIME = YES; @@ -773,7 +773,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 0; + CURRENT_PROJECT_VERSION = 10; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = N23ZS9W2Y5; ENABLE_HARDENED_RUNTIME = YES; @@ -922,7 +922,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 0; + CURRENT_PROJECT_VERSION = 10; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = N23ZS9W2Y5; ENABLE_HARDENED_RUNTIME = YES; @@ -956,7 +956,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 0; + CURRENT_PROJECT_VERSION = 10; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = N23ZS9W2Y5; ENABLE_HARDENED_RUNTIME = YES; diff --git a/Converter/Info.plist b/Converter/Info.plist index 2de10ce..508d902 100644 --- a/Converter/Info.plist +++ b/Converter/Info.plist @@ -3,7 +3,7 @@ CFBundleShortVersionString - 1.1.3 + 1.1.4 CFBundleVersion 10 CFBundleDocumentTypes diff --git a/fastlane/Fastfile b/fastlane/Fastfile index a41b50f..b87635f 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -63,6 +63,7 @@ platform :ios do lane :beta do match(type: "appstore", readonly: true) + # TODO: Fix increment_build_number(xcodeproj: "Converter.xcodeproj") # https://docs.fastlane.tools/actions/build_app/#parameters diff --git a/fastlane/README.md b/fastlane/README.md index 26947fb..054434a 100644 --- a/fastlane/README.md +++ b/fastlane/README.md @@ -31,22 +31,6 @@ Push a new release build to the App Store Push a new beta build to TestFlight -### ios bump_build - -```sh -[bundle exec] fastlane ios bump_build -``` - -Bump build number - -### ios commit_bump - -```sh -[bundle exec] fastlane ios commit_bump -``` - -Commit version bump to repo - ---- This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run. diff --git a/fastlane/report.xml b/fastlane/report.xml index 1e3fa84..12e2886 100644 --- a/fastlane/report.xml +++ b/fastlane/report.xml @@ -5,7 +5,24 @@ - + + + + + + + + + + + + + + + + + + From ad2367c8cd0412098e1a5253785987f44eff0908 Mon Sep 17 00:00:00 2001 From: Francesco Virga Date: Tue, 24 Jan 2023 18:54:00 -0700 Subject: [PATCH 09/10] fix: use justins email --- fastlane/Appfile | 2 +- fastlane/Fastfile | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/fastlane/Appfile b/fastlane/Appfile index 2edd1fa..f29b1eb 100644 --- a/fastlane/Appfile +++ b/fastlane/Appfile @@ -1,5 +1,5 @@ app_identifier("io.airtv.Converter") # The bundle identifier of your app -apple_id("francescod.virga@gmail.com") # Your Apple email address +apple_id("justin@devsec.ca") # Your Apple email address itc_team_id("872163") # App Store Connect Team ID TODO verify this team_id("85N3S3DG8M") # Developer Portal Team ID diff --git a/fastlane/Fastfile b/fastlane/Fastfile index b87635f..a41b50f 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -63,7 +63,6 @@ platform :ios do lane :beta do match(type: "appstore", readonly: true) - # TODO: Fix increment_build_number(xcodeproj: "Converter.xcodeproj") # https://docs.fastlane.tools/actions/build_app/#parameters From 06ff1bc7f7b18e9888da4c019270935f16aa29e5 Mon Sep 17 00:00:00 2001 From: Francesco Virga Date: Tue, 24 Jan 2023 19:05:41 -0700 Subject: [PATCH 10/10] feat: todo --- fastlane/Fastfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index a41b50f..2060d4b 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -54,6 +54,8 @@ platform :ios do increment_version_number(xcodeproj: "Converter.xcodeproj") + # TODO: rm -rf video covnerter app bundle + # commit_version_bump(xcodeproj: "Converter.xcodeproj", force: true, message: "build: version bump") # TODO: Push @@ -78,6 +80,8 @@ platform :ios do api_key_path: "app_store_connect_api_key.json" ) + # TODO: rm -rf video covnerter app bundle + # commit_version_bump(xcodeproj: "Converter.xcodeproj", force: true, message: "build: version bump") # TODO: Push