Commit 9276f194 authored by sisbell's avatar sisbell
Browse files

Bug 30162: Tor Browser bootstrap process got stuck after interrupting it

Bug 30166: If custom bridges are specified, only use those bridges for connecting
parent 05526655
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
git_hash: 6a9314aff4418a4edac33ff39fae266b097cf000
git_hash: d5c9b1f569e1f04ccadeb75184cec0766c4c2f4d
git_url: https://git.torproject.org/tor-android-service.git
git_submodule: 1
......
diff --git a/build.gradle b/build.gradle
index 178278e..d80d0b5 100644
index 671edab..d9ecfef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,6 +4,7 @@ buildscript {
@@ -5,6 +5,7 @@ buildscript {
repositories {
google()
jcenter()
mavenCentral()
+ maven { url System.getenv("GRADLE_MAVEN_REPO") }
}
dependencies {
classpath "com.android.tools.build:gradle:${androidplugin}"
@@ -19,6 +20,7 @@ allprojects {
jcenter()
maven { url "https://jitpack.io" }
@@ -20,5 +21,6 @@ allprojects {
mavenCentral()
maven { url "https://repo.spring.io/plugins-release" }
maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" }
+ maven { url System.getenv("GRADLE_MAVEN_REPO") }
}
}
\ No newline at end of file
diff --git a/service/build.gradle b/service/build.gradle
index b414557..f57d9b3 100644
index b414557..ae3e203 100644
--- a/service/build.gradle
+++ b/service/build.gradle
@@ -16,13 +16,6 @@ android {
@@ -16,12 +16,6 @@ android {
}
}
......@@ -32,7 +32,6 @@ index b414557..f57d9b3 100644
- buildStagingDirectory "./outputs/ndk-build"
- }
- }
-
lintOptions {
abortOnError false
}
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
git_hash: be7206bba357bda11455b012bfcc0d42cc16c99d
git_hash: 27df20a5cb107a009db009df4aaef000a6e78e2e
git_url: https://github.com/sisbell/Tor_Onion_Proxy_Library.git
git_submodule: 1
......
diff --git a/android/build.gradle b/android/build.gradle
index 1549581..ab919cf 100644
index b6d8608..38093be 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -8,6 +8,7 @@ buildscript {
@@ -7,6 +7,7 @@ buildscript {
mavenLocal()
mavenCentral()
google()
jcenter()
+ maven { url System.getenv("GRADLE_MAVEN_REPO") }
}
dependencies {
classpath "com.android.tools.build:gradle:${androidplugin}"
@@ -82,6 +83,7 @@ repositories {
mavenCentral()
google()
maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" }
+ maven { url System.getenv("GRADLE_MAVEN_REPO") }
}
/**
diff --git a/android_tor_installer/build.gradle b/android_tor_installer/build.gradle
index d2c02cf..d846254 100644
index 1bc0343..7d8e886 100644
--- a/android_tor_installer/build.gradle
+++ b/android_tor_installer/build.gradle
@@ -8,6 +8,7 @@ buildscript {
@@ -7,6 +7,7 @@ buildscript {
mavenLocal()
mavenCentral()
google()
jcenter()
+ maven { url System.getenv("GRADLE_MAVEN_REPO") }
}
dependencies {
classpath "com.android.tools.build:gradle:${androidplugin}"
@@ -50,5 +51,6 @@ repositories {
google()
maven { url "https://repo.spring.io/plugins-release" }
maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" }
+ maven { url System.getenv("GRADLE_MAVEN_REPO") }
}
diff --git a/build.gradle b/build.gradle
index 43b9e13..8087ab7 100644
index a269024..430f3e1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,6 +9,7 @@ subprojects {
mavenLocal()
mavenCentral()
jcenter()
maven { url "https://repo.spring.io/plugins-release" }
+ maven { url System.getenv("GRADLE_MAVEN_REPO") }
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment