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

Consume netguard as a dependency #2656

Merged
merged 1 commit into from
Dec 19, 2022
Merged

Conversation

aitorvs
Copy link
Collaborator

@aitorvs aitorvs commented Dec 16, 2022

Task/Issue URL: https://app.asana.com/0/488551667048375/1203208709178851/f

Description

Remove netguard submodule and consume it as a library dependency

Steps to test this PR

  • pull this branch and ensure the vpn-network/vpn-network-impl/src/main/cpp is deleted
  • clean build from this branch
  • verify it builds
  • install app and smoke test AppTP

@aitorvs
Copy link
Collaborator Author

aitorvs commented Dec 16, 2022

Current dependencies on/for this PR:

This comment was auto-generated by Graphite.

@aitorvs aitorvs force-pushed the feature/aitor/atp/netguard_lib branch from 6d857e0 to 281889a Compare December 16, 2022 16:18
build.gradle Outdated
Comment on lines 44 to 46
// maven {
// url = uri("https://maven.pkg.github.com/duckduckgo/netguard")
// }
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will delete this in the final version

@@ -33,6 +33,8 @@ dependencies {

implementation Kotlin.stdlib.jdk7
implementation "com.squareup.logcat:logcat:_"
// implementation "com.duckduckgo.mobile.android:ddg-android-netguard-release:1.0.0"
implementation "com.github.duckduckgo:netguard:jitpack-SNAPSHOT"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is to be changed to version number once duckduckgo/netguard#12 is merged and we create the version tag

Comment on lines -52 to -57
externalNativeBuild {

cmake {
path "CMakeLists.txt"
}
}
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bye bye submodule

@aitorvs aitorvs force-pushed the feature/aitor/atp/netguard_lib branch from 456c3cf to fcb921e Compare December 18, 2022 10:50
Copy link
Collaborator

@nshuba nshuba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Good riddance to the submodule :)

@aitorvs aitorvs merged commit ed02e87 into develop Dec 19, 2022
@aitorvs aitorvs deleted the feature/aitor/atp/netguard_lib branch December 19, 2022 22:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants