From 6b0a08a18929404f9dad5427e39afbf0325d9e67 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Sun, 10 Sep 2023 01:07:53 +0200 Subject: [PATCH] Attempt release Fix sed syntax on Mac. --- .beta-build | 2 +- CHANGELOG.md | 2 +- Gemfile.lock | 24 +++++++++---------- Passepartout.xcodeproj/project.pbxproj | 12 +++++----- Passepartout/App/Info.plist | 2 +- .../ios/metadata/de-DE/release_notes.txt | 1 + .../ios/metadata/el/release_notes.txt | 1 + .../ios/metadata/en-US/release_notes.txt | 1 + .../ios/metadata/es-MX/release_notes.txt | 1 + .../ios/metadata/fr-FR/release_notes.txt | 1 + .../ios/metadata/it/release_notes.txt | 1 + .../ios/metadata/nl-NL/release_notes.txt | 1 + .../ios/metadata/pl/release_notes.txt | 1 + .../ios/metadata/pt-BR/release_notes.txt | 1 + .../ios/metadata/ru/release_notes.txt | 1 + .../ios/metadata/sv/release_notes.txt | 1 + .../mac/metadata/de-DE/release_notes.txt | 1 + .../mac/metadata/el/release_notes.txt | 1 + .../mac/metadata/en-US/release_notes.txt | 1 + .../mac/metadata/es-MX/release_notes.txt | 1 + .../mac/metadata/fr-FR/release_notes.txt | 1 + .../mac/metadata/it/release_notes.txt | 1 + .../mac/metadata/nl-NL/release_notes.txt | 1 + .../mac/metadata/pl/release_notes.txt | 1 + .../mac/metadata/pt-BR/release_notes.txt | 1 + .../mac/metadata/ru/release_notes.txt | 1 + .../mac/metadata/sv/release_notes.txt | 1 + Passepartout/Launcher/Info.plist | 2 +- Passepartout/Mac/Info.plist | 2 +- Passepartout/Tunnel/Info.plist | 2 +- .../Sources/PassepartoutProvidersImpl/API | 2 +- scripts/commit-beta.sh | 4 ++-- 32 files changed, 48 insertions(+), 28 deletions(-) diff --git a/.beta-build b/.beta-build index ff10075c..e1a9033c 100644 --- a/.beta-build +++ b/.beta-build @@ -1 +1 @@ -3517 +3531 diff --git a/CHANGELOG.md b/CHANGELOG.md index 2aa815de..7b1a2b31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## 2.2.0 (2023-07-30) +## 2.2.0 (2023-09-10) ### Added diff --git a/Gemfile.lock b/Gemfile.lock index 637ebd33..ab3b729c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,13 +3,13 @@ GEM specs: CFPropertyList (3.0.6) rexml - addressable (2.8.4) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.794.0) - aws-sdk-core (3.180.0) + aws-partitions (1.820.0) + aws-sdk-core (3.181.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) @@ -17,8 +17,8 @@ GEM aws-sdk-kms (1.71.0) aws-sdk-core (~> 3, >= 3.177.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.132.0) - aws-sdk-core (~> 3, >= 3.179.0) + aws-sdk-s3 (1.134.0) + aws-sdk-core (~> 3, >= 3.181.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.6) aws-sigv4 (1.6.0) @@ -36,7 +36,7 @@ GEM unf (>= 0.0.5, < 1.0.0) dotenv (2.8.1) emoji_regex (3.2.3) - excon (0.100.0) + excon (0.102.0) faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -106,7 +106,7 @@ GEM xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.46.0) + google-apis-androidpublisher_v3 (0.49.0) google-apis-core (>= 0.11.0, < 2.a) google-apis-core (0.11.1) addressable (~> 2.5, >= 2.5.1) @@ -137,10 +137,9 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.7.0) + googleauth (1.8.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) @@ -151,9 +150,8 @@ GEM jmespath (1.6.2) json (2.6.3) jwt (2.7.1) - memoist (0.16.2) mini_magick (4.12.0) - mini_mime (1.1.2) + mini_mime (1.1.5) multi_json (1.15.0) multipart-post (2.3.0) nanaimo (0.3.0) @@ -173,7 +171,7 @@ GEM ruby2_keywords (0.0.5) rubyzip (2.3.2) security (0.1.3) - signet (0.17.0) + signet (0.18.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) @@ -217,4 +215,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 2.3.11 + 2.4.19 diff --git a/Passepartout.xcodeproj/project.pbxproj b/Passepartout.xcodeproj/project.pbxproj index 6cfd2fa4..a1bffeb9 100644 --- a/Passepartout.xcodeproj/project.pbxproj +++ b/Passepartout.xcodeproj/project.pbxproj @@ -1787,7 +1787,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "Apple Development"; - CURRENT_PROJECT_VERSION = 3517; + CURRENT_PROJECT_VERSION = 3531; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -1854,7 +1854,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "Apple Development"; - CURRENT_PROJECT_VERSION = 3517; + CURRENT_PROJECT_VERSION = 3531; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; @@ -1888,7 +1888,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Passepartout/App/App.entitlements; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 3517; + CURRENT_PROJECT_VERSION = 3531; DEVELOPMENT_TEAM = DTDYD63ZX9; INFOPLIST_FILE = Passepartout/App/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -1915,7 +1915,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Passepartout/App/App.entitlements; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 3517; + CURRENT_PROJECT_VERSION = 3531; DEVELOPMENT_TEAM = DTDYD63ZX9; INFOPLIST_FILE = Passepartout/App/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -2010,7 +2010,7 @@ CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 3517; + CURRENT_PROJECT_VERSION = 3531; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = Passepartout/Mac/Info.plist; @@ -2044,7 +2044,7 @@ CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 3517; + CURRENT_PROJECT_VERSION = 3531; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = Passepartout/Mac/Info.plist; diff --git a/Passepartout/App/Info.plist b/Passepartout/App/Info.plist index d6b6dbf8..f9917fa3 100644 --- a/Passepartout/App/Info.plist +++ b/Passepartout/App/Info.plist @@ -34,7 +34,7 @@ CFBundleShortVersionString 2.2.0 CFBundleVersion - 3517 + 3531 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/Passepartout/App/fastlane/ios/metadata/de-DE/release_notes.txt b/Passepartout/App/fastlane/ios/metadata/de-DE/release_notes.txt index c9029764..15cc73c9 100644 --- a/Passepartout/App/fastlane/ios/metadata/de-DE/release_notes.txt +++ b/Passepartout/App/fastlane/ios/metadata/de-DE/release_notes.txt @@ -4,6 +4,7 @@ ### Changed +- Make iCloud an opt-in preference. - OpenVPN: Endpoint UX. - Convert trusted networks to on-demand activation. diff --git a/Passepartout/App/fastlane/ios/metadata/el/release_notes.txt b/Passepartout/App/fastlane/ios/metadata/el/release_notes.txt index c9029764..15cc73c9 100644 --- a/Passepartout/App/fastlane/ios/metadata/el/release_notes.txt +++ b/Passepartout/App/fastlane/ios/metadata/el/release_notes.txt @@ -4,6 +4,7 @@ ### Changed +- Make iCloud an opt-in preference. - OpenVPN: Endpoint UX. - Convert trusted networks to on-demand activation. diff --git a/Passepartout/App/fastlane/ios/metadata/en-US/release_notes.txt b/Passepartout/App/fastlane/ios/metadata/en-US/release_notes.txt index c9029764..15cc73c9 100644 --- a/Passepartout/App/fastlane/ios/metadata/en-US/release_notes.txt +++ b/Passepartout/App/fastlane/ios/metadata/en-US/release_notes.txt @@ -4,6 +4,7 @@ ### Changed +- Make iCloud an opt-in preference. - OpenVPN: Endpoint UX. - Convert trusted networks to on-demand activation. diff --git a/Passepartout/App/fastlane/ios/metadata/es-MX/release_notes.txt b/Passepartout/App/fastlane/ios/metadata/es-MX/release_notes.txt index c9029764..15cc73c9 100644 --- a/Passepartout/App/fastlane/ios/metadata/es-MX/release_notes.txt +++ b/Passepartout/App/fastlane/ios/metadata/es-MX/release_notes.txt @@ -4,6 +4,7 @@ ### Changed +- Make iCloud an opt-in preference. - OpenVPN: Endpoint UX. - Convert trusted networks to on-demand activation. diff --git a/Passepartout/App/fastlane/ios/metadata/fr-FR/release_notes.txt b/Passepartout/App/fastlane/ios/metadata/fr-FR/release_notes.txt index c9029764..15cc73c9 100755 --- a/Passepartout/App/fastlane/ios/metadata/fr-FR/release_notes.txt +++ b/Passepartout/App/fastlane/ios/metadata/fr-FR/release_notes.txt @@ -4,6 +4,7 @@ ### Changed +- Make iCloud an opt-in preference. - OpenVPN: Endpoint UX. - Convert trusted networks to on-demand activation. diff --git a/Passepartout/App/fastlane/ios/metadata/it/release_notes.txt b/Passepartout/App/fastlane/ios/metadata/it/release_notes.txt index c9029764..15cc73c9 100644 --- a/Passepartout/App/fastlane/ios/metadata/it/release_notes.txt +++ b/Passepartout/App/fastlane/ios/metadata/it/release_notes.txt @@ -4,6 +4,7 @@ ### Changed +- Make iCloud an opt-in preference. - OpenVPN: Endpoint UX. - Convert trusted networks to on-demand activation. diff --git a/Passepartout/App/fastlane/ios/metadata/nl-NL/release_notes.txt b/Passepartout/App/fastlane/ios/metadata/nl-NL/release_notes.txt index c9029764..15cc73c9 100644 --- a/Passepartout/App/fastlane/ios/metadata/nl-NL/release_notes.txt +++ b/Passepartout/App/fastlane/ios/metadata/nl-NL/release_notes.txt @@ -4,6 +4,7 @@ ### Changed +- Make iCloud an opt-in preference. - OpenVPN: Endpoint UX. - Convert trusted networks to on-demand activation. diff --git a/Passepartout/App/fastlane/ios/metadata/pl/release_notes.txt b/Passepartout/App/fastlane/ios/metadata/pl/release_notes.txt index c9029764..15cc73c9 100644 --- a/Passepartout/App/fastlane/ios/metadata/pl/release_notes.txt +++ b/Passepartout/App/fastlane/ios/metadata/pl/release_notes.txt @@ -4,6 +4,7 @@ ### Changed +- Make iCloud an opt-in preference. - OpenVPN: Endpoint UX. - Convert trusted networks to on-demand activation. diff --git a/Passepartout/App/fastlane/ios/metadata/pt-BR/release_notes.txt b/Passepartout/App/fastlane/ios/metadata/pt-BR/release_notes.txt index c9029764..15cc73c9 100644 --- a/Passepartout/App/fastlane/ios/metadata/pt-BR/release_notes.txt +++ b/Passepartout/App/fastlane/ios/metadata/pt-BR/release_notes.txt @@ -4,6 +4,7 @@ ### Changed +- Make iCloud an opt-in preference. - OpenVPN: Endpoint UX. - Convert trusted networks to on-demand activation. diff --git a/Passepartout/App/fastlane/ios/metadata/ru/release_notes.txt b/Passepartout/App/fastlane/ios/metadata/ru/release_notes.txt index c9029764..15cc73c9 100644 --- a/Passepartout/App/fastlane/ios/metadata/ru/release_notes.txt +++ b/Passepartout/App/fastlane/ios/metadata/ru/release_notes.txt @@ -4,6 +4,7 @@ ### Changed +- Make iCloud an opt-in preference. - OpenVPN: Endpoint UX. - Convert trusted networks to on-demand activation. diff --git a/Passepartout/App/fastlane/ios/metadata/sv/release_notes.txt b/Passepartout/App/fastlane/ios/metadata/sv/release_notes.txt index c9029764..15cc73c9 100644 --- a/Passepartout/App/fastlane/ios/metadata/sv/release_notes.txt +++ b/Passepartout/App/fastlane/ios/metadata/sv/release_notes.txt @@ -4,6 +4,7 @@ ### Changed +- Make iCloud an opt-in preference. - OpenVPN: Endpoint UX. - Convert trusted networks to on-demand activation. diff --git a/Passepartout/App/fastlane/mac/metadata/de-DE/release_notes.txt b/Passepartout/App/fastlane/mac/metadata/de-DE/release_notes.txt index c9029764..15cc73c9 100644 --- a/Passepartout/App/fastlane/mac/metadata/de-DE/release_notes.txt +++ b/Passepartout/App/fastlane/mac/metadata/de-DE/release_notes.txt @@ -4,6 +4,7 @@ ### Changed +- Make iCloud an opt-in preference. - OpenVPN: Endpoint UX. - Convert trusted networks to on-demand activation. diff --git a/Passepartout/App/fastlane/mac/metadata/el/release_notes.txt b/Passepartout/App/fastlane/mac/metadata/el/release_notes.txt index c9029764..15cc73c9 100644 --- a/Passepartout/App/fastlane/mac/metadata/el/release_notes.txt +++ b/Passepartout/App/fastlane/mac/metadata/el/release_notes.txt @@ -4,6 +4,7 @@ ### Changed +- Make iCloud an opt-in preference. - OpenVPN: Endpoint UX. - Convert trusted networks to on-demand activation. diff --git a/Passepartout/App/fastlane/mac/metadata/en-US/release_notes.txt b/Passepartout/App/fastlane/mac/metadata/en-US/release_notes.txt index c9029764..15cc73c9 100644 --- a/Passepartout/App/fastlane/mac/metadata/en-US/release_notes.txt +++ b/Passepartout/App/fastlane/mac/metadata/en-US/release_notes.txt @@ -4,6 +4,7 @@ ### Changed +- Make iCloud an opt-in preference. - OpenVPN: Endpoint UX. - Convert trusted networks to on-demand activation. diff --git a/Passepartout/App/fastlane/mac/metadata/es-MX/release_notes.txt b/Passepartout/App/fastlane/mac/metadata/es-MX/release_notes.txt index c9029764..15cc73c9 100644 --- a/Passepartout/App/fastlane/mac/metadata/es-MX/release_notes.txt +++ b/Passepartout/App/fastlane/mac/metadata/es-MX/release_notes.txt @@ -4,6 +4,7 @@ ### Changed +- Make iCloud an opt-in preference. - OpenVPN: Endpoint UX. - Convert trusted networks to on-demand activation. diff --git a/Passepartout/App/fastlane/mac/metadata/fr-FR/release_notes.txt b/Passepartout/App/fastlane/mac/metadata/fr-FR/release_notes.txt index c9029764..15cc73c9 100644 --- a/Passepartout/App/fastlane/mac/metadata/fr-FR/release_notes.txt +++ b/Passepartout/App/fastlane/mac/metadata/fr-FR/release_notes.txt @@ -4,6 +4,7 @@ ### Changed +- Make iCloud an opt-in preference. - OpenVPN: Endpoint UX. - Convert trusted networks to on-demand activation. diff --git a/Passepartout/App/fastlane/mac/metadata/it/release_notes.txt b/Passepartout/App/fastlane/mac/metadata/it/release_notes.txt index c9029764..15cc73c9 100644 --- a/Passepartout/App/fastlane/mac/metadata/it/release_notes.txt +++ b/Passepartout/App/fastlane/mac/metadata/it/release_notes.txt @@ -4,6 +4,7 @@ ### Changed +- Make iCloud an opt-in preference. - OpenVPN: Endpoint UX. - Convert trusted networks to on-demand activation. diff --git a/Passepartout/App/fastlane/mac/metadata/nl-NL/release_notes.txt b/Passepartout/App/fastlane/mac/metadata/nl-NL/release_notes.txt index c9029764..15cc73c9 100644 --- a/Passepartout/App/fastlane/mac/metadata/nl-NL/release_notes.txt +++ b/Passepartout/App/fastlane/mac/metadata/nl-NL/release_notes.txt @@ -4,6 +4,7 @@ ### Changed +- Make iCloud an opt-in preference. - OpenVPN: Endpoint UX. - Convert trusted networks to on-demand activation. diff --git a/Passepartout/App/fastlane/mac/metadata/pl/release_notes.txt b/Passepartout/App/fastlane/mac/metadata/pl/release_notes.txt index c9029764..15cc73c9 100644 --- a/Passepartout/App/fastlane/mac/metadata/pl/release_notes.txt +++ b/Passepartout/App/fastlane/mac/metadata/pl/release_notes.txt @@ -4,6 +4,7 @@ ### Changed +- Make iCloud an opt-in preference. - OpenVPN: Endpoint UX. - Convert trusted networks to on-demand activation. diff --git a/Passepartout/App/fastlane/mac/metadata/pt-BR/release_notes.txt b/Passepartout/App/fastlane/mac/metadata/pt-BR/release_notes.txt index c9029764..15cc73c9 100644 --- a/Passepartout/App/fastlane/mac/metadata/pt-BR/release_notes.txt +++ b/Passepartout/App/fastlane/mac/metadata/pt-BR/release_notes.txt @@ -4,6 +4,7 @@ ### Changed +- Make iCloud an opt-in preference. - OpenVPN: Endpoint UX. - Convert trusted networks to on-demand activation. diff --git a/Passepartout/App/fastlane/mac/metadata/ru/release_notes.txt b/Passepartout/App/fastlane/mac/metadata/ru/release_notes.txt index c9029764..15cc73c9 100644 --- a/Passepartout/App/fastlane/mac/metadata/ru/release_notes.txt +++ b/Passepartout/App/fastlane/mac/metadata/ru/release_notes.txt @@ -4,6 +4,7 @@ ### Changed +- Make iCloud an opt-in preference. - OpenVPN: Endpoint UX. - Convert trusted networks to on-demand activation. diff --git a/Passepartout/App/fastlane/mac/metadata/sv/release_notes.txt b/Passepartout/App/fastlane/mac/metadata/sv/release_notes.txt index c9029764..15cc73c9 100644 --- a/Passepartout/App/fastlane/mac/metadata/sv/release_notes.txt +++ b/Passepartout/App/fastlane/mac/metadata/sv/release_notes.txt @@ -4,6 +4,7 @@ ### Changed +- Make iCloud an opt-in preference. - OpenVPN: Endpoint UX. - Convert trusted networks to on-demand activation. diff --git a/Passepartout/Launcher/Info.plist b/Passepartout/Launcher/Info.plist index da696589..cd5cd04b 100644 --- a/Passepartout/Launcher/Info.plist +++ b/Passepartout/Launcher/Info.plist @@ -5,7 +5,7 @@ CFBundleShortVersionString 2.2.0 CFBundleVersion - 3517 + 3531 LSBackgroundOnly CFBundleIdentifier diff --git a/Passepartout/Mac/Info.plist b/Passepartout/Mac/Info.plist index 487817bf..f064f1f5 100644 --- a/Passepartout/Mac/Info.plist +++ b/Passepartout/Mac/Info.plist @@ -7,7 +7,7 @@ CFBundleShortVersionString 2.2.0 CFBundleVersion - 3517 + 3531 NSPrincipalClass $(PRODUCT_MODULE_NAME).PassepartoutMac com.algoritmico.Passepartout.config diff --git a/Passepartout/Tunnel/Info.plist b/Passepartout/Tunnel/Info.plist index 7274d228..8bb7b93d 100644 --- a/Passepartout/Tunnel/Info.plist +++ b/Passepartout/Tunnel/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 2.2.0 CFBundleVersion - 3517 + 3531 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSExtension diff --git a/PassepartoutLibrary/Sources/PassepartoutProvidersImpl/API b/PassepartoutLibrary/Sources/PassepartoutProvidersImpl/API index 755e9bb2..06e5809c 160000 --- a/PassepartoutLibrary/Sources/PassepartoutProvidersImpl/API +++ b/PassepartoutLibrary/Sources/PassepartoutProvidersImpl/API @@ -1 +1 @@ -Subproject commit 755e9bb2ab52acf025a8c5238d3910ae6f32bba7 +Subproject commit 06e5809c9ea81840a49dcd8080a91463609aafa1 diff --git a/scripts/commit-beta.sh b/scripts/commit-beta.sh index 760e1b20..e42eff6f 100755 --- a/scripts/commit-beta.sh +++ b/scripts/commit-beta.sh @@ -41,8 +41,8 @@ DATE=`date "+%Y-%m-%d"` CHANGELOG_GLOB="CHANGELOG.md" # either set new or replace existing -sed -i'' -E "s/^.*$VERSION.*$/## $VERSION ($DATE)/" $CHANGELOG_GLOB -sed -i'' -E "s/^.*Unreleased.*$/## $VERSION ($DATE)/" $CHANGELOG_GLOB +sed -i '' -E "s/^.*$VERSION.*$/## $VERSION ($DATE)/" $CHANGELOG_GLOB +sed -i '' -E "s/^.*Unreleased.*$/## $VERSION ($DATE)/" $CHANGELOG_GLOB # add release notes git add CHANGELOG.md