Merge pull request #28 from 05nelsonm/mn/feature/gradle-maven-publish

05nelsonm · web-flow · commit 10900bc02833 · 2020-07-18T11:55:37.000-04:00
implements gradle maven publish plugin
diff --git a/build.gradle b/build.gradle
@@ -6,11 +6,13 @@ buildscript {
     repositories {
         google()
         jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath deps.androidGradlePlugin
         classpath deps.kotlin.dokka
         classpath deps.kotlin.gradlePlugin
+        classpath deps.mavenPublish
     }
 }
 
diff --git a/docs/get_started.md b/docs/get_started.md
@@ -11,7 +11,7 @@ Get Started
         - Download `geoip` and `geoip6` files from https://github.com/torproject/tor/tree/master/src/config
             - If you prefer the non-mirror repository, you can also obtain them from
             https://gitweb.torproject.org/tor.git/tree/src/config
-        - In your Application module's `src/main` directory, create a new `Directory` named `assets`
+        - In your Application module's `src/main/` directory, create a new `Directory` named `assets`
         - Copy `geoip` and `geoip6` files into the `assets` directory (or a subdirectory within 
         `assets`, such as `assets/common/`. File extensions not necessary).
  - **torrc file**:
@@ -20,21 +20,30 @@ Get Started
     [TorServicePrefs](./topl-service/io.matthewnelson.topl_service.prefs/-tor-service-prefs/index.md). 
     If nothing is in `TorServicePrefs` for that particular setting, then it will fall back on 
     your static/default [TorSettings](./topl-core-base/io.matthewnelson.topl_core_base/-tor-settings/index.md) 
