From ea11ce8c02e331dd4bbd136cde34aca3c1de99ba Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Tue, 28 Mar 2023 15:11:41 +0100
Subject: [PATCH] Rename modules.

---
 {android => onionwrapper-android}/.gitignore                | 0
 {android => onionwrapper-android}/build.gradle              | 2 +-
 {android => onionwrapper-android}/proguard-rules.pro        | 0
 .../src/main/AndroidManifest.xml                            | 0
 {core => onionwrapper-core}/.gitignore                      | 0
 {core => onionwrapper-core}/build.gradle                    | 0
 .../org/briarproject/onionwrapper/AbstractTorWrapper.java   | 0
 .../briarproject/onionwrapper/CircumventionProvider.java    | 0
 .../onionwrapper/CircumventionProviderImpl.java             | 0
 .../main/java/org/briarproject/onionwrapper/TorUtils.java   | 0
 .../main/java/org/briarproject/onionwrapper/TorWrapper.java | 0
 {java => onionwrapper-java}/.gitignore                      | 0
 {java => onionwrapper-java}/build.gradle                    | 2 +-
 .../java/org/briarproject/onionwrapper/JavaTorWrapper.java  | 0
 .../java/org/briarproject/onionwrapper/UnixTorWrapper.java  | 0
 .../org/briarproject/onionwrapper/WindowsTorWrapper.java    | 0
 settings.gradle                                             | 6 +++---
 17 files changed, 5 insertions(+), 5 deletions(-)
 rename {android => onionwrapper-android}/.gitignore (100%)
 rename {android => onionwrapper-android}/build.gradle (93%)
 rename {android => onionwrapper-android}/proguard-rules.pro (100%)
 rename {android => onionwrapper-android}/src/main/AndroidManifest.xml (100%)
 rename {core => onionwrapper-core}/.gitignore (100%)
 rename {core => onionwrapper-core}/build.gradle (100%)
 rename {core => onionwrapper-core}/src/main/java/org/briarproject/onionwrapper/AbstractTorWrapper.java (100%)
 rename {core => onionwrapper-core}/src/main/java/org/briarproject/onionwrapper/CircumventionProvider.java (100%)
 rename {core => onionwrapper-core}/src/main/java/org/briarproject/onionwrapper/CircumventionProviderImpl.java (100%)
 rename {core => onionwrapper-core}/src/main/java/org/briarproject/onionwrapper/TorUtils.java (100%)
 rename {core => onionwrapper-core}/src/main/java/org/briarproject/onionwrapper/TorWrapper.java (100%)
 rename {java => onionwrapper-java}/.gitignore (100%)
 rename {java => onionwrapper-java}/build.gradle (86%)
 rename {java => onionwrapper-java}/src/main/java/org/briarproject/onionwrapper/JavaTorWrapper.java (100%)
 rename {java => onionwrapper-java}/src/main/java/org/briarproject/onionwrapper/UnixTorWrapper.java (100%)
 rename {java => onionwrapper-java}/src/main/java/org/briarproject/onionwrapper/WindowsTorWrapper.java (100%)

diff --git a/android/.gitignore b/onionwrapper-android/.gitignore
similarity index 100%
rename from android/.gitignore
rename to onionwrapper-android/.gitignore
diff --git a/android/build.gradle b/onionwrapper-android/build.gradle
similarity index 93%
rename from android/build.gradle
rename to onionwrapper-android/build.gradle
index d8e4fea..23b9fd0 100644
--- a/android/build.gradle
+++ b/onionwrapper-android/build.gradle
@@ -27,6 +27,6 @@ android {
 }
 
 dependencies {
-    implementation project(':core')
+    implementation project(':onionwrapper-core')
     implementation 'org.briarproject:dont-kill-me-lib:0.2.6'
 }
