Skip to content

Commit

Permalink
Merge pull request #5 from QuantumPhysique/patch_rive
Browse files Browse the repository at this point in the history
Enforce using lockfile and patch rive_common.
  • Loading branch information
braniii authored Nov 14, 2023
2 parents 794db35 + 2ce2b9a commit f71e84d
Show file tree
Hide file tree
Showing 8 changed files with 79 additions and 4 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/build-flutter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,11 @@ jobs:
run: |
cd app
flutter --disable-telemetry
flutter pub get
flutter pub get --enforce-lockfile
- name: Patch Packages
run: |
cd app
bash patch_pubdev.sh
- name: 🤖📦 Create Android release
run: |
cd app
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/flutter-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ jobs:
run: |
cd app
flutter --disable-telemetry
flutter pub get
flutter pub get --enforce-lockfile
- name: Patch Packages
run: |
cd app
bash patch_pubdev.sh
- name: 🤖📦 Create Android release
run: |
cd app
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]


## [0.4.2] - 2023-11-14
### Other changes:
- Remove build-id from rive to enable reproducible builds


## [0.4.1] - 2023-10-30
### Other changes:
- Upgrade dependencies
Expand Down Expand Up @@ -98,7 +103,8 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
- initial release


[Unreleased]: https://github.com/quantumphysique/trale/compare/v0.4.1...main
[Unreleased]: https://github.com/quantumphysique/trale/compare/v0.4.2...main
[0.4.2]: https://github.com/quantumphysique/trale/compare/v0.4.1...v0.4.2
[0.4.1]: https://github.com/quantumphysique/trale/compare/v0.4.0...v0.4.1
[0.4.0]: https://github.com/quantumphysique/trale/compare/v0.3.1...v0.4.0
[0.3.1]: https://github.com/quantumphysique/trale/compare/v0.3.0...v0.3.1
Expand Down
13 changes: 13 additions & 0 deletions app/patch_pubdev.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# This file is intendet to patch packages from pub.dev
#
# Path rive_common to remove build-id
RIVE_COMMON_VERSION="$(grep -A7 -P '^..rive_common' pubspec.lock | sed -E -n -e 's/^.*version:\ "([0-9.]+)"/\1/p')"

# get path to pub_cache directory
if [[ -v PUB_CACHE ]]; then
PUB_PATH="$PUB_CACHE"
else
PUB_PATH="$HOME/.pub_cache"
fi

patch "${PUB_PATH}/hosted/pub.dev/rive_common-${RIVE_COMMON_VERSION}/premake5_rive_plugin.lua" "rive_common.patch"
2 changes: 1 addition & 1 deletion app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 0.4.1+8
version: 0.4.2+9

environment:
sdk: ">=3.1.0 <4.0.0"
Expand Down
22 changes: 22 additions & 0 deletions app/rive_common.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
--- premake5_rive_plugin.lua 2023-11-08 21:16:37.466026217 +0100
+++ premake5_rive_plugin.lua 2023-11-08 21:36:12.735951780 +0100
@@ -101,7 +101,8 @@
linkoptions {
'-Oz',
'-g0',
- '-flto'
+ '-flto',
+ '--build-id=None'
}
end
filter {'system:macosx', 'options:arch=arm64'}
@@ -452,7 +453,8 @@
linkoptions {
'-Oz',
'-g0',
- '-flto'
+ '-flto',
+ '--build-id=None'
}
end

13 changes: 13 additions & 0 deletions fastlane/metadata/android/de/changelogs/9.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
0.4.2:
- Versuche reproduzierbare Builds zu aktivieren

0.4.1:
- Geupdatete Abhängigkeiten
- Proguardoptimierungen aufgesetzt

0.4.0:
- App Id wurde zu `de.quantumphysique.trale` geändert, updaten ist nicht möglich!
- Aufnahmeprozess zu F-Droid gestartet
- Geupdatete Abhängigkeiten und kleine UI Verbesserungen
- Problem behoben um Links zu öffnen
- Verbesserte Ticks für große Intervalle
13 changes: 13 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/9.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
0.4.2:
- Try to enable reproducible builds

0.4.1:
- Upgrade deps
- Add Proguard optimizations

0.4.0:
- App id changed to `de.quantumphysique.trale`, upgrading is not possible!
- Initialized F-Droid inclusion process
- Upgrade dependencies and minor UI improvements
- Fix missing permission to open links
- Improved ticks for large intervals

0 comments on commit f71e84d

Please sign in to comment.