From 8e1b931d3c8c2cde7071f649287b8c713045f2a4 Mon Sep 17 00:00:00 2001 From: Adam Fisk Date: Fri, 13 Dec 2024 08:52:08 -0700 Subject: [PATCH] downgrade go to fix gomobile bug, fix README --- README.md | 2 +- go.mod | 10 ++++------ go.sum | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 93e4a95f9..9b372eaee 100644 --- a/README.md +++ b/README.md @@ -78,8 +78,8 @@ All these dependencies must be in your PATH. Some of this is Android specific, s ### 🤖 Running the project on Android -* `make android` (you need to generated liblantern-all.aar containing the Go backend code in order for the project to compile.) * `flutter pub get` +* `make android` (you need to generated liblantern-all.aar containing the Go backend code in order for the project to compile.) * `flutter run --flavor prod` ### 🍏 Running the project on iOS diff --git a/go.mod b/go.mod index a29220215..30fbd7415 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/getlantern/lantern-client -go 1.22.6 - -toolchain go1.22.10 +go 1.22.4 // replace github.com/getlantern/flashlight/v7 => ../flashlight @@ -39,8 +37,7 @@ require ( github.com/getlantern/eventual v1.0.0 github.com/getlantern/eventual/v2 v2.0.2 github.com/getlantern/filepersist v0.0.0-20210901195658-ed29a1cb0b7c - github.com/getlantern/flashlight/v7 v7.6.160 - github.com/getlantern/fronted v0.0.0-20241212194832-a55b6db2616e + github.com/getlantern/flashlight/v7 v7.6.163 github.com/getlantern/golog v0.0.0-20230503153817-8e72de7e0a65 github.com/getlantern/hidden v0.0.0-20220104173330-f221c5a24770 github.com/getlantern/i18n v0.0.0-20181205222232-2afc4f49bb1c @@ -85,6 +82,7 @@ require ( github.com/alitto/pond/v2 v2.1.5 // indirect github.com/cloudflare/circl v1.3.7 // indirect github.com/coder/websocket v1.8.12 // indirect + github.com/getlantern/fronted v0.0.0-20241212194832-a55b6db2616e // indirect github.com/golang/protobuf v1.5.4 // indirect ) @@ -287,7 +285,7 @@ require ( github.com/prometheus/common v0.55.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/quic-go/quic-go v0.48.0 // indirect - github.com/refraction-networking/utls v1.6.7 + github.com/refraction-networking/utls v1.6.7 // indirect github.com/refraction-networking/water v0.7.0-alpha // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/rogpeppe/go-internal v1.12.0 // indirect diff --git a/go.sum b/go.sum index 8e0f51b8e..62b4d3062 100644 --- a/go.sum +++ b/go.sum @@ -295,8 +295,8 @@ github.com/getlantern/fdcount v0.0.0-20210503151800-5decd65b3731/go.mod h1:XZwE+ github.com/getlantern/filepersist v0.0.0-20160317154340-c5f0cd24e799/go.mod h1:8DGAx0LNUfXNnEH+fXI0s3OCBA/351kZCiz/8YSK3i8= github.com/getlantern/filepersist v0.0.0-20210901195658-ed29a1cb0b7c h1:mcz27xtAkb1OuOLBct/uFfL1p3XxAIcFct82GbT+UZM= github.com/getlantern/filepersist v0.0.0-20210901195658-ed29a1cb0b7c/go.mod h1:8DGAx0LNUfXNnEH+fXI0s3OCBA/351kZCiz/8YSK3i8= -github.com/getlantern/flashlight/v7 v7.6.160 h1:7mj6XpwCRzenV7KE0xwz1NdvVMmx9n4ylHTGOwE9/rI= -github.com/getlantern/flashlight/v7 v7.6.160/go.mod h1:CxdSP/qxaiapDHOqyIbhquQu6jp18VL3Lnwj5ynxMC0= +github.com/getlantern/flashlight/v7 v7.6.163 h1:zt5nqH190tGCfrPg8m/SdYhjGuC0/EIqQx1EdL2xePU= +github.com/getlantern/flashlight/v7 v7.6.163/go.mod h1:+MgkTf2ulz2pYSTIDKLJjclERW4cv3cAtrA4ynSBjsM= github.com/getlantern/framed v0.0.0-20190601192238-ceb6431eeede h1:yrU6Px3ZkvCsDLPryPGi6FN+2iqFPq+JeCb7EFoDBhw= github.com/getlantern/framed v0.0.0-20190601192238-ceb6431eeede/go.mod h1:nhnoiS6DE6zfe+BaCMU4YI01UpsuiXnDqM5S8jxHuuI= github.com/getlantern/fronted v0.0.0-20241212194832-a55b6db2616e h1:qk62Xhg+ha1sW6FhOmGPGbd3xnCC5n9Mr87vDToE0cM=