diff --git a/android/proguard-rules.pro b/onionwrapper-android/proguard-rules.pro
similarity index 100%
rename from android/proguard-rules.pro
rename to onionwrapper-android/proguard-rules.pro
diff --git a/android/src/main/AndroidManifest.xml b/onionwrapper-android/src/main/AndroidManifest.xml
similarity index 100%
rename from android/src/main/AndroidManifest.xml
rename to onionwrapper-android/src/main/AndroidManifest.xml
diff --git a/core/.gitignore b/onionwrapper-core/.gitignore
similarity index 100%
rename from core/.gitignore
rename to onionwrapper-core/.gitignore
diff --git a/core/build.gradle b/onionwrapper-core/build.gradle
similarity index 100%
rename from core/build.gradle
rename to onionwrapper-core/build.gradle
diff --git a/core/src/main/java/org/briarproject/onionwrapper/AbstractTorWrapper.java b/onionwrapper-core/src/main/java/org/briarproject/onionwrapper/AbstractTorWrapper.java
similarity index 100%
rename from core/src/main/java/org/briarproject/onionwrapper/AbstractTorWrapper.java
rename to onionwrapper-core/src/main/java/org/briarproject/onionwrapper/AbstractTorWrapper.java
diff --git a/core/src/main/java/org/briarproject/onionwrapper/CircumventionProvider.java b/onionwrapper-core/src/main/java/org/briarproject/onionwrapper/CircumventionProvider.java
similarity index 100%
rename from core/src/main/java/org/briarproject/onionwrapper/CircumventionProvider.java
rename to onionwrapper-core/src/main/java/org/briarproject/onionwrapper/CircumventionProvider.java
diff --git a/core/src/main/java/org/briarproject/onionwrapper/CircumventionProviderImpl.java b/onionwrapper-core/src/main/java/org/briarproject/onionwrapper/CircumventionProviderImpl.java
similarity index 100%
rename from core/src/main/java/org/briarproject/onionwrapper/CircumventionProviderImpl.java
rename to onionwrapper-core/src/main/java/org/briarproject/onionwrapper/CircumventionProviderImpl.java
diff --git a/core/src/main/java/org/briarproject/onionwrapper/TorUtils.java b/onionwrapper-core/src/main/java/org/briarproject/onionwrapper/TorUtils.java
similarity index 100%
rename from core/src/main/java/org/briarproject/onionwrapper/TorUtils.java
rename to onionwrapper-core/src/main/java/org/briarproject/onionwrapper/TorUtils.java
diff --git a/core/src/main/java/org/briarproject/onionwrapper/TorWrapper.java b/onionwrapper-core/src/main/java/org/briarproject/onionwrapper/TorWrapper.java
similarity index 100%
rename from core/src/main/java/org/briarproject/onionwrapper/TorWrapper.java
rename to onionwrapper-core/src/main/java/org/briarproject/onionwrapper/TorWrapper.java
diff --git a/java/.gitignore b/onionwrapper-java/.gitignore
similarity index 100%
rename from java/.gitignore
rename to onionwrapper-java/.gitignore
diff --git a/java/build.gradle b/onionwrapper-java/build.gradle
similarity index 86%
rename from java/build.gradle
rename to onionwrapper-java/build.gradle
index e08ad55..9e35b43 100644
--- a/java/build.gradle
+++ b/onionwrapper-java/build.gradle
@@ -8,7 +8,7 @@ java {
 }
 
 dependencies {
-    implementation project(':core')
+    implementation project(':onionwrapper-core')
     def jna_version = '4.5.2'
     implementation "net.java.dev.jna:jna:$jna_version"
     implementation "net.java.dev.jna:jna-platform:$jna_version"
diff --git a/java/src/main/java/org/briarproject/onionwrapper/JavaTorWrapper.java b/onionwrapper-java/src/main/java/org/briarproject/onionwrapper/JavaTorWrapper.java
similarity index 100%
rename from java/src/main/java/org/briarproject/onionwrapper/JavaTorWrapper.java
rename to onionwrapper-java/src/main/java/org/briarproject/onionwrapper/JavaTorWrapper.java
diff --git a/java/src/main/java/org/briarproject/onionwrapper/UnixTorWrapper.java b/onionwrapper-java/src/main/java/org/briarproject/onionwrapper/UnixTorWrapper.java
similarity index 100%
rename from java/src/main/java/org/briarproject/onionwrapper/UnixTorWrapper.java
rename to onionwrapper-java/src/main/java/org/briarproject/onionwrapper/UnixTorWrapper.java
diff --git a/java/src/main/java/org/briarproject/onionwrapper/WindowsTorWrapper.java b/onionwrapper-java/src/main/java/org/briarproject/onionwrapper/WindowsTorWrapper.java
similarity index 100%
rename from java/src/main/java/org/briarproject/onionwrapper/WindowsTorWrapper.java
rename to onionwrapper-java/src/main/java/org/briarproject/onionwrapper/WindowsTorWrapper.java
diff --git a/settings.gradle b/settings.gradle
index 5f5317b..2bb9f2a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,6 +13,6 @@ dependencyResolutionManagement {
     }
 }
 rootProject.name = "Onion Wrapper"
-include ':core'
-include ':java'
-include ':android'
+include ':onionwrapper-core'
+include ':onionwrapper-java'
+include ':onionwrapper-android'
-- 
GitLab