Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update flashlight and go versions #949

Merged
merged 2 commits into from
Nov 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/browerstack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: 1.19
go-version-file: "go.mod"

- name: Granting private modules access
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: 1.19
go-version-file: "go.mod"
- name: Granting private modules access
run: |
git config --global url."https://${{ secrets.CI_PRIVATE_REPOS_GH_TOKEN }}:[email protected]/".insteadOf "https://github.com/"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ jobs:
- run: flutter --version

- name: Setup Go
uses: actions/setup-go@v3
uses: actions/setup-go@v4
with:
go-version: 1.19
go-version-file: "go.mod"

- name: Granting private modules access
run: |
Expand Down
14 changes: 0 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ TEST ?= *_test
# integration-test:
# @flutter drive --driver test_driver/integration_driver.dart --debug --flavor prod --target `ls integration_test/$(TEST).dart`

GO_VERSION := 1.19

TAG ?= $$VERSION
TAG_HEAD := $(shell git rev-parse HEAD)
INSTALLER_NAME ?= lantern-installer
Expand Down Expand Up @@ -205,12 +203,6 @@ tag: require-version
git commit -m "Updated changelog for $$VERSION" && \
git push

define check-go-version
if [ -z '${IGNORE_GO_VERSION}' ] && go version | grep -q -v $(GO_VERSION); then \
echo "go $(GO_VERSION) is required." && exit 1; \
fi
endef

guard-%:
@ if [ -z '${${*}}' ]; then echo 'Environment variable $* not set' && exit 1; fi

Expand Down Expand Up @@ -272,7 +264,6 @@ release-autoupdate: require-version
release: require-version require-s3cmd require-wget require-lantern-binaries require-release-track release-prod copy-beta-installers-to-mirrors invalidate-getlantern-dot-org upload-aab-to-play

$(ANDROID_LIB):
$(call check-go-version) && \
go env -w 'GOPRIVATE=github.com/getlantern/*' && \
go install golang.org/x/mobile/cmd/gomobile && \
gomobile init && \
Expand Down Expand Up @@ -327,7 +318,6 @@ pubget:
@flutter pub get

$(MOBILE_DEBUG_APK): $(MOBILE_SOURCES) $(GO_SOURCES)
@$(call check-go-version) && \
make do-android-debug && \
cp $(MOBILE_ANDROID_DEBUG) $(MOBILE_DEBUG_APK)

Expand Down Expand Up @@ -471,7 +461,3 @@ clean:
rm -f `which gomobile` && \
rm -f `which gobind`
rm -Rf "$(FLASHLIGHT_FRAMEWORK_PATH)" "$(INTERMEDIATE_FLASHLIGHT_FRAMEWORK_PATH)"




28 changes: 8 additions & 20 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
module github.com/getlantern/android-lantern

go 1.19
go 1.21

// replace github.com/getlantern/flashlight/v7 => ../flashlight
// replace github.com/getlantern/fronted => ../fronted
// replace github.com/getlantern/pathdb => ../pathDb/pathDb

replace github.com/elazarl/goproxy => github.com/getlantern/goproxy v0.0.0-20220805074304-4a43a9ed4ec6

replace github.com/lucas-clemente/quic-go => github.com/getlantern/quic-go v0.31.1-0.20230104154904-d810c964a217

replace github.com/keighl/mandrill => github.com/getlantern/mandrill v0.0.0-20221004112352-e7c04248adcb

