From 51330c3fe43c373be3df09d269a62a1abe639108 Mon Sep 17 00:00:00 2001
From: Mingshen Sun <bob@mssun.me>
Date: Thu, 16 Mar 2023 20:45:44 -0700
Subject: [PATCH] Upgrade gopenpgp to v2.6.0

---
 scripts/gopenpgp_build.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/scripts/gopenpgp_build.sh b/scripts/gopenpgp_build.sh
index 6e53119..1446a70 100755
--- a/scripts/gopenpgp_build.sh
+++ b/scripts/gopenpgp_build.sh
@@ -2,7 +2,7 @@
 
 set -euox pipefail
 
-GOPENPGP_VERSION="passforios"
+GOPENPGP_VERSION="v2.6.0-passforios"
 
 export GOPATH="$(pwd)/go"
 export PATH="$PATH:$GOPATH/bin"
@@ -14,20 +14,23 @@ GOPENPGP_PATH="$CHECKOUT_PATH/gopenpgp"
 mkdir -p "$OUTPUT_PATH"
 mkdir -p "$CHECKOUT_PATH"
 
-go install golang.org/x/mobile/cmd/gomobile@latest
-gomobile init
-
 git clone --depth 1 --branch "$GOPENPGP_VERSION" https://github.com/mssun/gopenpgp.git "$GOPENPGP_PATH"
 
 pushd "$GOPENPGP_PATH"
 mkdir -p dist
+go get golang.org/x/mobile/cmd/gomobile@latest
+go get golang.org/x/mobile/cmd/gobind@latest
+go build golang.org/x/mobile/cmd/gomobile
+go build golang.org/x/mobile/cmd/gobind
 go mod download github.com/ProtonMail/go-crypto
-gomobile bind -tags mobile -target ios -iosversion 12.0 -v -x -ldflags="-s -w" -o dist/Gopenpgp.xcframework \
+gomobile init
+gomobile bind -tags mobile -target ios -iosversion 13.0 -v -x -ldflags="-s -w" -o dist/Gopenpgp.xcframework \
   github.com/ProtonMail/gopenpgp/v2/crypto \
   github.com/ProtonMail/gopenpgp/v2/armor \
   github.com/ProtonMail/gopenpgp/v2/constants \
   github.com/ProtonMail/gopenpgp/v2/models \
-  github.com/ProtonMail/gopenpgp/v2/subtle github.com/ProtonMail/gopenpgp/v2/helper
+  github.com/ProtonMail/gopenpgp/v2/subtle \
+  github.com/ProtonMail/gopenpgp/v2/helper
 popd
 
 cp -r "$GOPENPGP_PATH/dist/Gopenpgp.xcframework" "$OUTPUT_PATH"