Fix: #137

android/build.gradle

@@ -6,10 +6,11 @@ buildscript {
     repositories {
         mavenLocal()
         mavenCentral()
+        jcenter()
         google()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:${androidplugin}"
+        classpath "com.android.tools.build:gradle:3.6.0"
     }
 }
 
@@ -40,7 +41,9 @@ publishing {
             groupId 'com.msopentech.thali.toronionproxy.android'
             artifactId 'android'
             version '0.0.3'
-            artifact(sourceJar)
+            afterEvaluate {
+                artifact(sourceJar)
+            }
             artifact("$buildDir/outputs/aar/android-release.aar")
             pom.withXml {
                 def dependenciesNode = asNode().appendNode('dependencies')
@@ -67,14 +70,14 @@ task sourceJar(type: Jar) {
 dependencies {
     implementation project(':universal')
     implementation 'net.freehaven.tor.control:jtorctl:0.2'
-    implementation 'org.slf4j:slf4j-api:1.7.25'
-    implementation 'org.slf4j:slf4j-android:1.7.25'
+    implementation 'org.slf4j:slf4j-api:1.7.30'
+    implementation 'org.slf4j:slf4j-android:1.7.30'
     implementation 'com.android.support:appcompat-v7:28.0.0'
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     androidTestImplementation project(':android_tor_installer')
-    androidTestImplementation 'org.torproject:tor-android-binary:0.3.5.8-rc-v2'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    androidTestImplementation 'org.torproject:tor-android-binary:0.4.2.5'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
 
 repositories {

android/proguard-rules.pro

@@ -5,5 +5,5 @@
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
 -keepattributes *Annotation*
--keep public class com.msopentech.thali.toronionproxy.TorConfigBuilder { *; }
+-keep public class com.msopentech.thali.toronionproxy.TorSettingsBuilder { *; }
 

android_tor_installer/build.gradle

@@ -6,10 +6,11 @@ buildscript {
     repositories {
         mavenLocal()
         mavenCentral()
+        jcenter()
         google()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:${androidplugin}"
+        classpath "com.android.tools.build:gradle:3.6.0"
     }
 }
 
@@ -34,14 +35,41 @@ android {
     }
 }
 
+publishing {
+    publications {
+        android(MavenPublication) {
+            groupId 'com.msopentech.thali.toronionproxy.android'
+            artifactId 'android_tor_installer'
+            version '0.0.3'
+            afterEvaluate {
+                artifact(sourceJar)
+            }
+            artifact("$buildDir/outputs/aar/android_tor_installer-release.aar")
+            pom.withXml {
+                def dependenciesNode = asNode().appendNode('dependencies')
+                //Iterate over the compile dependencies (we don't want the test ones), adding a <dependency> node for each
+                configurations.compile.allDependencies.each {
+                    if(it.group != null && (it.name != null || "unspecified".equals(it.name)) && it.version != null)
+                    {
+                        def dependencyNode = dependenciesNode.appendNode('dependency')
+                        dependencyNode.appendNode('groupId', it.group)
+                        dependencyNode.appendNode('artifactId', it.name)
+                        dependencyNode.appendNode('version', it.version)
+                    }
+                }
+            }
+        }
+    }
+}
+
 task sourceJar(type: Jar) {
     from android.sourceSets.main.java.srcDirs
     classifier "source"
 }
 
 dependencies {
     implementation project(':universal')
-    implementation 'org.torproject:tor-android-binary:0.3.5.8-rc-v2'
+    implementation 'org.torproject:tor-android-binary:0.4.2.5'
 }
 
 repositories {

gradle.properties

@@ -1,2 +1,2 @@
 # Configure Android Gradle Plugin Version
-androidplugin=3.2.1
+androidplugin=3.6.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Wed Mar 25 11:39:13 EDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

java/build.gradle

@@ -12,11 +12,11 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.slf4j:slf4j-api:1.7.25'
+    implementation 'org.slf4j:slf4j-api:1.7.30'
     implementation 'org.slf4j:slf4j-simple:1.7.25'
     implementation 'net.freehaven.tor.control:jtorctl:0.2'
     implementation project(':universal')
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testCompile group: 'junit', name: 'junit', version: '4.13'
 }
 
 task sourcesJar(type:Jar){

universal/build.gradle

@@ -12,9 +12,9 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.slf4j:slf4j-api:1.7.25'
+    implementation 'org.slf4j:slf4j-api:1.7.30'
     implementation 'net.freehaven.tor.control:jtorctl:0.2'
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testCompile group: 'junit', name: 'junit', version: '4.13'
 }
 
 task sourcesJar(type:Jar){

universal/src/main/java/com/msopentech/thali/toronionproxy/OnionProxyContext.java

@@ -206,8 +206,8 @@ public final TorSettings getSettings() {
         return settings;
     }
 
-    public final TorConfigBuilder newConfigBuilder() {
-        return new TorConfigBuilder(this);
+    public final TorSettingsBuilder newSettingsBuilder() {
+        return new TorSettingsBuilder(this);
     }
 
     /**