// For https://github.com/crawshaw/sqlite/pull/112 and https://github.com/crawshaw/sqlite/pull/103.
Expand All @@ -27,7 +25,7 @@ require (
github.com/getlantern/dnsgrab v0.0.0-20230822102054-7ff232ec3148
github.com/getlantern/errors v1.0.3
github.com/getlantern/eventual/v2 v2.0.2
github.com/getlantern/flashlight/v7 v7.6.19
github.com/getlantern/flashlight/v7 v7.6.22
github.com/getlantern/golog v0.0.0-20230503153817-8e72de7e0a65
github.com/getlantern/idletiming v0.0.0-20231030193830-6767b09f86db
github.com/getlantern/ipproxy v0.0.0-20230511223023-ee52513fd782
Expand All @@ -44,8 +42,6 @@ require (

require (
crawshaw.io/sqlite v0.3.3-0.20220618202545-d1964889ea3c // indirect
filippo.io/edwards25519 v1.0.0 // indirect
git.torproject.org/pluggable-transports/goptlib.git v1.3.0 // indirect
github.com/Jigsaw-Code/outline-ss-server v1.4.0 // indirect
github.com/OperatorFoundation/Replicant-go/Replicant/v3 v3.0.23 // indirect
github.com/OperatorFoundation/Starbridge-go/Starbridge/v3 v3.0.17 // indirect
Expand Down Expand Up @@ -88,7 +84,6 @@ require (
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dchest/siphash v1.2.3 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
github.com/dsoprea/go-exif/v2 v2.0.0-20200604193436-ca8584a0e1c4 // indirect
Expand All @@ -102,7 +97,7 @@ require (
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/gaukas/godicttls v0.0.4 // indirect
github.com/getlantern/borda v0.0.0-20230421223744-4e208135f082 // indirect
github.com/getlantern/broflake v0.0.0-20231016221059-9c3632502cae // indirect
github.com/getlantern/broflake v0.0.0-20231117182649-7d46643a6f87 // indirect
github.com/getlantern/bufconn v0.0.0-20210901195825-fd7c0267b493 // indirect
github.com/getlantern/byteexec v0.0.0-20220903142956-e6ed20032cfd // indirect
github.com/getlantern/cmux v0.0.0-20230301223233-dac79088a4c0 // indirect
Expand All @@ -117,7 +112,6 @@ require (
github.com/getlantern/elevate v0.0.0-20220903142053-479ab992b264 // indirect
github.com/getlantern/ema v0.0.0-20190620044903-5943d28f40e4 // indirect
github.com/getlantern/enhttp v0.0.0-20210901195634-6f89d45ee033 // indirect
github.com/getlantern/enproxy v0.0.0-20180913191734-002212d417a4 // indirect
github.com/getlantern/event v0.0.0-20210901195647-a7e3145142e6 // indirect
github.com/getlantern/eventual v1.0.0 // indirect
github.com/getlantern/fdcount v0.0.0-20210503151800-5decd65b3731 // indirect
Expand All @@ -134,7 +128,7 @@ require (
github.com/getlantern/hellosplitter v0.1.1 // indirect
github.com/getlantern/hex v0.0.0-20220104173244-ad7e4b9194dc // indirect
github.com/getlantern/hidden v0.0.0-20220104173330-f221c5a24770 // indirect
github.com/getlantern/http-proxy-lantern/v2 v2.10.0 // indirect
github.com/getlantern/http-proxy-lantern/v2 v2.10.1-0.20231118011407-9f16767b92eb // indirect
github.com/getlantern/httpseverywhere v0.0.0-20201210200013-19ae11fc4eca // indirect
github.com/getlantern/i18n v0.0.0-20181205222232-2afc4f49bb1c // indirect
github.com/getlantern/iptool v0.0.0-20230112135223-c00e863b2696 // indirect
Expand All @@ -156,9 +150,8 @@ require (
github.com/getlantern/packetforward v0.0.0-20201001150407-c68a447b0360 // indirect
github.com/getlantern/preconn v1.0.0 // indirect
github.com/getlantern/proxy/v3 v3.0.0-20231031142453-252ab678e6b7 // indirect
github.com/getlantern/proxybench v0.0.0-20220404140110-f49055cb86de // indirect
github.com/getlantern/psmux v1.5.15 // indirect
github.com/getlantern/quicwrapper v0.0.0-20230523101504-1ec066b7f869 // indirect
github.com/getlantern/quicwrapper v0.0.0-20231117185542-d951689c4970 // indirect
github.com/getlantern/ratelimit v0.0.0-20220926192648-933ab81a6fc7 // indirect
github.com/getlantern/reconn v0.0.0-20161128113912-7053d017511c // indirect
github.com/getlantern/rot13 v0.0.0-20220822172233-370767b2f782 // indirect
Expand All @@ -174,7 +167,6 @@ require (
github.com/getlantern/tlsutil v0.5.3 // indirect
github.com/getlantern/uuid v1.2.0 // indirect
github.com/getlantern/waitforserver v1.0.1 // indirect
github.com/getlantern/withtimeout v0.0.0-20160829163843-511f017cd913 // indirect
github.com/getlantern/yaml v0.0.0-20190801163808-0c9bb1ebf426 // indirect
github.com/getsentry/sentry-go v0.20.0 // indirect
github.com/go-errors/errors v1.4.2 // indirect
Expand All @@ -186,7 +178,6 @@ require (
github.com/golang/gddo v0.0.0-20190419222130-af0f2af80721 // indirect
github.com/golang/geo v0.0.0-20200319012246-673a6f80352d // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/btree v1.1.2 // indirect
Expand Down Expand Up @@ -221,7 +212,6 @@ require (
github.com/oschwald/geoip2-golang v1.8.0 // indirect
github.com/oschwald/maxminddb-golang v1.10.0 // indirect
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
github.com/pborman/uuid v1.2.1 // indirect
github.com/pierrec/lz4/v4 v4.1.12 // indirect
github.com/pion/datachannel v1.5.5 // indirect
github.com/pion/dtls/v2 v2.2.7 // indirect
Expand All @@ -247,9 +237,8 @@ require (
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/quic-go/qtls-go1-19 v0.3.2 // indirect
github.com/quic-go/qtls-go1-20 v0.2.2 // indirect
github.com/quic-go/quic-go v0.34.0 // indirect
github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
github.com/quic-go/quic-go v0.40.0 // indirect
github.com/refraction-networking/utls v1.3.3 // indirect
github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 // indirect
github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 // indirect
Expand All @@ -269,8 +258,6 @@ require (
github.com/ulikunitz/xz v0.5.10 // indirect
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
github.com/xtaci/smux v1.5.24 // indirect
gitlab.com/yawning/edwards25519-extra.git v0.0.0-20211229043746-2f91fcc9fbdb // indirect
gitlab.com/yawning/obfs4.git v0.0.0-20220904064028-336a71d6e4cf // indirect
go.etcd.io/bbolt v1.3.6 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect
go.opentelemetry.io/otel v1.19.0 // indirect
Expand All @@ -284,6 +271,7 @@ require (
go.opentelemetry.io/otel/trace v1.19.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/mock v0.3.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.21.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
Expand Down
Loading
Loading