[tor-commits] [orbot/master] switch to new jtorctl version to support TorService

[n8fr8@xxxxxxxxxxxxxx]

commit 2c9e02bdb76d3501ae7e632c03b5e679b879f463
Author: Hans-Christoph Steiner <hans@xxxxxxx>
Date:   Wed Dec 18 11:38:28 2019 +0100

    switch to new jtorctl version to support TorService
---
 .gitmodules               | 4 ----
 external/jtorctl          | 1 -
 orbotservice/build.gradle | 2 +-
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 691efaad..0ddb14e6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,3 @@
-[submodule "external/jtorctl"]
-	path = external/jtorctl
-	url = https://github.com/guardianproject/jtorctl
-	ignore = dirty
 [submodule "external/badvpn"]
 	path = external/badvpn
 	url = https://github.com/guardianproject/badvpn.git
diff --git a/external/jtorctl b/external/jtorctl
deleted file mode 160000
index 9f8affff..00000000
--- a/external/jtorctl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9f8affffbb03737b5606212c3ade9a1114df755f
diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle
index 58ea078d..f5ef1906 100644
--- a/orbotservice/build.gradle
+++ b/orbotservice/build.gradle
@@ -62,7 +62,7 @@ dependencies {
 
     implementation 'com.offbynull.portmapper:portmapper:2.0.5'
 
-    implementation 'info.guardianproject:jtorctl:0.4'
+    api 'info.guardianproject:jtorctl:0.4'
 
     implementation 'com.github.tladesignz:IPtProxy:0.5.2'
 }



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits