Unify metadata

- Fix fastlane env variables

- Use single CHANGELOG.md in project root

- Retain old 1.x changelogs

.env.ios

@@ -1,4 +1,5 @@
-APP_ROOT="Passepartout/App/iOS"
+INFO_PLIST_ROOT="Passepartout/App"
+FASTLANE_ROOT="Passepartout/App/iOS"
 MATCH_PLATFORM="ios"
 GYM_SCHEME="Passepartout"
 SCAN_DEVICE="iPhone 12"

.env.mac

@@ -1,4 +1,5 @@
-APP_ROOT="Passepartout/App/macOS"
+INFO_PLIST_ROOT="Passepartout/App"
+FASTLANE_ROOT="Passepartout/App/macOS"
 MATCH_PLATFORM="catalyst"
 MATCH_ADDITIONAL_CERT_TYPES="mac_installer_distribution"
 GYM_SCHEME="Passepartout"

CHANGELOG.md

@@ -0,0 +1,21 @@
+# Changelog
+
+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).
+
+## Unreleased
+
+### Added
+
+- WireGuard support. [#201](https://github.com/passepartoutvpn/passepartout-apple/issues/201)
+- iCloud support. [#137](https://github.com/passepartoutvpn/passepartout-apple/issues/137)
+
+### Changed
+
+- App completely rewritten in SwiftUI.
+
+### Fixed
+
+- Files occasionally not selectable in browser. [#215](https://github.com/passepartoutvpn/passepartout-apple/issues/215)

Passepartout/App/Constants/Constants+Extensions.swift

@@ -168,13 +168,7 @@ extension Constants {
     enum URLs {
         static let readme = Repos.apple.appendingPathComponent("blob/master/README.md")
         
-        enum iOS {
+        static let changelog = Repos.apple.appendingPathComponent("blob/master/CHANGELOG.md")
-            static let changelog = Repos.apple.appendingPathComponent("blob/master/Passepartout/App/iOS/CHANGELOG.md")
-        }
-
-        enum macOS {
-            static let changelog = Repos.apple.appendingPathComponent("blob/master/Passepartout/App/macOS/CHANGELOG.md")
-        }
         
         static let filetypes: [UTType] = [.item]
 

Passepartout/App/iOS/CHANGELOG.1.md

@@ -5,21 +5,6 @@ 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).
 
-## Unreleased
-
-### Added
-
-- WireGuard support. [#201](https://github.com/passepartoutvpn/passepartout-apple/issues/201)
-- iCloud support. [#137](https://github.com/passepartoutvpn/passepartout-apple/issues/137)
-
-### Changed
-
-- App completely rewritten in SwiftUI.
-
-### Fixed
-
-- Files occasionally not selectable in browser. [#215](https://github.com/passepartoutvpn/passepartout-apple/issues/215)
-
 ## 1.18.0 (2022-02-15)
 
 ### Added

Passepartout/App/macOS/CHANGELOG.1.md

@@ -5,17 +5,6 @@ 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).
 
-## Unreleased
-
-### Added
-
-- WireGuard support. [#201](https://github.com/passepartoutvpn/passepartout-apple/issues/201)
-- iCloud support. [#137](https://github.com/passepartoutvpn/passepartout-apple/issues/137)
-
-### Changed
-
-- App completely rewritten in SwiftUI.
-
 ## 1.18.0 (2022-02-15)
 
 ### Added

scripts/after-release.sh

@@ -6,7 +6,7 @@ if [[ -z $VERSION ]]; then
     exit 1
 fi
 
-CHANGELOG_GLOB="Passepartout/App/*/CHANGELOG.md"
+CHANGELOG_GLOB="CHANGELOG.md"
 
 ci/set-version.sh $VERSION
 sed -i '' -E "s/(^and this project adheres.*$)/\1\n\n## Unreleased/" $CHANGELOG_GLOB

scripts/commit-beta.sh

@@ -29,7 +29,7 @@ git add Passepartout.xcodeproj
 git add *.plist
 
 # add release notes
-git add Passepartout/App/*/CHANGELOG.md
+git add CHANGELOG.md
 git add Passepartout/App/*/fastlane/metadata/*/release_notes.txt
 
 git commit -m "Attempt beta release"