Skip to content

Commit

Permalink
Consume netguard as a dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
aitorvs committed Dec 16, 2022
1 parent 67d8555 commit 6d857e0
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 10 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,3 @@
[submodule "submodules/privacy-grade"]
path = submodules/privacy-grade
url = https://github.com/duckduckgo/privacy-grade
[submodule "vpn-network/vpn-network-impl/src/main/cpp/netguard"]
path = vpn-network/vpn-network-impl/src/main/cpp/netguard
url = https://github.com/duckduckgo/netguard.git
12 changes: 12 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {

ext {
Expand Down Expand Up @@ -36,9 +37,20 @@ plugins {
}

allprojects {

def githubProperties = new Properties()
githubProperties.load(new FileInputStream(rootProject.file("local.properties")))

repositories {
google()
mavenCentral()
maven {
url = uri("https://maven.pkg.github.com/duckduckgo/netguard")
credentials {
username = githubProperties['gpr.usr'] ?: System.getenv("GPR_USER")
password = githubProperties['gpr.key'] ?: System.getenv("GPR_API_KEY")
}
}
}
configurations.all {
resolutionStrategy.force 'org.objenesis:objenesis:2.6'
Expand Down
7 changes: 1 addition & 6 deletions vpn-network/vpn-network-impl/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ dependencies {

implementation Kotlin.stdlib.jdk7
implementation "com.squareup.logcat:logcat:_"
implementation "com.duckduckgo.mobile.android:ddg-android-netguard-release:1.0.0"

implementation Google.dagger
implementation AndroidX.core.ktx
Expand All @@ -49,12 +50,6 @@ dependencies {
}

android {
externalNativeBuild {

cmake {
path "CMakeLists.txt"
}
}
anvil {
generateDaggerFactories = true // default is false
}
Expand Down
1 change: 0 additions & 1 deletion vpn-network/vpn-network-impl/src/main/cpp/netguard
Submodule netguard deleted from c926bc

0 comments on commit 6d857e0

Please sign in to comment.