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.

Sign up for GitHub

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

Jump to bottom

refactor: move Go backend code from tun2socks to app #496

Merged
merged 7 commits into from
Jan 17, 2024
Merged

refactor: move Go backend code from tun2socks to app #496

merged 7 commits into from
Jan 17, 2024

Conversation

jyyi1
Copy link
Contributor

@jyyi1 jyyi1 commented Jan 12, 2024 •
edited
Loading

I made three main changes in this PR:

  • Relocated Go backend code: I moved all the Go backend code from the separate tun2socks module (tun2socks/intra) into the main app module (app/src/main/go/intra), because a separate tun2socks module wasn't providing any benefits and was making dependency management more complex.
  • Upgraded Gradle binary from 7.0.2 to 7.2: This upgrade might fix a NPE bug that was found in the DEX compiler.
  • Used a fixed GOTOOLCHAIN version: This will avoid a cgo bug that was introduced in go1.22.

@jyyi1 jyyi1 requested a review from fortuna January 12, 2024 23:53
fortuna
fortuna reviewed Jan 16, 2024
View reviewed changes
Android/app/build.gradle Outdated Show resolved Hide resolved
Android/app/build.gradle Outdated Show resolved Hide resolved
Android/gradle.properties Outdated Show resolved Hide resolved
Android/gradle/wrapper/gradle-wrapper.properties Show resolved Hide resolved
Android/app/build.gradle Outdated Show resolved Hide resolved
@jyyi1 jyyi1 requested a review from fortuna January 17, 2024 04:17
fortuna
fortuna approved these changes Jan 17, 2024
View reviewed changes
Android/app/build.gradle Show resolved Hide resolved
@jyyi1 jyyi1 merged commit f8a2737 into master Jan 17, 2024
4 checks passed
@jyyi1 jyyi1 deleted the junyi/upgrade-gradle branch January 17, 2024 21:53
@jyyi1 jyyi1 mentioned this pull request Feb 29, 2024
Closed
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fortuna fortuna fortuna approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jyyi1 @fortuna