diff options
| author | Brenton Bostick <[email protected]> | 2022-12-09 06:40:06 -0500 |
|---|---|---|
| committer | Brenton Bostick <[email protected]> | 2023-05-22 15:36:21 -0400 |
| commit | 48adf41cc1ca35e82d81f510a1910e82e222e264 (patch) | |
| tree | fa37703386129e941401fbb106b93229d2a4aed4 | |
| parent | 71c2f97056b61a1d030d40d4e33e49a80a7f0ae6 (diff) | |
Move java files to com/zerotier/sockets subfolder
This adheres to standard Java style and fixes:
Package name 'com.zerotier.sockets' does not correspond to the file path ''
in Android Studio
| -rwxr-xr-x | build.sh | 36 | ||||
| -rw-r--r-- | src/bindings/java/com/zerotier/sockets/ZeroTierDatagramSocket.java (renamed from src/bindings/java/ZeroTierDatagramSocket.java) | 0 | ||||
| -rw-r--r-- | src/bindings/java/com/zerotier/sockets/ZeroTierEventListener.java (renamed from src/bindings/java/ZeroTierEventListener.java) | 0 | ||||
| -rw-r--r-- | src/bindings/java/com/zerotier/sockets/ZeroTierFileDescriptorSet.java (renamed from src/bindings/java/ZeroTierFileDescriptorSet.java) | 0 | ||||
| -rw-r--r-- | src/bindings/java/com/zerotier/sockets/ZeroTierInputStream.java (renamed from src/bindings/java/ZeroTierInputStream.java) | 0 | ||||
| -rw-r--r-- | src/bindings/java/com/zerotier/sockets/ZeroTierNative.java (renamed from src/bindings/java/ZeroTierNative.java) | 0 | ||||
| -rw-r--r-- | src/bindings/java/com/zerotier/sockets/ZeroTierNode.java (renamed from src/bindings/java/ZeroTierNode.java) | 0 | ||||
| -rw-r--r-- | src/bindings/java/com/zerotier/sockets/ZeroTierOutputStream.java (renamed from src/bindings/java/ZeroTierOutputStream.java) | 0 | ||||
| -rw-r--r-- | src/bindings/java/com/zerotier/sockets/ZeroTierPeerDetails.java (renamed from src/bindings/java/ZeroTierPeerDetails.java) | 0 | ||||
| -rw-r--r-- | src/bindings/java/com/zerotier/sockets/ZeroTierServerSocket.java (renamed from src/bindings/java/ZeroTierServerSocket.java) | 0 | ||||
| -rw-r--r-- | src/bindings/java/com/zerotier/sockets/ZeroTierSocket.java (renamed from src/bindings/java/ZeroTierSocket.java) | 0 | ||||
| -rw-r--r-- | src/bindings/java/com/zerotier/sockets/ZeroTierSocketAddress.java (renamed from src/bindings/java/ZeroTierSocketAddress.java) | 0 |
12 files changed, 18 insertions, 18 deletions
@@ -499,7 +499,7 @@ host-jar() BUILD_TYPE=${1:-release} if [[ $1 = *"docs"* ]]; then # Generate documentation - javadoc src/bindings/java/*.java -d docs/java + javadoc src/bindings/java/com/zerotier/sockets/*.java -d docs/java exit 0 fi VARIANT="-DZTS_ENABLE_JAVA=True" @@ -512,7 +512,7 @@ host-jar() JAVA_JAR_DIR=$CACHE_DIR/pkg/jar JAVA_JAR_SOURCE_TREE_DIR=$JAVA_JAR_DIR/com/zerotier/sockets/ mkdir -p $JAVA_JAR_SOURCE_TREE_DIR - cp -f src/bindings/java/*.java $JAVA_JAR_SOURCE_TREE_DIR + cp -f src/bindings/java/com/zerotier/sockets/*.java $JAVA_JAR_SOURCE_TREE_DIR # Build $CMAKE $VARIANT -H. -B$CACHE_DIR -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CMAKE --build $CACHE_DIR $BUILD_CONCURRENCY @@ -601,7 +601,7 @@ android-aar() export PATH=$ANDROID_HOME/cmdline-tools/tools/bin:$PATH # Copy source files into project mkdir -p ${ANDROID_PKG_PROJ_DIR}/app/src/main/java/com/zerotier/sockets - cp -f src/bindings/java/*.java ${ANDROID_PKG_PROJ_DIR}/app/src/main/java/com/zerotier/sockets + cp -f src/bindings/java/com/zerotier/sockets/*.java ${ANDROID_PKG_PROJ_DIR}/app/src/main/java/com/zerotier/sockets # Build UPPERCASE_BUILD_TYPE="$(tr '[:lower:]' '[:upper:]' <<< ${BUILD_TYPE:0:1})${BUILD_TYPE:1}" CMAKE_FLAGS="-D${CMAKE_SWITCH}=1 -D${CMAKE_SWITCH}=ON" @@ -652,21 +652,21 @@ format-code() if [[ ! $(which $CLANG_FORMAT) = "" ]]; then # Eventually: find . -path ./ext -prune -false -o -type f \( -iname \*.c -o -iname \*.h -o -iname \*.cpp -o -iname \*.hpp \) -exec clang-format -i {} \; - $CLANG_FORMAT -i --verbose include/*.h \ - src/*.c \ - src/*.cpp \ - src/*.hpp \ - examples/c/*.c \ - examples/csharp/*.cs \ - examples/java/*.java \ - test/*.c \ - test/*.cs \ - src/bindings/csharp/*.cs \ - src/bindings/csharp/*.cxx \ - src/bindings/java/*.java \ - src/bindings/java/*.cxx \ - examples/csharp/*.cs \ - src/bindings/python/PythonSockets.cxx \ + $CLANG_FORMAT -i --verbose include/*.h \ + src/*.c \ + src/*.cpp \ + src/*.hpp \ + examples/c/*.c \ + examples/csharp/*.cs \ + examples/java/*.java \ + test/*.c \ + test/*.cs \ + src/bindings/csharp/*.cs \ + src/bindings/csharp/*.cxx \ + src/bindings/java/com/zerotier/sockets/*.java \ + src/bindings/java/*.cxx \ + examples/csharp/*.cs \ + src/bindings/python/PythonSockets.cxx \ src/bindings/python/PythonSocket.h return 0 else diff --git a/src/bindings/java/ZeroTierDatagramSocket.java b/src/bindings/java/com/zerotier/sockets/ZeroTierDatagramSocket.java index a37608d..a37608d 100644 --- a/src/bindings/java/ZeroTierDatagramSocket.java +++ b/src/bindings/java/com/zerotier/sockets/ZeroTierDatagramSocket.java diff --git a/src/bindings/java/ZeroTierEventListener.java b/src/bindings/java/com/zerotier/sockets/ZeroTierEventListener.java index 0154b7e..0154b7e 100644 --- a/src/bindings/java/ZeroTierEventListener.java +++ b/src/bindings/java/com/zerotier/sockets/ZeroTierEventListener.java diff --git a/src/bindings/java/ZeroTierFileDescriptorSet.java b/src/bindings/java/com/zerotier/sockets/ZeroTierFileDescriptorSet.java index 24f9688..24f9688 100644 --- a/src/bindings/java/ZeroTierFileDescriptorSet.java +++ b/src/bindings/java/com/zerotier/sockets/ZeroTierFileDescriptorSet.java diff --git a/src/bindings/java/ZeroTierInputStream.java b/src/bindings/java/com/zerotier/sockets/ZeroTierInputStream.java index 8d23d88..8d23d88 100644 --- a/src/bindings/java/ZeroTierInputStream.java +++ b/src/bindings/java/com/zerotier/sockets/ZeroTierInputStream.java diff --git a/src/bindings/java/ZeroTierNative.java b/src/bindings/java/com/zerotier/sockets/ZeroTierNative.java index 9205315..9205315 100644 --- a/src/bindings/java/ZeroTierNative.java +++ b/src/bindings/java/com/zerotier/sockets/ZeroTierNative.java diff --git a/src/bindings/java/ZeroTierNode.java b/src/bindings/java/com/zerotier/sockets/ZeroTierNode.java index b35ccd9..b35ccd9 100644 --- a/src/bindings/java/ZeroTierNode.java +++ b/src/bindings/java/com/zerotier/sockets/ZeroTierNode.java diff --git a/src/bindings/java/ZeroTierOutputStream.java b/src/bindings/java/com/zerotier/sockets/ZeroTierOutputStream.java index 9ce2203..9ce2203 100644 --- a/src/bindings/java/ZeroTierOutputStream.java +++ b/src/bindings/java/com/zerotier/sockets/ZeroTierOutputStream.java diff --git a/src/bindings/java/ZeroTierPeerDetails.java b/src/bindings/java/com/zerotier/sockets/ZeroTierPeerDetails.java index c9e6324..c9e6324 100644 --- a/src/bindings/java/ZeroTierPeerDetails.java +++ b/src/bindings/java/com/zerotier/sockets/ZeroTierPeerDetails.java diff --git a/src/bindings/java/ZeroTierServerSocket.java b/src/bindings/java/com/zerotier/sockets/ZeroTierServerSocket.java index ac1e25f..ac1e25f 100644 --- a/src/bindings/java/ZeroTierServerSocket.java +++ b/src/bindings/java/com/zerotier/sockets/ZeroTierServerSocket.java diff --git a/src/bindings/java/ZeroTierSocket.java b/src/bindings/java/com/zerotier/sockets/ZeroTierSocket.java index ffedb3b..ffedb3b 100644 --- a/src/bindings/java/ZeroTierSocket.java +++ b/src/bindings/java/com/zerotier/sockets/ZeroTierSocket.java diff --git a/src/bindings/java/ZeroTierSocketAddress.java b/src/bindings/java/com/zerotier/sockets/ZeroTierSocketAddress.java index 21a278e..21a278e 100644 --- a/src/bindings/java/ZeroTierSocketAddress.java +++ b/src/bindings/java/com/zerotier/sockets/ZeroTierSocketAddress.java |