-    that you supply upon initialization of `TorServiceController.Builder`. 
- - **Tor Binaries**:
-    - I use The GuardianProject's <a href="https://github.com/guardianproject/tor-android" target="_blank">tor-android</a>
-    project to build binaries, and provided them 
-    <a href="https://github.com/05nelsonm/TOPL-Android-TorBinary" target="_blank">here</a>. The 
-    difference is in how they are packaged as a dependency, and the contents of what you are
-    importing as a dependency. I package them in the `jniLibs` directory so that the Android OS
-    will automatically install them into your application's `/data/app/...` directory, and include
-    no unnecessary classes or resources; just the binaries. Android API 29+ no longer supports 
-    execution of executable files from your application's `/data/data/` directory, and must now be
-    installed in the `context.applicationInfo.nativeLibraryDir` directory (aka, `/data/app/...`) 
-    to execute.
-        - Nothing more is needed in terms of configuring initialization via the 
-        `TorServiceController.Builder`, as files will be installed in the correct directory, and 
-        named to match what `topl-service` looks for.
+    that you supply upon initialization of `TorServiceController.Builder`.  
+ - **Tor Binaries**:        
+    - For now, you'll have to copy the binaries into your application's `src/main/jniLibs/<abi>/` 
+    directory so that they are packaged in your APK **uncompressed** (which Android will automatically 
+    extract to your application's native directory on the device (`/data/app/<your app>/<abi>/libTor.so`))
+        - Tor v0.4.3.5 binaries can be found in the `sampleapp` which you can copy over (for the 
+        time being).
+    - I am currently building a gradle plugin to streamline binary distribution, so stay tuned!
+        - The issue: Providing Tor Binaries packaged via an `aar` presents problems, as the 
+        binaries are compressed which results in the Android OS not extracting them automatically. 
+        This requires extraction of the Shared Native Library from the APK to be executed via 
+        inclusion of `extractNativeLibs="true"` in the app's Manifest (min API 23), or code to 
+        unzip the APK and extract the tor binaries to the application's native directory at runtime. 
+        There are many bugs/limitations across the various Android APIs (16-29) that makes this 
+        incredibly inefficient, not UX friendly for library users, error prone, and makes 
+        versioning somewhat complicated as devs have no control over the Android OS' symlink
+        creation process. API 29 also presents problems with extracting the binaries 
+        to the application's `/data/data/` directory as it 
+        <a href="https://developer.android.com/about/versions/10/behavior-changes-10" target="_blank">
+        no longer supports running of executables from that location</a>. Because of the plethora 
+        of issues across APIs, distribution of *.so files would be best done as a gradle plugin 
+        such that upon building of your application, the *.so files included in the plugin can be 
+        extracted to your application module's `src/main/jniLibs/<abi>/` directory. This ensures 
+        that when your application is built and zipaligned, everything will simply work.
     - If you wish to use GuardianProject's binaries, see 
     <a href="https://github.com/guardianproject/tor-android" target="_blank">tor-android</a>.
         - You'll need to use their `NativeResouceInstaller` to install the binaries.
@@ -49,9 +58,8 @@ Get Started
 
 
 !!! Info
-    Tor Binaries are ~8MB for each ABI (will be less after compression), so it's advised that builds 
-    are split to keep apk sizes down. For example, the `sampleapp`'s universalApk size (all ABIs) 
-    is ~16MB, where splits are ~7MB. See the `sampleapp`'s `build.gradle` file for more details. 
+    Tor Binaries are ~8MB for each ABI, so it's advised that builds are split to keep apk sizes 
+    down. See the `sampleapp`'s `build.gradle` file for more details. 
     <a href="https://github.com/05nelsonm/TorOnionProxyLibrary-Android/blob/master/sampleapp/build.gradle" target="_blank">here</a>  
 
 ## Implementation - Step 2: topl-service
diff --git a/docs/releasing.md b/docs/releasing.md
@@ -27,6 +27,10 @@ extra:
 ```
 rm -rf docs/topl-core docs/topl-core-base docs/topl-service
 ./gradlew topl-core-base:dokka topl-core:dokka topl-service:dokka
+```
+
+- Fix Dokka doc links
+```
 ./gradlew fixDokkaDocLinks
 ```
 
diff --git a/docs/topl-core-base/io.matthewnelson.topl_core_base/-tor-config-files/index.md b/docs/topl-core-base/io.matthewnelson.topl_core_base/-tor-config-files/index.md
@@ -28,7 +28,7 @@ See [Companion.createConfig](create-config.md) or [Builder](-builder/index.md) t
 | [hiddenServiceDir](hidden-service-dir.md) | `val hiddenServiceDir: `[`File`](https://docs.oracle.com/javase/6/docs/api/java/io/File.html) |
 | [hostnameFile](hostname-file.md) | The &lt;base32-encoded-fingerprint&gt;.onion domain name for this hidden service. If the hidden service is restricted to authorized clients only, this file also contains authorization data for all clients.`val hostnameFile: `[`File`](https://docs.oracle.com/javase/6/docs/api/java/io/File.html) |
 | [installDir](install-dir.md) | `val installDir: `[`File`](https://docs.oracle.com/javase/6/docs/api/java/io/File.html) |
-| [libraryPath](library-path.md) | `val libraryPath: `[`File`](https://docs.oracle.com/javase/6/docs/api/java/io/File.html) |
+| [libraryPath](library-path.md) | `val libraryPath: `[`File`](https://docs.oracle.com/javase/6/docs/api/java/io/File.html)`?` |
 | [resolveConf](resolve-conf.md) | `val resolveConf: `[`File`](https://docs.oracle.com/javase/6/docs/api/java/io/File.html) |
 | [torExecutableFile](tor-executable-file.md) | `val torExecutableFile: `[`File`](https://docs.oracle.com/javase/6/docs/api/java/io/File.html) |
 | [torrcFile](torrc-file.md) | `var torrcFile: `[`File`](https://docs.oracle.com/javase/6/docs/api/java/io/File.html) |
diff --git a/docs/topl-core-base/io.matthewnelson.topl_core_base/-tor-config-files/library-path.md b/docs/topl-core-base/io.matthewnelson.topl_core_base/-tor-config-files/library-path.md
@@ -2,4 +2,4 @@
 
 # libraryPath
 
-`val libraryPath: `[`File`](https://docs.oracle.com/javase/6/docs/api/java/io/File.html) [(source)](https://github.com/05nelsonm/TorOnionProxyLibrary-Android/blob/master/topl-core-base/src/main/java/io/matthewnelson/topl_core_base/TorConfigFiles.kt#L84)
+`val libraryPath: `[`File`](https://docs.oracle.com/javase/6/docs/api/java/io/File.html)`?` [(source)](https://github.com/05nelsonm/TorOnionProxyLibrary-Android/blob/master/topl-core-base/src/main/java/io/matthewnelson/topl_core_base/TorConfigFiles.kt#L84)
diff --git a/docs/topl-core/io.matthewnelson.topl_core.util/-file-utilities/clean-install-one-file.md b/docs/topl-core/io.matthewnelson.topl_core.util/-file-utilities/clean-install-one-file.md
@@ -2,7 +2,7 @@
 
 # cleanInstallOneFile
 
-`fun cleanInstallOneFile(readFrom: `[`InputStream`](https://docs.oracle.com/javase/6/docs/api/java/io/InputStream.html)`, fileToWriteTo: `[`File`](https://docs.oracle.com/javase/6/docs/api/java/io/File.html)`): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html) [(source)](https://github.com/05nelsonm/TorOnionProxyLibrary-Android/blob/master/topl-core/src/main/java/io/matthewnelson/topl_core/util/FileUtilities.kt#L186)
+`fun cleanInstallOneFile(readFrom: `[`InputStream`](https://docs.oracle.com/javase/6/docs/api/java/io/InputStream.html)`, fileToWriteTo: `[`File`](https://docs.oracle.com/javase/6/docs/api/java/io/File.html)`): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html) [(source)](https://github.com/05nelsonm/TorOnionProxyLibrary-Android/blob/master/topl-core/src/main/java/io/matthewnelson/topl_core/util/FileUtilities.kt#L188)
 
 Reads the input stream, deletes fileToWriteTo if it exists and over writes it with the stream.
 
diff --git a/docs/topl-core/io.matthewnelson.topl_core.util/-file-utilities/extract-content-from-zip.md b/docs/topl-core/io.matthewnelson.topl_core.util/-file-utilities/extract-content-from-zip.md
@@ -2,7 +2,7 @@
 
 # extractContentFromZip
 
-`fun extractContentFromZip(destinationDirectory: `[`File`](https://docs.oracle.com/javase/6/docs/api/java/io/File.html)`, zipFileInputStream: `[`InputStream`](https://docs.oracle.com/javase/6/docs/api/java/io/InputStream.html)`): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html) [(source)](https://github.com/05nelsonm/TorOnionProxyLibrary-Android/blob/master/topl-core/src/main/java/io/matthewnelson/topl_core/util/FileUtilities.kt#L211)
+`fun extractContentFromZip(destinationDirectory: `[`File`](https://docs.oracle.com/javase/6/docs/api/java/io/File.html)`, zipFileInputStream: `[`InputStream`](https://docs.oracle.com/javase/6/docs/api/java/io/InputStream.html)`): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html) [(source)](https://github.com/05nelsonm/TorOnionProxyLibrary-Android/blob/master/topl-core/src/main/java/io/matthewnelson/topl_core/util/FileUtilities.kt#L215)
 
 This has to exist somewhere! Why isn't it a part of the standard Java library?
 
diff --git a/docs/topl-core/io.matthewnelson.topl_core.util/-file-utilities/read.md b/docs/topl-core/io.matthewnelson.topl_core.util/-file-utilities/read.md
@@ -2,4 +2,4 @@
 
 # read
 
-`fun read(f: `[`File`](https://docs.oracle.com/javase/6/docs/api/java/io/File.html)`): `[`ByteArray`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-byte-array/index.html) [(source)](https://github.com/05nelsonm/TorOnionProxyLibrary-Android/blob/master/topl-core/src/main/java/io/matthewnelson/topl_core/util/FileUtilities.kt#L161)
+`fun read(f: `[`File`](https://docs.oracle.com/javase/6/docs/api/java/io/File.html)`): `[`ByteArray`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-byte-array/index.html) [(source)](https://github.com/05nelsonm/TorOnionProxyLibrary-Android/blob/master/topl-core/src/main/java/io/matthewnelson/topl_core/util/FileUtilities.kt#L163)
diff --git a/docs/topl-core/io.matthewnelson.topl_core.util/-file-utilities/recursive-file-delete.md b/docs/topl-core/io.matthewnelson.topl_core.util/-file-utilities/recursive-file-delete.md
@@ -2,4 +2,4 @@
 
 # recursiveFileDelete
 
-`fun recursiveFileDelete(fileOrDirectory: `[`File`](https://docs.oracle.com/javase/6/docs/api/java/io/File.html)`): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html) [(source)](https://github.com/05nelsonm/TorOnionProxyLibrary-Android/blob/master/topl-core/src/main/java/io/matthewnelson/topl_core/util/FileUtilities.kt#L195)
+`fun recursiveFileDelete(fileOrDirectory: `[`File`](https://docs.oracle.com/javase/6/docs/api/java/io/File.html)`): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html) [(source)](https://github.com/05nelsonm/TorOnionProxyLibrary-Android/blob/master/topl-core/src/main/java/io/matthewnelson/topl_core/util/FileUtilities.kt#L197)
diff --git a/gradle.properties b/gradle.properties
@@ -20,4 +20,26 @@ android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 
+GROUP=io.matthewnelson.topl-android
 VERSION_NAME=1.0.0-alpha01-SNAPSHOT
+
+# The trailing 2 digits are for `alpha##` releases. For example:
+#     4.4.1-alpha02 = 441102 where `102` stands for alpha02
+#     4.4.1-beta01 = 441201 where `201` stands for beta01
+#     4.4.1-rc01 = 441301 where `301` stands for rc01
+VERSION_CODE=100101
+
+POM_INCEPTION_YEAR=2020
+
+POM_URL=https://github.com/05nelsonm/TorOnionProxyLibrary-Android
+POM_SCM_URL=https://github.com/05nelsonm/TorOnionProxyLibrary-Android
+POM_SCM_CONNECTION=scm:git:git://github.com/05nelsonm/TorOnionProxyLibrary-Android.git
+POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/05nelsonm/TorOnionProxyLibrary-Android.git
+
+POM_LICENCE_NAME=GNU General Public License, Version 3.0
+POM_LICENCE_URL=https://www.gnu.org/licenses/gpl-3.0.html
+POM_LICENCE_DIST=repo
+
+POM_DEVELOPER_ID=05nelsonm
+POM_DEVELOPER_NAME=Matthew Nelson
+POM_DEVELOPER_URL=https://github.com/05nelsonm/
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -1,6 +1,6 @@
 ext.versions = [
     'buildTools': "29.0.3",
-    'compileSdk': 28,
+    'compileSdk': 29,
     'minSdk': 16,
 
     'coroutines': '1.3.7',
@@ -39,5 +39,6 @@ ext.deps = [
         gradlePlugin: "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}",
         stdlib: "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}",
     ],
+    mavenPublish: "com.vanniktech:gradle-maven-publish-plugin:0.12.0",
     robolectric: "org.robolectric:robolectric:4.3.1",
 ]
diff --git a/gradle/maven-publish.gradle b/gradle/maven-publish.gradle
@@ -0,0 +1,17 @@
+apply plugin: "com.vanniktech.maven.publish"
+
+mavenPublish {
+    releaseSigningEnabled = true
+
+    targets {
+        // Modify the existing uploadArchives task
+        uploadArchives {
+            releaseRepositoryUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+            snapshotRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
+        }
+    }
+}
+
+signing {
+    useGpgCmd()
+}
diff --git a/sampleapp/build.gradle b/sampleapp/build.gradle
@@ -93,8 +93,6 @@ dependencies {
     implementation deps.kotlin.coroutinesAndroid
     implementation deps.kotlin.stdlib
 
-    implementation "io.matthewnelson.topl-android:tor-binary:0.4.3.5a"
-
     testImplementation deps.junit
 
     androidTestImplementation deps.androidx.test.core
diff --git a/sampleapp/src/main/jniLibs/arm64-v8a/libTor.so b/sampleapp/src/main/jniLibs/arm64-v8a/libTor.so
diff --git a/sampleapp/src/main/jniLibs/armeabi-v7a/libTor.so b/sampleapp/src/main/jniLibs/armeabi-v7a/libTor.so
diff --git a/sampleapp/src/main/jniLibs/x86/libTor.so b/sampleapp/src/main/jniLibs/x86/libTor.so
diff --git a/sampleapp/src/main/jniLibs/x86_64/libTor.so b/sampleapp/src/main/jniLibs/x86_64/libTor.so
diff --git a/scripts/sign_sampleapp_release_build.sh b/scripts/sign_sampleapp_release_build.sh
@@ -62,7 +62,10 @@ for FILE in $UNSIGNED_APK_DIR_FILE_LIST; do
     echo "zipaligning the apk"
     echo ""
     "$ANDROID_SDK"/build-tools/"$BUILD_TOOLS_VERSION"/zipalign 4 \
-    "$UNSIGNED_APK_DIR"/"$FILE" "$FILE".tmp && mv -vf "$FILE".tmp "$FILE"
+    "$UNSIGNED_APK_DIR"/"$FILE" \
+    "$UNSIGNED_APK_DIR"/"$FILE".tmp &&
+    mv -vf "$UNSIGNED_APK_DIR"/"$FILE".tmp \
+    "$UNSIGNED_APK_DIR"/"$FILE"
 
     echo ""
     echo "Signing"
diff --git a/topl-core-base/build.gradle b/topl-core-base/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
-apply plugin: 'org.jetbrains.dokka'
+apply from: rootProject.file('gradle/maven-publish.gradle')
 
 android {
     compileSdkVersion versions.compileSdk
@@ -10,7 +10,7 @@ android {
     defaultConfig {
         minSdkVersion versions.minSdk
         targetSdkVersion versions.compileSdk
-        versionCode 1
+        versionCode VERSION_CODE.toInteger()
         versionName VERSION_NAME
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/topl-core-base/gradle.properties b/topl-core-base/gradle.properties
@@ -0,0 +1,3 @@
+POM_ARTIFACT_ID=topl-core-base
+POM_NAME=TOPL-Android-Core-Base
+POM_DESCRIPTION=Abstract classes for integrating TOPL-Service into your application
diff --git a/topl-core-base/src/main/java/io/matthewnelson/topl_core_base/TorConfigFiles.kt b/topl-core-base/src/main/java/io/matthewnelson/topl_core_base/TorConfigFiles.kt
@@ -81,7 +81,7 @@ class TorConfigFiles private constructor(
      * @return [cookieAuthFile]
      * */
     val cookieAuthFile: File,
-    val libraryPath: File,
+    val libraryPath: File?,
     val resolveConf: File,
     val controlPortFile: File,
     val installDir: File,
@@ -191,7 +191,7 @@ class TorConfigFiles private constructor(
         private lateinit var mTorrcFile: File
         private lateinit var mHiddenServiceDir: File
         private lateinit var mDataDir: File
-        private lateinit var mLibraryPath: File
+        private var mLibraryPath: File? = null
         private lateinit var mCookieAuthFile: File
         private lateinit var mHostnameFile: File
         private lateinit var mResolveConf: File
@@ -341,7 +341,7 @@ class TorConfigFiles private constructor(
             if (!::mDataDir.isInitialized)
                 mDataDir = File(configDir, ConfigFileName.DATA_DIR)
 
-            if (!::mLibraryPath.isInitialized)
+            if (mLibraryPath != null)
                 mLibraryPath = mTorExecutableFile.parentFile
 
             if (!::mHostnameFile.isInitialized)
diff --git a/topl-core/build.gradle b/topl-core/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
-apply plugin: 'org.jetbrains.dokka'
+apply from: rootProject.file('gradle/maven-publish.gradle')
 
 android {
     compileSdkVersion versions.compileSdk
@@ -10,7 +10,7 @@ android {
     defaultConfig {
         minSdkVersion versions.minSdk
         targetSdkVersion versions.compileSdk
-        versionCode 1
+        versionCode VERSION_CODE.toInteger()
         versionName VERSION_NAME
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
diff --git a/topl-core/gradle.properties b/topl-core/gradle.properties
@@ -0,0 +1,3 @@
+POM_ARTIFACT_ID=topl-core
+POM_NAME=TOPL-Android-Core
+POM_DESCRIPTION=The core module for setting up and running Tor in your application
diff --git a/topl-core/src/main/java/io/matthewnelson/topl_core/OnionProxyContext.kt b/topl-core/src/main/java/io/matthewnelson/topl_core/OnionProxyContext.kt
@@ -251,7 +251,8 @@ internal class OnionProxyContext(
     @Throws(RuntimeException::class, SecurityException::class)
     fun deleteDataDirExceptHiddenService() =
         synchronized(dataDirLock) {
-            for (file in torConfigFiles.dataDir.listFiles())
+            val listFiles = torConfigFiles.dataDir.listFiles() ?: return
+            for (file in listFiles)
                 if (file.isDirectory)
                     if (file.absolutePath != torConfigFiles.hiddenServiceDir.absolutePath)
                         FileUtilities.recursiveFileDelete(file)
@@ -266,7 +267,8 @@ internal class OnionProxyContext(
     @Throws(SecurityException::class)
     fun setHostnameDirPermissionsToReadOnly(): Boolean =
         synchronized(hostnameFileLock) {
-            FileUtilities.setToReadOnlyPermissions(torConfigFiles.hostnameFile.parentFile)
+            val parentFile = torConfigFiles.hostnameFile.parentFile ?: return false
+            FileUtilities.setToReadOnlyPermissions(parentFile)
         }
 
     ///////////
@@ -300,7 +302,7 @@ internal class OnionProxyContext(
 
     @Throws(SecurityException::class)
     private fun createNewFileIfDoesNotExist(file: File): Boolean {
-        if (!file.parentFile.exists() && !file.parentFile.mkdirs()) {
+        if (file.parentFile?.exists() != true && file.parentFile?.mkdirs() != true) {
             broadcastLogger.warn("Could not create ${file.nameWithoutExtension} parent directory")
             return false
         }
diff --git a/topl-core/src/main/java/io/matthewnelson/topl_core/OnionProxyManager.kt b/topl-core/src/main/java/io/matthewnelson/topl_core/OnionProxyManager.kt
@@ -253,7 +253,7 @@ class OnionProxyManager(
 
         // Use the control connection to update the Tor config
         val config = listOf(
-            "HiddenServiceDir ${hostnameFile.parentFile.absolutePath}",
+            "HiddenServiceDir ${hostnameFile.parentFile?.absolutePath}",
             "HiddenServicePort $hiddenServicePort 127.0.0.1:$localPort"
         )
 
@@ -267,7 +267,7 @@ class OnionProxyManager(
 
         // Wait for the hostname file to be created/updated
         if (!hostNameFileObserver.poll(HOSTNAME_TIMEOUT.toLong(), TimeUnit.SECONDS)) {
-            FileUtilities.listFilesToLog(hostnameFile.parentFile)
+            hostnameFile.parentFile?.let { FileUtilities.listFilesToLog(it) }
             throw RuntimeException("Wait for hidden service hostname file to be created expired.")
         }
 
diff --git a/topl-core/src/main/java/io/matthewnelson/topl_core/util/FileUtilities.kt b/topl-core/src/main/java/io/matthewnelson/topl_core/util/FileUtilities.kt
@@ -152,9 +152,11 @@ object FileUtilities {
 
     @Throws(SecurityException::class)
     fun listFilesToLog(f: File) {
-        if (f.isDirectory)
-            for (child in f.listFiles())
+        if (f.isDirectory) {
+            val listFiles = f.listFiles() ?: return
+            for (child in listFiles)
                 listFilesToLog(child)
+        }
     }
 
     @Throws(IOException::class, EOFException::class, SecurityException::class)
@@ -193,9 +195,11 @@ object FileUtilities {
 
     @Throws(SecurityException::class)
     fun recursiveFileDelete(fileOrDirectory: File) {
-        if (fileOrDirectory.isDirectory)
-            for (child in fileOrDirectory.listFiles())
+        if (fileOrDirectory.isDirectory) {
+            val listFiles = fileOrDirectory.listFiles() ?: return
+            for (child in listFiles)
                 recursiveFileDelete(child)
+        }
 
         if (fileOrDirectory.exists() && !fileOrDirectory.delete())
             throw RuntimeException("Could not delete directory ${fileOrDirectory.absolutePath}")
diff --git a/topl-service/build.gradle b/topl-service/build.gradle
diff --git a/topl-service/gradle.properties b/topl-service/gradle.properties

Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,13 @@ buildscript {`
`6`	`6`	`repositories {`
`7`	`7`	`google()`
`8`	`8`	`jcenter()`
	`9`	`+ mavenCentral()`
`9`	`10`	`}`
`10`	`11`	`dependencies {`
`11`	`12`	`classpath deps.androidGradlePlugin`
`12`	`13`	`classpath deps.kotlin.dokka`
`13`	`14`	`classpath deps.kotlin.gradlePlugin`
	`15`	`+ classpath deps.mavenPublish`
`14`	`16`	`}`
`15`	`17`	`}`
`16`	`18`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`# libraryPath`
`4`	`4`
`5`		-`val libraryPath: `[`File`](https://docs.oracle.com/javase/6/docs/api/java/io/File.html) [(source)](https://github.com/05nelsonm/TorOnionProxyLibrary-Android/blob/master/topl-core-base/src/main/java/io/matthewnelson/topl_core_base/TorConfigFiles.kt#L84)
	`5`	+`val libraryPath: `[`File`](https://docs.oracle.com/javase/6/docs/api/java/io/File.html)`?` [(source)](https://github.com/05nelsonm/TorOnionProxyLibrary-Android/blob/master/topl-core-base/src/main/java/io/matthewnelson/topl_core_base/TorConfigFiles.kt#L84)
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`# read`
`4`	`4`
`5`		-`fun read(f: `[`File`](https://docs.oracle.com/javase/6/docs/api/java/io/File.html)`): `[`ByteArray`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-byte-array/index.html) [(source)](https://github.com/05nelsonm/TorOnionProxyLibrary-Android/blob/master/topl-core/src/main/java/io/matthewnelson/topl_core/util/FileUtilities.kt#L161)
	`5`	+`fun read(f: `[`File`](https://docs.oracle.com/javase/6/docs/api/java/io/File.html)`): `[`ByteArray`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-byte-array/index.html) [(source)](https://github.com/05nelsonm/TorOnionProxyLibrary-Android/blob/master/topl-core/src/main/java/io/matthewnelson/topl_core/util/FileUtilities.kt#L163)
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`# recursiveFileDelete`
`4`	`4`
`5`		-`fun recursiveFileDelete(fileOrDirectory: `[`File`](https://docs.oracle.com/javase/6/docs/api/java/io/File.html)`): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html) [(source)](https://github.com/05nelsonm/TorOnionProxyLibrary-Android/blob/master/topl-core/src/main/java/io/matthewnelson/topl_core/util/FileUtilities.kt#L195)
	`5`	+`fun recursiveFileDelete(fileOrDirectory: `[`File`](https://docs.oracle.com/javase/6/docs/api/java/io/File.html)`): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html) [(source)](https://github.com/05nelsonm/TorOnionProxyLibrary-Android/blob/master/topl-core/src/main/java/io/matthewnelson/topl_core/util/FileUtilities.kt#L197)