diff --git a/.gitattributes b/.gitattributes index 3149f93de..097f9f98d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,9 @@ -* text=auto +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 000000000..e67efac5b --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,26 @@ +--- +name: ci + +on: + pull_request: + branches: [master] + +# Cancel old PR builds when pushing new commits. +concurrency: + group: build-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +jobs: + common: + uses: TokTok/ci-tools/.github/workflows/common-ci.yml@master + + docker-jvm: + runs-on: ubuntu-latest + steps: + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Build toxchat/jvm-toxcore-c:jvm + uses: docker/build-push-action@v5 + with: + file: docker/jvm.Dockerfile + tags: toxchat/jvm-toxcore-c:jvm diff --git a/.gitignore b/.gitignore index 5805785a5..48254a711 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,3 @@ -# GitHub pages. -/.web - -# SBT compiled build system. -/project/project -/project/target - -# SBT output directory. -/target - -# Generated startup scripts for main classes. -/bin - -# Local user settings for SBT and Java. -/local.sbt -/local.properties - # CMake build directory. /android-ndk-*.zip _git @@ -34,14 +17,11 @@ _install # Virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* -# Debug log from toxcore. -libtoxcore.log - # Gradle temporary directory. .gradle # Java runtime support for disassembly. hsdis-*.* -# Generated proguard configuration. -/proguard-sbt.txt +# Ignore Gradle build output directory +build diff --git a/.restyled.yaml b/.restyled.yaml new file mode 100644 index 000000000..c20239aff --- /dev/null +++ b/.restyled.yaml @@ -0,0 +1,3 @@ +--- +exclude: + - "gradlew" diff --git a/BUILD.bazel b/BUILD.bazel index 771eaf3db..c8726bd92 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -14,23 +14,23 @@ genrule( "//tools/config:osx": ["@bazel_tools//tools/jdk:jni_md_header-darwin"], "//tools/config:windows": ["@bazel_tools//tools/jdk:jni_md_header-windows"], }), - outs = ["cpp/src/jni_md.h"], + outs = ["lib/src/main/cpp/jni_md.h"], cmd = "cp -f $< $@", ) genrule( name = "copy_link_jni_header", srcs = ["@bazel_tools//tools/jdk:jni_header"], - outs = ["cpp/src/jni.h"], + outs = ["lib/src/main/cpp/jni.h"], cmd = "cp -f $< $@", ) proto_library( name = "jni_proto", srcs = [ - "src/main/protobuf/Av.proto", - "src/main/protobuf/Core.proto", - "src/main/protobuf/ProtoLog.proto", + "lib/src/main/proto/Av.proto", + "lib/src/main/proto/Core.proto", + "lib/src/main/proto/ProtoLog.proto", ], ) @@ -47,28 +47,28 @@ java_proto_library( cc_binary( name = "libtox4j-c.so", srcs = glob([ - "cpp/src/**/*.cpp", - "cpp/src/**/*.h", + "lib/src/main/cpp/**/*.cpp", + "lib/src/main/cpp/**/*.h", ]) + [ - ":cpp/src/jni.h", - ":cpp/src/jni_md.h", + ":lib/src/main/cpp/jni.h", + ":lib/src/main/cpp/jni_md.h", ], copts = [ "-DHAVE_TO_STRING", ], includes = [ - "cpp/src", - "src/main/protobuf", + "lib/src/main/cpp", + "lib/src/main/proto", ], linkopts = select({ - "//tools/config:freebsd": ["-Wl,--version-script,$(location cpp/src/libtox4j-c.ld)"], - "//tools/config:linux": ["-Wl,--version-script,$(location cpp/src/libtox4j-c.ld)"], + "//tools/config:freebsd": ["-Wl,--version-script,$(location lib/src/main/cpp/libtox4j-c.ld)"], + "//tools/config:linux": ["-Wl,--version-script,$(location lib/src/main/cpp/libtox4j-c.ld)"], "//tools/config:osx": [], "//tools/config:windows": [], }), linkshared = True, deps = [ - "cpp/src/libtox4j-c.ld", + "lib/src/main/cpp/libtox4j-c.ld", ":jni_cc_proto", "//c-toxcore", ], @@ -77,8 +77,8 @@ cc_binary( kt_jvm_library( name = "jvm-toxcore-c", srcs = glob([ - "src/main/java/**/*.java", - "src/main/java/**/*.kt", + "lib/src/main/java/**/*.java", + "lib/src/main/java/**/*.kt", ]), data = ["libtox4j-c.so"], deps = [":jni_java_proto"], @@ -87,7 +87,7 @@ kt_jvm_library( kt_jvm_test( name = "ToxCoreTest", size = "small", - srcs = ["src/test/java/im/tox/tox4j/core/ToxCoreTest.kt"], + srcs = ["lib/src/test/java/im/tox/tox4j/core/ToxCoreTest.kt"], jvm_flags = ["-Djava.library.path=jvm-toxcore-c"], test_class = "im.tox.tox4j.core.ToxCoreTest", deps = [ diff --git a/cpp/src/ToxAv/Av.proto b/cpp/src/ToxAv/Av.proto deleted file mode 120000 index 264b94c98..000000000 --- a/cpp/src/ToxAv/Av.proto +++ /dev/null @@ -1 +0,0 @@ -../../../src/main/protobuf/Av.proto \ No newline at end of file diff --git a/cpp/src/ToxCore/Core.proto b/cpp/src/ToxCore/Core.proto deleted file mode 120000 index daba1754f..000000000 --- a/cpp/src/ToxCore/Core.proto +++ /dev/null @@ -1 +0,0 @@ -../../../src/main/protobuf/Core.proto \ No newline at end of file diff --git a/cpp/src/main/resources/im/tox/tox4j/impl/jni/.gitignore b/cpp/src/main/resources/im/tox/tox4j/impl/jni/.gitignore deleted file mode 100644 index 0c01ec23f..000000000 --- a/cpp/src/main/resources/im/tox/tox4j/impl/jni/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.dll -*.dylib -*.so diff --git a/cpp/src/util/ProtoLog.proto b/cpp/src/util/ProtoLog.proto deleted file mode 120000 index 4f4c19420..000000000 --- a/cpp/src/util/ProtoLog.proto +++ /dev/null @@ -1 +0,0 @@ -../../../src/main/protobuf/ProtoLog.proto \ No newline at end of file diff --git a/docker/jvm.Dockerfile b/docker/jvm.Dockerfile new file mode 100644 index 000000000..ba388e29c --- /dev/null +++ b/docker/jvm.Dockerfile @@ -0,0 +1,25 @@ +FROM ubuntu:22.04 + +RUN apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + autoconf \ + automake \ + build-essential \ + ca-certificates \ + cmake \ + default-jdk \ + git \ + libtool \ + make \ + pkg-config \ + yasm \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +WORKDIR /work/jvm-toxcore-c +COPY scripts/ /work/jvm-toxcore-c/scripts/ +RUN scripts/build-host "$PWD/_install/host/protobuf.stamp" "-j$(nproc)" +RUN scripts/build-host "$PWD/_install/host/toxcore.stamp" "-j$(nproc)" +COPY lib/src/main/cpp/ /work/jvm-toxcore-c/lib/src/main/cpp/ +COPY lib/src/main/proto/ /work/jvm-toxcore-c/lib/src/main/proto/ +RUN scripts/build-host "$PWD/_install/host/tox4j.stamp" "-j$(nproc)" diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 000000000..18f452c73 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,6 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties + +org.gradle.parallel=true +org.gradle.caching=true + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..7f93135c4 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..a80b22ce5 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 000000000..1aa94a426 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..93e3f59f1 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts new file mode 100644 index 000000000..de800d8ea --- /dev/null +++ b/lib/build.gradle.kts @@ -0,0 +1,36 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This generated file contains a sample Kotlin library project to get you started. + * For more details on building Java & JVM projects, please refer to https://docs.gradle.org/8.4/userguide/building_java_projects.html in the Gradle documentation. + * This project uses @Incubating APIs which are subject to change. + */ + +plugins { + // Apply the org.jetbrains.kotlin.jvm Plugin to add support for Kotlin. + id("org.jetbrains.kotlin.jvm") version "1.9.22" + id("com.google.protobuf") version "0.9.4" + + // Apply the java-library plugin for API and implementation separation. + `java-library` +} + +repositories { + // Use Maven Central for resolving dependencies. + mavenCentral() +} + +dependencies { + implementation("com.google.protobuf:protobuf-java:3.24.4") + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") +} + +testing { + suites { + // Configure the built-in test suite + val test by getting(JvmTestSuite::class) { + // Use Kotlin Test test framework + useKotlinTest("1.9.22") + } + } +} diff --git a/cpp/.gitignore b/lib/src/main/cpp/.gitignore similarity index 100% rename from cpp/.gitignore rename to lib/src/main/cpp/.gitignore diff --git a/cpp/CMakeLists.txt b/lib/src/main/cpp/CMakeLists.txt similarity index 54% rename from cpp/CMakeLists.txt rename to lib/src/main/cpp/CMakeLists.txt index 8c35ce8c5..7af7ec491 100644 --- a/cpp/CMakeLists.txt +++ b/lib/src/main/cpp/CMakeLists.txt @@ -1,6 +1,5 @@ project(tox4j-c) -cmake_minimum_required(VERSION 2.8.7) -set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/tools/cmake") +cmake_minimum_required(VERSION 2.8.12) if(NOT DEFINED CMAKE_MACOSX_RPATH) set(CMAKE_MACOSX_RPATH true) @@ -46,10 +45,10 @@ if(JAVA_INCLUDE_PATH2) include_directories(${JAVA_INCLUDE_PATH2}) endif() -include_directories("src") +include_directories(${CMAKE_SOURCE_DIR}) include_directories(${CMAKE_BINARY_DIR}) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") # # C++ standard library features @@ -97,80 +96,80 @@ endif() # Build # -protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS src/ToxAv/Av.proto - src/ToxCore/Core.proto src/util/ProtoLog.proto) +protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS ToxAv/Av.proto + ToxCore/Core.proto util/ProtoLog.proto) add_library( ${PROJECT_NAME} SHARED ${ANDROID_CPU_FEATURES} ${PROTO_SRCS} ${PROTO_HDRS} - src/ToxAv/generated/enums.cpp - src/ToxAv/generated/errors.cpp - src/ToxAv/generated/impls.h - src/ToxAv/generated/im_tox_tox4j_impl_jni_ToxAvJni.h - src/ToxAv/generated/natives.h - src/ToxAv/av.cpp - src/ToxAv/debug.cpp - src/ToxAv/lifecycle.cpp - src/ToxAv/ToxAv.cpp - src/ToxAv/ToxAv.h - src/ToxCore/generated/constants.h - src/ToxCore/generated/enums.cpp - src/ToxCore/generated/errors.cpp - src/ToxCore/generated/impls.h - src/ToxCore/generated/im_tox_tox4j_impl_jni_ToxCoreJni.h - src/ToxCore/generated/natives.h - src/ToxCore/clientinfo.cpp - src/ToxCore/connection.cpp - src/ToxCore/custom.cpp - src/ToxCore/debug.cpp - src/ToxCore/filetransfer.cpp - src/ToxCore/friendlist.cpp - src/ToxCore/interaction.cpp - src/ToxCore/lifecycle.cpp - src/ToxCore/ToxCore.cpp - src/ToxCore/ToxCore.h - src/ToxCrypto/generated/constants.h - src/ToxCrypto/generated/errors.cpp - src/ToxCrypto/generated/im_tox_tox4j_impl_jni_ToxCryptoJni.h - src/ToxCrypto/generated/natives.h - src/ToxCrypto/debug.cpp - src/ToxCrypto/encryptsave.cpp - src/ToxCrypto/hash.cpp - src/ToxCrypto/ToxCrypto.cpp - src/ToxCrypto/ToxCrypto.h - src/Tox4j.cpp - src/cpp14compat.h - src/tox4j/ToxInstances.h - src/tox4j/Tox4j.h - src/tox/av.cpp - src/tox/av.h - src/tox/common.h - src/tox/core.cpp - src/tox/core.h - src/tox/generated/av.h - src/tox/generated/core.h - src/util/jni/ArrayFromJava.cpp - src/util/jni/ArrayFromJava.h - src/util/jni/ArrayToJava.cpp - src/util/jni/ArrayToJava.h - src/util/jni/Enum.h - src/util/jni/UTFChars.cpp - src/util/jni/UTFChars.h - src/util/debug_log.cpp - src/util/debug_log.h - src/util/exceptions.cpp - src/util/exceptions.h - src/util/instance_manager.h - src/util/logging.cpp - src/util/logging.h - src/util/pp_attributes.h - src/util/pp_cat.h - src/util/to_bytes.cpp - src/util/to_bytes.h - src/util/unused.h - src/util/wrap_void.h) + ToxAv/generated/enums.cpp + ToxAv/generated/errors.cpp + ToxAv/generated/impls.h + ToxAv/generated/im_tox_tox4j_impl_jni_ToxAvJni.h + ToxAv/generated/natives.h + ToxAv/av.cpp + ToxAv/debug.cpp + ToxAv/lifecycle.cpp + ToxAv/ToxAv.cpp + ToxAv/ToxAv.h + ToxCore/generated/constants.h + ToxCore/generated/enums.cpp + ToxCore/generated/errors.cpp + ToxCore/generated/impls.h + ToxCore/generated/im_tox_tox4j_impl_jni_ToxCoreJni.h + ToxCore/generated/natives.h + ToxCore/clientinfo.cpp + ToxCore/connection.cpp + ToxCore/custom.cpp + ToxCore/debug.cpp + ToxCore/filetransfer.cpp + ToxCore/friendlist.cpp + ToxCore/interaction.cpp + ToxCore/lifecycle.cpp + ToxCore/ToxCore.cpp + ToxCore/ToxCore.h + ToxCrypto/generated/constants.h + ToxCrypto/generated/errors.cpp + ToxCrypto/generated/im_tox_tox4j_impl_jni_ToxCryptoJni.h + ToxCrypto/generated/natives.h + ToxCrypto/debug.cpp + ToxCrypto/encryptsave.cpp + ToxCrypto/hash.cpp + ToxCrypto/ToxCrypto.cpp + ToxCrypto/ToxCrypto.h + Tox4j.cpp + cpp14compat.h + tox4j/ToxInstances.h + tox4j/Tox4j.h + tox/av.cpp + tox/av.h + tox/common.h + tox/core.cpp + tox/core.h + tox/generated/av.h + tox/generated/core.h + util/jni/ArrayFromJava.cpp + util/jni/ArrayFromJava.h + util/jni/ArrayToJava.cpp + util/jni/ArrayToJava.h + util/jni/Enum.h + util/jni/UTFChars.cpp + util/jni/UTFChars.h + util/debug_log.cpp + util/debug_log.h + util/exceptions.cpp + util/exceptions.h + util/instance_manager.h + util/logging.cpp + util/logging.h + util/pp_attributes.h + util/pp_cat.h + util/to_bytes.cpp + util/to_bytes.h + util/unused.h + util/wrap_void.h) if(ANDROID_CPU_FEATURES) target_compile_definitions(${PROJECT_NAME} PRIVATE -Dtypeof=__typeof__) @@ -191,7 +190,7 @@ if(NOT WIN32 AND NOT APPLE) ${PROJECT_NAME} PROPERTIES LINK_FLAGS - "-Wl,-z,defs -Wl,--version-script,${CMAKE_SOURCE_DIR}/src/libtox4j-c.ld") + "-Wl,-z,defs -Wl,--version-script,${CMAKE_SOURCE_DIR}/libtox4j-c.ld") endif() # diff --git a/cpp/src/Tox4j.cpp b/lib/src/main/cpp/Tox4j.cpp similarity index 100% rename from cpp/src/Tox4j.cpp rename to lib/src/main/cpp/Tox4j.cpp diff --git a/lib/src/main/cpp/ToxAv/Av.proto b/lib/src/main/cpp/ToxAv/Av.proto new file mode 120000 index 000000000..168ffdb4b --- /dev/null +++ b/lib/src/main/cpp/ToxAv/Av.proto @@ -0,0 +1 @@ +../../proto/Av.proto \ No newline at end of file diff --git a/cpp/src/ToxAv/ToxAv.cpp b/lib/src/main/cpp/ToxAv/ToxAv.cpp similarity index 100% rename from cpp/src/ToxAv/ToxAv.cpp rename to lib/src/main/cpp/ToxAv/ToxAv.cpp diff --git a/cpp/src/ToxAv/ToxAv.h b/lib/src/main/cpp/ToxAv/ToxAv.h similarity index 100% rename from cpp/src/ToxAv/ToxAv.h rename to lib/src/main/cpp/ToxAv/ToxAv.h diff --git a/cpp/src/ToxAv/av.cpp b/lib/src/main/cpp/ToxAv/av.cpp similarity index 100% rename from cpp/src/ToxAv/av.cpp rename to lib/src/main/cpp/ToxAv/av.cpp diff --git a/cpp/src/ToxAv/debug.cpp b/lib/src/main/cpp/ToxAv/debug.cpp similarity index 100% rename from cpp/src/ToxAv/debug.cpp rename to lib/src/main/cpp/ToxAv/debug.cpp diff --git a/cpp/src/ToxAv/generated/enums.cpp b/lib/src/main/cpp/ToxAv/generated/enums.cpp similarity index 100% rename from cpp/src/ToxAv/generated/enums.cpp rename to lib/src/main/cpp/ToxAv/generated/enums.cpp diff --git a/cpp/src/ToxAv/generated/errors.cpp b/lib/src/main/cpp/ToxAv/generated/errors.cpp similarity index 100% rename from cpp/src/ToxAv/generated/errors.cpp rename to lib/src/main/cpp/ToxAv/generated/errors.cpp diff --git a/cpp/src/ToxAv/generated/im_tox_tox4j_impl_jni_ToxAvJni.h b/lib/src/main/cpp/ToxAv/generated/im_tox_tox4j_impl_jni_ToxAvJni.h similarity index 100% rename from cpp/src/ToxAv/generated/im_tox_tox4j_impl_jni_ToxAvJni.h rename to lib/src/main/cpp/ToxAv/generated/im_tox_tox4j_impl_jni_ToxAvJni.h diff --git a/cpp/src/ToxAv/generated/impls.h b/lib/src/main/cpp/ToxAv/generated/impls.h similarity index 100% rename from cpp/src/ToxAv/generated/impls.h rename to lib/src/main/cpp/ToxAv/generated/impls.h diff --git a/cpp/src/ToxAv/generated/natives.h b/lib/src/main/cpp/ToxAv/generated/natives.h similarity index 100% rename from cpp/src/ToxAv/generated/natives.h rename to lib/src/main/cpp/ToxAv/generated/natives.h diff --git a/cpp/src/ToxAv/lifecycle.cpp b/lib/src/main/cpp/ToxAv/lifecycle.cpp similarity index 100% rename from cpp/src/ToxAv/lifecycle.cpp rename to lib/src/main/cpp/ToxAv/lifecycle.cpp diff --git a/lib/src/main/cpp/ToxCore/Core.proto b/lib/src/main/cpp/ToxCore/Core.proto new file mode 120000 index 000000000..b28752218 --- /dev/null +++ b/lib/src/main/cpp/ToxCore/Core.proto @@ -0,0 +1 @@ +../../proto/Core.proto \ No newline at end of file diff --git a/cpp/src/ToxCore/ToxCore.cpp b/lib/src/main/cpp/ToxCore/ToxCore.cpp similarity index 100% rename from cpp/src/ToxCore/ToxCore.cpp rename to lib/src/main/cpp/ToxCore/ToxCore.cpp diff --git a/cpp/src/ToxCore/ToxCore.h b/lib/src/main/cpp/ToxCore/ToxCore.h similarity index 100% rename from cpp/src/ToxCore/ToxCore.h rename to lib/src/main/cpp/ToxCore/ToxCore.h diff --git a/cpp/src/ToxCore/clientinfo.cpp b/lib/src/main/cpp/ToxCore/clientinfo.cpp similarity index 100% rename from cpp/src/ToxCore/clientinfo.cpp rename to lib/src/main/cpp/ToxCore/clientinfo.cpp diff --git a/cpp/src/ToxCore/connection.cpp b/lib/src/main/cpp/ToxCore/connection.cpp similarity index 100% rename from cpp/src/ToxCore/connection.cpp rename to lib/src/main/cpp/ToxCore/connection.cpp diff --git a/cpp/src/ToxCore/custom.cpp b/lib/src/main/cpp/ToxCore/custom.cpp similarity index 100% rename from cpp/src/ToxCore/custom.cpp rename to lib/src/main/cpp/ToxCore/custom.cpp diff --git a/cpp/src/ToxCore/debug.cpp b/lib/src/main/cpp/ToxCore/debug.cpp similarity index 100% rename from cpp/src/ToxCore/debug.cpp rename to lib/src/main/cpp/ToxCore/debug.cpp diff --git a/cpp/src/ToxCore/filetransfer.cpp b/lib/src/main/cpp/ToxCore/filetransfer.cpp similarity index 100% rename from cpp/src/ToxCore/filetransfer.cpp rename to lib/src/main/cpp/ToxCore/filetransfer.cpp diff --git a/cpp/src/ToxCore/friendlist.cpp b/lib/src/main/cpp/ToxCore/friendlist.cpp similarity index 100% rename from cpp/src/ToxCore/friendlist.cpp rename to lib/src/main/cpp/ToxCore/friendlist.cpp diff --git a/cpp/src/ToxCore/generated/constants.h b/lib/src/main/cpp/ToxCore/generated/constants.h similarity index 100% rename from cpp/src/ToxCore/generated/constants.h rename to lib/src/main/cpp/ToxCore/generated/constants.h diff --git a/cpp/src/ToxCore/generated/enums.cpp b/lib/src/main/cpp/ToxCore/generated/enums.cpp similarity index 100% rename from cpp/src/ToxCore/generated/enums.cpp rename to lib/src/main/cpp/ToxCore/generated/enums.cpp diff --git a/cpp/src/ToxCore/generated/errors.cpp b/lib/src/main/cpp/ToxCore/generated/errors.cpp similarity index 100% rename from cpp/src/ToxCore/generated/errors.cpp rename to lib/src/main/cpp/ToxCore/generated/errors.cpp diff --git a/cpp/src/ToxCore/generated/im_tox_tox4j_impl_jni_ToxCoreJni.h b/lib/src/main/cpp/ToxCore/generated/im_tox_tox4j_impl_jni_ToxCoreJni.h similarity index 100% rename from cpp/src/ToxCore/generated/im_tox_tox4j_impl_jni_ToxCoreJni.h rename to lib/src/main/cpp/ToxCore/generated/im_tox_tox4j_impl_jni_ToxCoreJni.h diff --git a/cpp/src/ToxCore/generated/impls.h b/lib/src/main/cpp/ToxCore/generated/impls.h similarity index 100% rename from cpp/src/ToxCore/generated/impls.h rename to lib/src/main/cpp/ToxCore/generated/impls.h diff --git a/cpp/src/ToxCore/generated/natives.h b/lib/src/main/cpp/ToxCore/generated/natives.h similarity index 100% rename from cpp/src/ToxCore/generated/natives.h rename to lib/src/main/cpp/ToxCore/generated/natives.h diff --git a/cpp/src/ToxCore/interaction.cpp b/lib/src/main/cpp/ToxCore/interaction.cpp similarity index 100% rename from cpp/src/ToxCore/interaction.cpp rename to lib/src/main/cpp/ToxCore/interaction.cpp diff --git a/cpp/src/ToxCore/lifecycle.cpp b/lib/src/main/cpp/ToxCore/lifecycle.cpp similarity index 100% rename from cpp/src/ToxCore/lifecycle.cpp rename to lib/src/main/cpp/ToxCore/lifecycle.cpp diff --git a/cpp/src/ToxCrypto/ToxCrypto.cpp b/lib/src/main/cpp/ToxCrypto/ToxCrypto.cpp similarity index 100% rename from cpp/src/ToxCrypto/ToxCrypto.cpp rename to lib/src/main/cpp/ToxCrypto/ToxCrypto.cpp diff --git a/cpp/src/ToxCrypto/ToxCrypto.h b/lib/src/main/cpp/ToxCrypto/ToxCrypto.h similarity index 100% rename from cpp/src/ToxCrypto/ToxCrypto.h rename to lib/src/main/cpp/ToxCrypto/ToxCrypto.h diff --git a/cpp/src/ToxCrypto/debug.cpp b/lib/src/main/cpp/ToxCrypto/debug.cpp similarity index 100% rename from cpp/src/ToxCrypto/debug.cpp rename to lib/src/main/cpp/ToxCrypto/debug.cpp diff --git a/cpp/src/ToxCrypto/encryptsave.cpp b/lib/src/main/cpp/ToxCrypto/encryptsave.cpp similarity index 100% rename from cpp/src/ToxCrypto/encryptsave.cpp rename to lib/src/main/cpp/ToxCrypto/encryptsave.cpp diff --git a/cpp/src/ToxCrypto/generated/constants.h b/lib/src/main/cpp/ToxCrypto/generated/constants.h similarity index 100% rename from cpp/src/ToxCrypto/generated/constants.h rename to lib/src/main/cpp/ToxCrypto/generated/constants.h diff --git a/cpp/src/ToxCrypto/generated/errors.cpp b/lib/src/main/cpp/ToxCrypto/generated/errors.cpp similarity index 100% rename from cpp/src/ToxCrypto/generated/errors.cpp rename to lib/src/main/cpp/ToxCrypto/generated/errors.cpp diff --git a/cpp/src/ToxCrypto/generated/im_tox_tox4j_impl_jni_ToxCryptoJni.h b/lib/src/main/cpp/ToxCrypto/generated/im_tox_tox4j_impl_jni_ToxCryptoJni.h similarity index 100% rename from cpp/src/ToxCrypto/generated/im_tox_tox4j_impl_jni_ToxCryptoJni.h rename to lib/src/main/cpp/ToxCrypto/generated/im_tox_tox4j_impl_jni_ToxCryptoJni.h diff --git a/cpp/src/ToxCrypto/generated/natives.h b/lib/src/main/cpp/ToxCrypto/generated/natives.h similarity index 100% rename from cpp/src/ToxCrypto/generated/natives.h rename to lib/src/main/cpp/ToxCrypto/generated/natives.h diff --git a/cpp/src/ToxCrypto/hash.cpp b/lib/src/main/cpp/ToxCrypto/hash.cpp similarity index 100% rename from cpp/src/ToxCrypto/hash.cpp rename to lib/src/main/cpp/ToxCrypto/hash.cpp diff --git a/cpp/src/cpp14compat.h b/lib/src/main/cpp/cpp14compat.h similarity index 100% rename from cpp/src/cpp14compat.h rename to lib/src/main/cpp/cpp14compat.h diff --git a/cpp/src/libtox4j-c.ld b/lib/src/main/cpp/libtox4j-c.ld similarity index 100% rename from cpp/src/libtox4j-c.ld rename to lib/src/main/cpp/libtox4j-c.ld diff --git a/cpp/src/tox/av.cpp b/lib/src/main/cpp/tox/av.cpp similarity index 100% rename from cpp/src/tox/av.cpp rename to lib/src/main/cpp/tox/av.cpp diff --git a/cpp/src/tox/av.h b/lib/src/main/cpp/tox/av.h similarity index 100% rename from cpp/src/tox/av.h rename to lib/src/main/cpp/tox/av.h diff --git a/cpp/src/tox/common.h b/lib/src/main/cpp/tox/common.h similarity index 100% rename from cpp/src/tox/common.h rename to lib/src/main/cpp/tox/common.h diff --git a/cpp/src/tox/core.cpp b/lib/src/main/cpp/tox/core.cpp similarity index 100% rename from cpp/src/tox/core.cpp rename to lib/src/main/cpp/tox/core.cpp diff --git a/cpp/src/tox/core.h b/lib/src/main/cpp/tox/core.h similarity index 100% rename from cpp/src/tox/core.h rename to lib/src/main/cpp/tox/core.h diff --git a/cpp/src/tox/generated/av.h b/lib/src/main/cpp/tox/generated/av.h similarity index 100% rename from cpp/src/tox/generated/av.h rename to lib/src/main/cpp/tox/generated/av.h diff --git a/cpp/src/tox/generated/core.h b/lib/src/main/cpp/tox/generated/core.h similarity index 100% rename from cpp/src/tox/generated/core.h rename to lib/src/main/cpp/tox/generated/core.h diff --git a/cpp/src/tox4j/Tox4j.h b/lib/src/main/cpp/tox4j/Tox4j.h similarity index 100% rename from cpp/src/tox4j/Tox4j.h rename to lib/src/main/cpp/tox4j/Tox4j.h diff --git a/cpp/src/tox4j/ToxInstances.h b/lib/src/main/cpp/tox4j/ToxInstances.h similarity index 100% rename from cpp/src/tox4j/ToxInstances.h rename to lib/src/main/cpp/tox4j/ToxInstances.h diff --git a/lib/src/main/cpp/util/ProtoLog.proto b/lib/src/main/cpp/util/ProtoLog.proto new file mode 120000 index 000000000..7cbe42a65 --- /dev/null +++ b/lib/src/main/cpp/util/ProtoLog.proto @@ -0,0 +1 @@ +../../proto/ProtoLog.proto \ No newline at end of file diff --git a/cpp/src/util/debug_log.cpp b/lib/src/main/cpp/util/debug_log.cpp similarity index 100% rename from cpp/src/util/debug_log.cpp rename to lib/src/main/cpp/util/debug_log.cpp diff --git a/cpp/src/util/debug_log.h b/lib/src/main/cpp/util/debug_log.h similarity index 100% rename from cpp/src/util/debug_log.h rename to lib/src/main/cpp/util/debug_log.h diff --git a/cpp/src/util/exceptions.cpp b/lib/src/main/cpp/util/exceptions.cpp similarity index 100% rename from cpp/src/util/exceptions.cpp rename to lib/src/main/cpp/util/exceptions.cpp diff --git a/cpp/src/util/exceptions.h b/lib/src/main/cpp/util/exceptions.h similarity index 100% rename from cpp/src/util/exceptions.h rename to lib/src/main/cpp/util/exceptions.h diff --git a/cpp/src/util/instance_manager.h b/lib/src/main/cpp/util/instance_manager.h similarity index 100% rename from cpp/src/util/instance_manager.h rename to lib/src/main/cpp/util/instance_manager.h diff --git a/cpp/src/util/jni/ArrayFromJava.cpp b/lib/src/main/cpp/util/jni/ArrayFromJava.cpp similarity index 100% rename from cpp/src/util/jni/ArrayFromJava.cpp rename to lib/src/main/cpp/util/jni/ArrayFromJava.cpp diff --git a/cpp/src/util/jni/ArrayFromJava.h b/lib/src/main/cpp/util/jni/ArrayFromJava.h similarity index 100% rename from cpp/src/util/jni/ArrayFromJava.h rename to lib/src/main/cpp/util/jni/ArrayFromJava.h diff --git a/cpp/src/util/jni/ArrayToJava.cpp b/lib/src/main/cpp/util/jni/ArrayToJava.cpp similarity index 100% rename from cpp/src/util/jni/ArrayToJava.cpp rename to lib/src/main/cpp/util/jni/ArrayToJava.cpp diff --git a/cpp/src/util/jni/ArrayToJava.h b/lib/src/main/cpp/util/jni/ArrayToJava.h similarity index 100% rename from cpp/src/util/jni/ArrayToJava.h rename to lib/src/main/cpp/util/jni/ArrayToJava.h diff --git a/cpp/src/util/jni/Enum.h b/lib/src/main/cpp/util/jni/Enum.h similarity index 100% rename from cpp/src/util/jni/Enum.h rename to lib/src/main/cpp/util/jni/Enum.h diff --git a/cpp/src/util/jni/UTFChars.cpp b/lib/src/main/cpp/util/jni/UTFChars.cpp similarity index 100% rename from cpp/src/util/jni/UTFChars.cpp rename to lib/src/main/cpp/util/jni/UTFChars.cpp diff --git a/cpp/src/util/jni/UTFChars.h b/lib/src/main/cpp/util/jni/UTFChars.h similarity index 100% rename from cpp/src/util/jni/UTFChars.h rename to lib/src/main/cpp/util/jni/UTFChars.h diff --git a/cpp/src/util/logging.cpp b/lib/src/main/cpp/util/logging.cpp similarity index 100% rename from cpp/src/util/logging.cpp rename to lib/src/main/cpp/util/logging.cpp diff --git a/cpp/src/util/logging.h b/lib/src/main/cpp/util/logging.h similarity index 100% rename from cpp/src/util/logging.h rename to lib/src/main/cpp/util/logging.h diff --git a/cpp/src/util/pp_attributes.h b/lib/src/main/cpp/util/pp_attributes.h similarity index 100% rename from cpp/src/util/pp_attributes.h rename to lib/src/main/cpp/util/pp_attributes.h diff --git a/cpp/src/util/pp_cat.h b/lib/src/main/cpp/util/pp_cat.h similarity index 100% rename from cpp/src/util/pp_cat.h rename to lib/src/main/cpp/util/pp_cat.h diff --git a/cpp/src/util/to_bytes.cpp b/lib/src/main/cpp/util/to_bytes.cpp similarity index 100% rename from cpp/src/util/to_bytes.cpp rename to lib/src/main/cpp/util/to_bytes.cpp diff --git a/cpp/src/util/to_bytes.h b/lib/src/main/cpp/util/to_bytes.h similarity index 100% rename from cpp/src/util/to_bytes.h rename to lib/src/main/cpp/util/to_bytes.h diff --git a/cpp/src/util/unused.h b/lib/src/main/cpp/util/unused.h similarity index 100% rename from cpp/src/util/unused.h rename to lib/src/main/cpp/util/unused.h diff --git a/cpp/src/util/wrap_void.h b/lib/src/main/cpp/util/wrap_void.h similarity index 100% rename from cpp/src/util/wrap_void.h rename to lib/src/main/cpp/util/wrap_void.h diff --git a/src/main/java/im/tox/core/network/Port.kt b/lib/src/main/java/im/tox/core/network/Port.kt similarity index 100% rename from src/main/java/im/tox/core/network/Port.kt rename to lib/src/main/java/im/tox/core/network/Port.kt diff --git a/src/main/java/im/tox/tox4j/ToxEventListener.kt b/lib/src/main/java/im/tox/tox4j/ToxEventListener.kt similarity index 100% rename from src/main/java/im/tox/tox4j/ToxEventListener.kt rename to lib/src/main/java/im/tox/tox4j/ToxEventListener.kt diff --git a/src/main/java/im/tox/tox4j/av/ToxAv.kt b/lib/src/main/java/im/tox/tox4j/av/ToxAv.kt similarity index 100% rename from src/main/java/im/tox/tox4j/av/ToxAv.kt rename to lib/src/main/java/im/tox/tox4j/av/ToxAv.kt diff --git a/src/main/java/im/tox/tox4j/av/callbacks/AudioBitRateCallback.kt b/lib/src/main/java/im/tox/tox4j/av/callbacks/AudioBitRateCallback.kt similarity index 100% rename from src/main/java/im/tox/tox4j/av/callbacks/AudioBitRateCallback.kt rename to lib/src/main/java/im/tox/tox4j/av/callbacks/AudioBitRateCallback.kt diff --git a/src/main/java/im/tox/tox4j/av/callbacks/AudioReceiveFrameCallback.kt b/lib/src/main/java/im/tox/tox4j/av/callbacks/AudioReceiveFrameCallback.kt similarity index 100% rename from src/main/java/im/tox/tox4j/av/callbacks/AudioReceiveFrameCallback.kt rename to lib/src/main/java/im/tox/tox4j/av/callbacks/AudioReceiveFrameCallback.kt diff --git a/src/main/java/im/tox/tox4j/av/callbacks/CallCallback.kt b/lib/src/main/java/im/tox/tox4j/av/callbacks/CallCallback.kt similarity index 100% rename from src/main/java/im/tox/tox4j/av/callbacks/CallCallback.kt rename to lib/src/main/java/im/tox/tox4j/av/callbacks/CallCallback.kt diff --git a/src/main/java/im/tox/tox4j/av/callbacks/CallStateCallback.kt b/lib/src/main/java/im/tox/tox4j/av/callbacks/CallStateCallback.kt similarity index 100% rename from src/main/java/im/tox/tox4j/av/callbacks/CallStateCallback.kt rename to lib/src/main/java/im/tox/tox4j/av/callbacks/CallStateCallback.kt diff --git a/src/main/java/im/tox/tox4j/av/callbacks/ToxAvEventListener.kt b/lib/src/main/java/im/tox/tox4j/av/callbacks/ToxAvEventListener.kt similarity index 100% rename from src/main/java/im/tox/tox4j/av/callbacks/ToxAvEventListener.kt rename to lib/src/main/java/im/tox/tox4j/av/callbacks/ToxAvEventListener.kt diff --git a/src/main/java/im/tox/tox4j/av/callbacks/VideoBitRateCallback.kt b/lib/src/main/java/im/tox/tox4j/av/callbacks/VideoBitRateCallback.kt similarity index 100% rename from src/main/java/im/tox/tox4j/av/callbacks/VideoBitRateCallback.kt rename to lib/src/main/java/im/tox/tox4j/av/callbacks/VideoBitRateCallback.kt diff --git a/src/main/java/im/tox/tox4j/av/callbacks/VideoReceiveFrameCallback.kt b/lib/src/main/java/im/tox/tox4j/av/callbacks/VideoReceiveFrameCallback.kt similarity index 100% rename from src/main/java/im/tox/tox4j/av/callbacks/VideoReceiveFrameCallback.kt rename to lib/src/main/java/im/tox/tox4j/av/callbacks/VideoReceiveFrameCallback.kt diff --git a/src/main/java/im/tox/tox4j/av/data/AudioChannels.kt b/lib/src/main/java/im/tox/tox4j/av/data/AudioChannels.kt similarity index 100% rename from src/main/java/im/tox/tox4j/av/data/AudioChannels.kt rename to lib/src/main/java/im/tox/tox4j/av/data/AudioChannels.kt diff --git a/src/main/java/im/tox/tox4j/av/data/AudioLength.kt b/lib/src/main/java/im/tox/tox4j/av/data/AudioLength.kt similarity index 100% rename from src/main/java/im/tox/tox4j/av/data/AudioLength.kt rename to lib/src/main/java/im/tox/tox4j/av/data/AudioLength.kt diff --git a/src/main/java/im/tox/tox4j/av/data/BitRate.kt b/lib/src/main/java/im/tox/tox4j/av/data/BitRate.kt similarity index 100% rename from src/main/java/im/tox/tox4j/av/data/BitRate.kt rename to lib/src/main/java/im/tox/tox4j/av/data/BitRate.kt diff --git a/src/main/java/im/tox/tox4j/av/data/Height.kt b/lib/src/main/java/im/tox/tox4j/av/data/Height.kt similarity index 100% rename from src/main/java/im/tox/tox4j/av/data/Height.kt rename to lib/src/main/java/im/tox/tox4j/av/data/Height.kt diff --git a/src/main/java/im/tox/tox4j/av/data/SampleCount.kt b/lib/src/main/java/im/tox/tox4j/av/data/SampleCount.kt similarity index 100% rename from src/main/java/im/tox/tox4j/av/data/SampleCount.kt rename to lib/src/main/java/im/tox/tox4j/av/data/SampleCount.kt diff --git a/src/main/java/im/tox/tox4j/av/data/SamplingRate.kt b/lib/src/main/java/im/tox/tox4j/av/data/SamplingRate.kt similarity index 100% rename from src/main/java/im/tox/tox4j/av/data/SamplingRate.kt rename to lib/src/main/java/im/tox/tox4j/av/data/SamplingRate.kt diff --git a/src/main/java/im/tox/tox4j/av/data/Width.kt b/lib/src/main/java/im/tox/tox4j/av/data/Width.kt similarity index 100% rename from src/main/java/im/tox/tox4j/av/data/Width.kt rename to lib/src/main/java/im/tox/tox4j/av/data/Width.kt diff --git a/src/main/java/im/tox/tox4j/av/enums/ToxavCallControl.java b/lib/src/main/java/im/tox/tox4j/av/enums/ToxavCallControl.java similarity index 100% rename from src/main/java/im/tox/tox4j/av/enums/ToxavCallControl.java rename to lib/src/main/java/im/tox/tox4j/av/enums/ToxavCallControl.java diff --git a/src/main/java/im/tox/tox4j/av/enums/ToxavFriendCallState.java b/lib/src/main/java/im/tox/tox4j/av/enums/ToxavFriendCallState.java similarity index 100% rename from src/main/java/im/tox/tox4j/av/enums/ToxavFriendCallState.java rename to lib/src/main/java/im/tox/tox4j/av/enums/ToxavFriendCallState.java diff --git a/src/main/java/im/tox/tox4j/av/exceptions/Makefile b/lib/src/main/java/im/tox/tox4j/av/exceptions/Makefile similarity index 100% rename from src/main/java/im/tox/tox4j/av/exceptions/Makefile rename to lib/src/main/java/im/tox/tox4j/av/exceptions/Makefile diff --git a/src/main/java/im/tox/tox4j/av/exceptions/ToxavAnswerException.java b/lib/src/main/java/im/tox/tox4j/av/exceptions/ToxavAnswerException.java similarity index 100% rename from src/main/java/im/tox/tox4j/av/exceptions/ToxavAnswerException.java rename to lib/src/main/java/im/tox/tox4j/av/exceptions/ToxavAnswerException.java diff --git a/src/main/java/im/tox/tox4j/av/exceptions/ToxavBitRateSetException.java b/lib/src/main/java/im/tox/tox4j/av/exceptions/ToxavBitRateSetException.java similarity index 100% rename from src/main/java/im/tox/tox4j/av/exceptions/ToxavBitRateSetException.java rename to lib/src/main/java/im/tox/tox4j/av/exceptions/ToxavBitRateSetException.java diff --git a/src/main/java/im/tox/tox4j/av/exceptions/ToxavCallControlException.java b/lib/src/main/java/im/tox/tox4j/av/exceptions/ToxavCallControlException.java similarity index 100% rename from src/main/java/im/tox/tox4j/av/exceptions/ToxavCallControlException.java rename to lib/src/main/java/im/tox/tox4j/av/exceptions/ToxavCallControlException.java diff --git a/src/main/java/im/tox/tox4j/av/exceptions/ToxavCallException.java b/lib/src/main/java/im/tox/tox4j/av/exceptions/ToxavCallException.java similarity index 100% rename from src/main/java/im/tox/tox4j/av/exceptions/ToxavCallException.java rename to lib/src/main/java/im/tox/tox4j/av/exceptions/ToxavCallException.java diff --git a/src/main/java/im/tox/tox4j/av/exceptions/ToxavNewException.java b/lib/src/main/java/im/tox/tox4j/av/exceptions/ToxavNewException.java similarity index 100% rename from src/main/java/im/tox/tox4j/av/exceptions/ToxavNewException.java rename to lib/src/main/java/im/tox/tox4j/av/exceptions/ToxavNewException.java diff --git a/src/main/java/im/tox/tox4j/av/exceptions/ToxavSendFrameException.java b/lib/src/main/java/im/tox/tox4j/av/exceptions/ToxavSendFrameException.java similarity index 100% rename from src/main/java/im/tox/tox4j/av/exceptions/ToxavSendFrameException.java rename to lib/src/main/java/im/tox/tox4j/av/exceptions/ToxavSendFrameException.java diff --git a/src/main/java/im/tox/tox4j/av/exceptions/exceptions.json b/lib/src/main/java/im/tox/tox4j/av/exceptions/exceptions.json similarity index 100% rename from src/main/java/im/tox/tox4j/av/exceptions/exceptions.json rename to lib/src/main/java/im/tox/tox4j/av/exceptions/exceptions.json diff --git a/src/main/java/im/tox/tox4j/core/ToxCore.kt b/lib/src/main/java/im/tox/tox4j/core/ToxCore.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/ToxCore.kt rename to lib/src/main/java/im/tox/tox4j/core/ToxCore.kt diff --git a/src/main/java/im/tox/tox4j/core/ToxCoreConstants.kt b/lib/src/main/java/im/tox/tox4j/core/ToxCoreConstants.kt similarity index 96% rename from src/main/java/im/tox/tox4j/core/ToxCoreConstants.kt rename to lib/src/main/java/im/tox/tox4j/core/ToxCoreConstants.kt index cf1bf542c..d5aa912b2 100644 --- a/src/main/java/im/tox/tox4j/core/ToxCoreConstants.kt +++ b/lib/src/main/java/im/tox/tox4j/core/ToxCoreConstants.kt @@ -32,7 +32,7 @@ object ToxCoreConstants { /** Maximum length of a single message after which it should be split. */ val MaxMessageLength = 1372 - /** Maximum size of custom packets. TODO: should be LENGTH? */ + /** Maximum size of custom packets. */ val MaxCustomPacketSize = 1373 /** Maximum file name length for file transfers. */ diff --git a/src/main/java/im/tox/tox4j/core/callbacks/FileChunkRequestCallback.kt b/lib/src/main/java/im/tox/tox4j/core/callbacks/FileChunkRequestCallback.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/callbacks/FileChunkRequestCallback.kt rename to lib/src/main/java/im/tox/tox4j/core/callbacks/FileChunkRequestCallback.kt diff --git a/src/main/java/im/tox/tox4j/core/callbacks/FileRecvCallback.kt b/lib/src/main/java/im/tox/tox4j/core/callbacks/FileRecvCallback.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/callbacks/FileRecvCallback.kt rename to lib/src/main/java/im/tox/tox4j/core/callbacks/FileRecvCallback.kt diff --git a/src/main/java/im/tox/tox4j/core/callbacks/FileRecvChunkCallback.kt b/lib/src/main/java/im/tox/tox4j/core/callbacks/FileRecvChunkCallback.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/callbacks/FileRecvChunkCallback.kt rename to lib/src/main/java/im/tox/tox4j/core/callbacks/FileRecvChunkCallback.kt diff --git a/src/main/java/im/tox/tox4j/core/callbacks/FileRecvControlCallback.kt b/lib/src/main/java/im/tox/tox4j/core/callbacks/FileRecvControlCallback.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/callbacks/FileRecvControlCallback.kt rename to lib/src/main/java/im/tox/tox4j/core/callbacks/FileRecvControlCallback.kt diff --git a/src/main/java/im/tox/tox4j/core/callbacks/FriendConnectionStatusCallback.kt b/lib/src/main/java/im/tox/tox4j/core/callbacks/FriendConnectionStatusCallback.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/callbacks/FriendConnectionStatusCallback.kt rename to lib/src/main/java/im/tox/tox4j/core/callbacks/FriendConnectionStatusCallback.kt diff --git a/src/main/java/im/tox/tox4j/core/callbacks/FriendLosslessPacketCallback.kt b/lib/src/main/java/im/tox/tox4j/core/callbacks/FriendLosslessPacketCallback.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/callbacks/FriendLosslessPacketCallback.kt rename to lib/src/main/java/im/tox/tox4j/core/callbacks/FriendLosslessPacketCallback.kt diff --git a/src/main/java/im/tox/tox4j/core/callbacks/FriendLossyPacketCallback.kt b/lib/src/main/java/im/tox/tox4j/core/callbacks/FriendLossyPacketCallback.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/callbacks/FriendLossyPacketCallback.kt rename to lib/src/main/java/im/tox/tox4j/core/callbacks/FriendLossyPacketCallback.kt diff --git a/src/main/java/im/tox/tox4j/core/callbacks/FriendMessageCallback.kt b/lib/src/main/java/im/tox/tox4j/core/callbacks/FriendMessageCallback.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/callbacks/FriendMessageCallback.kt rename to lib/src/main/java/im/tox/tox4j/core/callbacks/FriendMessageCallback.kt diff --git a/src/main/java/im/tox/tox4j/core/callbacks/FriendNameCallback.kt b/lib/src/main/java/im/tox/tox4j/core/callbacks/FriendNameCallback.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/callbacks/FriendNameCallback.kt rename to lib/src/main/java/im/tox/tox4j/core/callbacks/FriendNameCallback.kt diff --git a/src/main/java/im/tox/tox4j/core/callbacks/FriendReadReceiptCallback.kt b/lib/src/main/java/im/tox/tox4j/core/callbacks/FriendReadReceiptCallback.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/callbacks/FriendReadReceiptCallback.kt rename to lib/src/main/java/im/tox/tox4j/core/callbacks/FriendReadReceiptCallback.kt diff --git a/src/main/java/im/tox/tox4j/core/callbacks/FriendRequestCallback.kt b/lib/src/main/java/im/tox/tox4j/core/callbacks/FriendRequestCallback.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/callbacks/FriendRequestCallback.kt rename to lib/src/main/java/im/tox/tox4j/core/callbacks/FriendRequestCallback.kt diff --git a/src/main/java/im/tox/tox4j/core/callbacks/FriendStatusCallback.kt b/lib/src/main/java/im/tox/tox4j/core/callbacks/FriendStatusCallback.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/callbacks/FriendStatusCallback.kt rename to lib/src/main/java/im/tox/tox4j/core/callbacks/FriendStatusCallback.kt diff --git a/src/main/java/im/tox/tox4j/core/callbacks/FriendStatusMessageCallback.kt b/lib/src/main/java/im/tox/tox4j/core/callbacks/FriendStatusMessageCallback.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/callbacks/FriendStatusMessageCallback.kt rename to lib/src/main/java/im/tox/tox4j/core/callbacks/FriendStatusMessageCallback.kt diff --git a/src/main/java/im/tox/tox4j/core/callbacks/FriendTypingCallback.kt b/lib/src/main/java/im/tox/tox4j/core/callbacks/FriendTypingCallback.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/callbacks/FriendTypingCallback.kt rename to lib/src/main/java/im/tox/tox4j/core/callbacks/FriendTypingCallback.kt diff --git a/src/main/java/im/tox/tox4j/core/callbacks/SelfConnectionStatusCallback.kt b/lib/src/main/java/im/tox/tox4j/core/callbacks/SelfConnectionStatusCallback.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/callbacks/SelfConnectionStatusCallback.kt rename to lib/src/main/java/im/tox/tox4j/core/callbacks/SelfConnectionStatusCallback.kt diff --git a/src/main/java/im/tox/tox4j/core/callbacks/ToxCoreEventAdapter.kt b/lib/src/main/java/im/tox/tox4j/core/callbacks/ToxCoreEventAdapter.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/callbacks/ToxCoreEventAdapter.kt rename to lib/src/main/java/im/tox/tox4j/core/callbacks/ToxCoreEventAdapter.kt diff --git a/src/main/java/im/tox/tox4j/core/callbacks/ToxCoreEventListener.kt b/lib/src/main/java/im/tox/tox4j/core/callbacks/ToxCoreEventListener.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/callbacks/ToxCoreEventListener.kt rename to lib/src/main/java/im/tox/tox4j/core/callbacks/ToxCoreEventListener.kt diff --git a/src/main/java/im/tox/tox4j/core/data/ToxFileId.kt b/lib/src/main/java/im/tox/tox4j/core/data/ToxFileId.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/data/ToxFileId.kt rename to lib/src/main/java/im/tox/tox4j/core/data/ToxFileId.kt diff --git a/src/main/java/im/tox/tox4j/core/data/ToxFilename.kt b/lib/src/main/java/im/tox/tox4j/core/data/ToxFilename.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/data/ToxFilename.kt rename to lib/src/main/java/im/tox/tox4j/core/data/ToxFilename.kt diff --git a/src/main/java/im/tox/tox4j/core/data/ToxFriendAddress.kt b/lib/src/main/java/im/tox/tox4j/core/data/ToxFriendAddress.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/data/ToxFriendAddress.kt rename to lib/src/main/java/im/tox/tox4j/core/data/ToxFriendAddress.kt diff --git a/src/main/java/im/tox/tox4j/core/data/ToxFriendMessage.kt b/lib/src/main/java/im/tox/tox4j/core/data/ToxFriendMessage.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/data/ToxFriendMessage.kt rename to lib/src/main/java/im/tox/tox4j/core/data/ToxFriendMessage.kt diff --git a/src/main/java/im/tox/tox4j/core/data/ToxFriendNumber.kt b/lib/src/main/java/im/tox/tox4j/core/data/ToxFriendNumber.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/data/ToxFriendNumber.kt rename to lib/src/main/java/im/tox/tox4j/core/data/ToxFriendNumber.kt diff --git a/src/main/java/im/tox/tox4j/core/data/ToxFriendRequestMessage.kt b/lib/src/main/java/im/tox/tox4j/core/data/ToxFriendRequestMessage.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/data/ToxFriendRequestMessage.kt rename to lib/src/main/java/im/tox/tox4j/core/data/ToxFriendRequestMessage.kt diff --git a/src/main/java/im/tox/tox4j/core/data/ToxLosslessPacket.kt b/lib/src/main/java/im/tox/tox4j/core/data/ToxLosslessPacket.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/data/ToxLosslessPacket.kt rename to lib/src/main/java/im/tox/tox4j/core/data/ToxLosslessPacket.kt diff --git a/src/main/java/im/tox/tox4j/core/data/ToxLossyPacket.kt b/lib/src/main/java/im/tox/tox4j/core/data/ToxLossyPacket.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/data/ToxLossyPacket.kt rename to lib/src/main/java/im/tox/tox4j/core/data/ToxLossyPacket.kt diff --git a/src/main/java/im/tox/tox4j/core/data/ToxNickname.kt b/lib/src/main/java/im/tox/tox4j/core/data/ToxNickname.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/data/ToxNickname.kt rename to lib/src/main/java/im/tox/tox4j/core/data/ToxNickname.kt diff --git a/src/main/java/im/tox/tox4j/core/data/ToxPublicKey.kt b/lib/src/main/java/im/tox/tox4j/core/data/ToxPublicKey.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/data/ToxPublicKey.kt rename to lib/src/main/java/im/tox/tox4j/core/data/ToxPublicKey.kt diff --git a/src/main/java/im/tox/tox4j/core/data/ToxSecretKey.kt b/lib/src/main/java/im/tox/tox4j/core/data/ToxSecretKey.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/data/ToxSecretKey.kt rename to lib/src/main/java/im/tox/tox4j/core/data/ToxSecretKey.kt diff --git a/src/main/java/im/tox/tox4j/core/data/ToxStatusMessage.kt b/lib/src/main/java/im/tox/tox4j/core/data/ToxStatusMessage.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/data/ToxStatusMessage.kt rename to lib/src/main/java/im/tox/tox4j/core/data/ToxStatusMessage.kt diff --git a/src/main/java/im/tox/tox4j/core/enums/ToxConnection.java b/lib/src/main/java/im/tox/tox4j/core/enums/ToxConnection.java similarity index 100% rename from src/main/java/im/tox/tox4j/core/enums/ToxConnection.java rename to lib/src/main/java/im/tox/tox4j/core/enums/ToxConnection.java diff --git a/src/main/java/im/tox/tox4j/core/enums/ToxFileControl.java b/lib/src/main/java/im/tox/tox4j/core/enums/ToxFileControl.java similarity index 100% rename from src/main/java/im/tox/tox4j/core/enums/ToxFileControl.java rename to lib/src/main/java/im/tox/tox4j/core/enums/ToxFileControl.java diff --git a/src/main/java/im/tox/tox4j/core/enums/ToxFileKind.java b/lib/src/main/java/im/tox/tox4j/core/enums/ToxFileKind.java similarity index 100% rename from src/main/java/im/tox/tox4j/core/enums/ToxFileKind.java rename to lib/src/main/java/im/tox/tox4j/core/enums/ToxFileKind.java diff --git a/src/main/java/im/tox/tox4j/core/enums/ToxMessageType.java b/lib/src/main/java/im/tox/tox4j/core/enums/ToxMessageType.java similarity index 100% rename from src/main/java/im/tox/tox4j/core/enums/ToxMessageType.java rename to lib/src/main/java/im/tox/tox4j/core/enums/ToxMessageType.java diff --git a/src/main/java/im/tox/tox4j/core/enums/ToxProxyType.java b/lib/src/main/java/im/tox/tox4j/core/enums/ToxProxyType.java similarity index 100% rename from src/main/java/im/tox/tox4j/core/enums/ToxProxyType.java rename to lib/src/main/java/im/tox/tox4j/core/enums/ToxProxyType.java diff --git a/src/main/java/im/tox/tox4j/core/enums/ToxSavedataType.java b/lib/src/main/java/im/tox/tox4j/core/enums/ToxSavedataType.java similarity index 100% rename from src/main/java/im/tox/tox4j/core/enums/ToxSavedataType.java rename to lib/src/main/java/im/tox/tox4j/core/enums/ToxSavedataType.java diff --git a/src/main/java/im/tox/tox4j/core/enums/ToxUserStatus.java b/lib/src/main/java/im/tox/tox4j/core/enums/ToxUserStatus.java similarity index 100% rename from src/main/java/im/tox/tox4j/core/enums/ToxUserStatus.java rename to lib/src/main/java/im/tox/tox4j/core/enums/ToxUserStatus.java diff --git a/src/main/java/im/tox/tox4j/core/exceptions/Makefile b/lib/src/main/java/im/tox/tox4j/core/exceptions/Makefile similarity index 100% rename from src/main/java/im/tox/tox4j/core/exceptions/Makefile rename to lib/src/main/java/im/tox/tox4j/core/exceptions/Makefile diff --git a/src/main/java/im/tox/tox4j/core/exceptions/ToxBootstrapException.java b/lib/src/main/java/im/tox/tox4j/core/exceptions/ToxBootstrapException.java similarity index 100% rename from src/main/java/im/tox/tox4j/core/exceptions/ToxBootstrapException.java rename to lib/src/main/java/im/tox/tox4j/core/exceptions/ToxBootstrapException.java diff --git a/src/main/java/im/tox/tox4j/core/exceptions/ToxFileControlException.java b/lib/src/main/java/im/tox/tox4j/core/exceptions/ToxFileControlException.java similarity index 100% rename from src/main/java/im/tox/tox4j/core/exceptions/ToxFileControlException.java rename to lib/src/main/java/im/tox/tox4j/core/exceptions/ToxFileControlException.java diff --git a/src/main/java/im/tox/tox4j/core/exceptions/ToxFileGetException.java b/lib/src/main/java/im/tox/tox4j/core/exceptions/ToxFileGetException.java similarity index 100% rename from src/main/java/im/tox/tox4j/core/exceptions/ToxFileGetException.java rename to lib/src/main/java/im/tox/tox4j/core/exceptions/ToxFileGetException.java diff --git a/src/main/java/im/tox/tox4j/core/exceptions/ToxFileSeekException.java b/lib/src/main/java/im/tox/tox4j/core/exceptions/ToxFileSeekException.java similarity index 100% rename from src/main/java/im/tox/tox4j/core/exceptions/ToxFileSeekException.java rename to lib/src/main/java/im/tox/tox4j/core/exceptions/ToxFileSeekException.java diff --git a/src/main/java/im/tox/tox4j/core/exceptions/ToxFileSendChunkException.java b/lib/src/main/java/im/tox/tox4j/core/exceptions/ToxFileSendChunkException.java similarity index 100% rename from src/main/java/im/tox/tox4j/core/exceptions/ToxFileSendChunkException.java rename to lib/src/main/java/im/tox/tox4j/core/exceptions/ToxFileSendChunkException.java diff --git a/src/main/java/im/tox/tox4j/core/exceptions/ToxFileSendException.java b/lib/src/main/java/im/tox/tox4j/core/exceptions/ToxFileSendException.java similarity index 100% rename from src/main/java/im/tox/tox4j/core/exceptions/ToxFileSendException.java rename to lib/src/main/java/im/tox/tox4j/core/exceptions/ToxFileSendException.java diff --git a/src/main/java/im/tox/tox4j/core/exceptions/ToxFriendAddException.java b/lib/src/main/java/im/tox/tox4j/core/exceptions/ToxFriendAddException.java similarity index 100% rename from src/main/java/im/tox/tox4j/core/exceptions/ToxFriendAddException.java rename to lib/src/main/java/im/tox/tox4j/core/exceptions/ToxFriendAddException.java diff --git a/src/main/java/im/tox/tox4j/core/exceptions/ToxFriendByPublicKeyException.java b/lib/src/main/java/im/tox/tox4j/core/exceptions/ToxFriendByPublicKeyException.java similarity index 100% rename from src/main/java/im/tox/tox4j/core/exceptions/ToxFriendByPublicKeyException.java rename to lib/src/main/java/im/tox/tox4j/core/exceptions/ToxFriendByPublicKeyException.java diff --git a/src/main/java/im/tox/tox4j/core/exceptions/ToxFriendCustomPacketException.java b/lib/src/main/java/im/tox/tox4j/core/exceptions/ToxFriendCustomPacketException.java similarity index 100% rename from src/main/java/im/tox/tox4j/core/exceptions/ToxFriendCustomPacketException.java rename to lib/src/main/java/im/tox/tox4j/core/exceptions/ToxFriendCustomPacketException.java diff --git a/src/main/java/im/tox/tox4j/core/exceptions/ToxFriendDeleteException.java b/lib/src/main/java/im/tox/tox4j/core/exceptions/ToxFriendDeleteException.java similarity index 100% rename from src/main/java/im/tox/tox4j/core/exceptions/ToxFriendDeleteException.java rename to lib/src/main/java/im/tox/tox4j/core/exceptions/ToxFriendDeleteException.java diff --git a/src/main/java/im/tox/tox4j/core/exceptions/ToxFriendGetPublicKeyException.java b/lib/src/main/java/im/tox/tox4j/core/exceptions/ToxFriendGetPublicKeyException.java similarity index 100% rename from src/main/java/im/tox/tox4j/core/exceptions/ToxFriendGetPublicKeyException.java rename to lib/src/main/java/im/tox/tox4j/core/exceptions/ToxFriendGetPublicKeyException.java diff --git a/src/main/java/im/tox/tox4j/core/exceptions/ToxFriendSendMessageException.java b/lib/src/main/java/im/tox/tox4j/core/exceptions/ToxFriendSendMessageException.java similarity index 100% rename from src/main/java/im/tox/tox4j/core/exceptions/ToxFriendSendMessageException.java rename to lib/src/main/java/im/tox/tox4j/core/exceptions/ToxFriendSendMessageException.java diff --git a/src/main/java/im/tox/tox4j/core/exceptions/ToxGetPortException.java b/lib/src/main/java/im/tox/tox4j/core/exceptions/ToxGetPortException.java similarity index 100% rename from src/main/java/im/tox/tox4j/core/exceptions/ToxGetPortException.java rename to lib/src/main/java/im/tox/tox4j/core/exceptions/ToxGetPortException.java diff --git a/src/main/java/im/tox/tox4j/core/exceptions/ToxNewException.java b/lib/src/main/java/im/tox/tox4j/core/exceptions/ToxNewException.java similarity index 100% rename from src/main/java/im/tox/tox4j/core/exceptions/ToxNewException.java rename to lib/src/main/java/im/tox/tox4j/core/exceptions/ToxNewException.java diff --git a/src/main/java/im/tox/tox4j/core/exceptions/ToxSetInfoException.java b/lib/src/main/java/im/tox/tox4j/core/exceptions/ToxSetInfoException.java similarity index 100% rename from src/main/java/im/tox/tox4j/core/exceptions/ToxSetInfoException.java rename to lib/src/main/java/im/tox/tox4j/core/exceptions/ToxSetInfoException.java diff --git a/src/main/java/im/tox/tox4j/core/exceptions/ToxSetTypingException.java b/lib/src/main/java/im/tox/tox4j/core/exceptions/ToxSetTypingException.java similarity index 100% rename from src/main/java/im/tox/tox4j/core/exceptions/ToxSetTypingException.java rename to lib/src/main/java/im/tox/tox4j/core/exceptions/ToxSetTypingException.java diff --git a/src/main/java/im/tox/tox4j/core/exceptions/exceptions.json b/lib/src/main/java/im/tox/tox4j/core/exceptions/exceptions.json similarity index 100% rename from src/main/java/im/tox/tox4j/core/exceptions/exceptions.json rename to lib/src/main/java/im/tox/tox4j/core/exceptions/exceptions.json diff --git a/src/main/java/im/tox/tox4j/core/options/ProxyOptions.kt b/lib/src/main/java/im/tox/tox4j/core/options/ProxyOptions.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/options/ProxyOptions.kt rename to lib/src/main/java/im/tox/tox4j/core/options/ProxyOptions.kt diff --git a/src/main/java/im/tox/tox4j/core/options/SaveDataOptions.kt b/lib/src/main/java/im/tox/tox4j/core/options/SaveDataOptions.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/options/SaveDataOptions.kt rename to lib/src/main/java/im/tox/tox4j/core/options/SaveDataOptions.kt diff --git a/src/main/java/im/tox/tox4j/core/options/ToxOptions.kt b/lib/src/main/java/im/tox/tox4j/core/options/ToxOptions.kt similarity index 100% rename from src/main/java/im/tox/tox4j/core/options/ToxOptions.kt rename to lib/src/main/java/im/tox/tox4j/core/options/ToxOptions.kt diff --git a/src/main/java/im/tox/tox4j/crypto/ToxCrypto.kt b/lib/src/main/java/im/tox/tox4j/crypto/ToxCrypto.kt similarity index 100% rename from src/main/java/im/tox/tox4j/crypto/ToxCrypto.kt rename to lib/src/main/java/im/tox/tox4j/crypto/ToxCrypto.kt diff --git a/src/main/java/im/tox/tox4j/crypto/ToxCryptoConstants.kt b/lib/src/main/java/im/tox/tox4j/crypto/ToxCryptoConstants.kt similarity index 100% rename from src/main/java/im/tox/tox4j/crypto/ToxCryptoConstants.kt rename to lib/src/main/java/im/tox/tox4j/crypto/ToxCryptoConstants.kt diff --git a/src/main/java/im/tox/tox4j/crypto/exceptions/Makefile b/lib/src/main/java/im/tox/tox4j/crypto/exceptions/Makefile similarity index 100% rename from src/main/java/im/tox/tox4j/crypto/exceptions/Makefile rename to lib/src/main/java/im/tox/tox4j/crypto/exceptions/Makefile diff --git a/src/main/java/im/tox/tox4j/crypto/exceptions/ToxDecryptionException.java b/lib/src/main/java/im/tox/tox4j/crypto/exceptions/ToxDecryptionException.java similarity index 100% rename from src/main/java/im/tox/tox4j/crypto/exceptions/ToxDecryptionException.java rename to lib/src/main/java/im/tox/tox4j/crypto/exceptions/ToxDecryptionException.java diff --git a/src/main/java/im/tox/tox4j/crypto/exceptions/ToxEncryptionException.java b/lib/src/main/java/im/tox/tox4j/crypto/exceptions/ToxEncryptionException.java similarity index 100% rename from src/main/java/im/tox/tox4j/crypto/exceptions/ToxEncryptionException.java rename to lib/src/main/java/im/tox/tox4j/crypto/exceptions/ToxEncryptionException.java diff --git a/src/main/java/im/tox/tox4j/crypto/exceptions/ToxGetSaltException.java b/lib/src/main/java/im/tox/tox4j/crypto/exceptions/ToxGetSaltException.java similarity index 100% rename from src/main/java/im/tox/tox4j/crypto/exceptions/ToxGetSaltException.java rename to lib/src/main/java/im/tox/tox4j/crypto/exceptions/ToxGetSaltException.java diff --git a/src/main/java/im/tox/tox4j/crypto/exceptions/ToxKeyDerivationException.java b/lib/src/main/java/im/tox/tox4j/crypto/exceptions/ToxKeyDerivationException.java similarity index 100% rename from src/main/java/im/tox/tox4j/crypto/exceptions/ToxKeyDerivationException.java rename to lib/src/main/java/im/tox/tox4j/crypto/exceptions/ToxKeyDerivationException.java diff --git a/src/main/java/im/tox/tox4j/crypto/exceptions/exceptions.json b/lib/src/main/java/im/tox/tox4j/crypto/exceptions/exceptions.json similarity index 100% rename from src/main/java/im/tox/tox4j/crypto/exceptions/exceptions.json rename to lib/src/main/java/im/tox/tox4j/crypto/exceptions/exceptions.json diff --git a/src/main/java/im/tox/tox4j/exceptions/JavaOnly.java b/lib/src/main/java/im/tox/tox4j/exceptions/JavaOnly.java similarity index 100% rename from src/main/java/im/tox/tox4j/exceptions/JavaOnly.java rename to lib/src/main/java/im/tox/tox4j/exceptions/JavaOnly.java diff --git a/src/main/java/im/tox/tox4j/exceptions/ToxException.kt b/lib/src/main/java/im/tox/tox4j/exceptions/ToxException.kt similarity index 100% rename from src/main/java/im/tox/tox4j/exceptions/ToxException.kt rename to lib/src/main/java/im/tox/tox4j/exceptions/ToxException.kt diff --git a/src/main/java/im/tox/tox4j/exceptions/ToxKilledException.java b/lib/src/main/java/im/tox/tox4j/exceptions/ToxKilledException.java similarity index 100% rename from src/main/java/im/tox/tox4j/exceptions/ToxKilledException.java rename to lib/src/main/java/im/tox/tox4j/exceptions/ToxKilledException.java diff --git a/src/main/java/im/tox/tox4j/impl/jni/ToxAvEventDispatch.kt b/lib/src/main/java/im/tox/tox4j/impl/jni/ToxAvEventDispatch.kt similarity index 98% rename from src/main/java/im/tox/tox4j/impl/jni/ToxAvEventDispatch.kt rename to lib/src/main/java/im/tox/tox4j/impl/jni/ToxAvEventDispatch.kt index 17aad4a38..100526e1a 100644 --- a/src/main/java/im/tox/tox4j/impl/jni/ToxAvEventDispatch.kt +++ b/lib/src/main/java/im/tox/tox4j/impl/jni/ToxAvEventDispatch.kt @@ -114,7 +114,7 @@ object ToxAvEventDispatch { ToxFriendNumber(ev.getFriendNumber()), toShortArray(ev.getPcm()), convert(ev.getChannels()), - (SamplingRate.values().filter { it.value == ev.getSamplingRate() })[0], + SamplingRate.values().filter { it.value == ev.getSamplingRate() }[0], next) }) diff --git a/src/main/java/im/tox/tox4j/impl/jni/ToxAvImpl.kt b/lib/src/main/java/im/tox/tox4j/impl/jni/ToxAvImpl.kt similarity index 100% rename from src/main/java/im/tox/tox4j/impl/jni/ToxAvImpl.kt rename to lib/src/main/java/im/tox/tox4j/impl/jni/ToxAvImpl.kt diff --git a/src/main/java/im/tox/tox4j/impl/jni/ToxAvJni.java b/lib/src/main/java/im/tox/tox4j/impl/jni/ToxAvJni.java similarity index 100% rename from src/main/java/im/tox/tox4j/impl/jni/ToxAvJni.java rename to lib/src/main/java/im/tox/tox4j/impl/jni/ToxAvJni.java diff --git a/src/main/java/im/tox/tox4j/impl/jni/ToxCoreEventDispatch.kt b/lib/src/main/java/im/tox/tox4j/impl/jni/ToxCoreEventDispatch.kt similarity index 100% rename from src/main/java/im/tox/tox4j/impl/jni/ToxCoreEventDispatch.kt rename to lib/src/main/java/im/tox/tox4j/impl/jni/ToxCoreEventDispatch.kt diff --git a/src/main/java/im/tox/tox4j/impl/jni/ToxCoreImpl.kt b/lib/src/main/java/im/tox/tox4j/impl/jni/ToxCoreImpl.kt similarity index 100% rename from src/main/java/im/tox/tox4j/impl/jni/ToxCoreImpl.kt rename to lib/src/main/java/im/tox/tox4j/impl/jni/ToxCoreImpl.kt diff --git a/src/main/java/im/tox/tox4j/impl/jni/ToxCoreJni.java b/lib/src/main/java/im/tox/tox4j/impl/jni/ToxCoreJni.java similarity index 100% rename from src/main/java/im/tox/tox4j/impl/jni/ToxCoreJni.java rename to lib/src/main/java/im/tox/tox4j/impl/jni/ToxCoreJni.java diff --git a/src/main/java/im/tox/tox4j/impl/jni/ToxCryptoImpl.kt b/lib/src/main/java/im/tox/tox4j/impl/jni/ToxCryptoImpl.kt similarity index 100% rename from src/main/java/im/tox/tox4j/impl/jni/ToxCryptoImpl.kt rename to lib/src/main/java/im/tox/tox4j/impl/jni/ToxCryptoImpl.kt diff --git a/src/main/java/im/tox/tox4j/impl/jni/ToxCryptoJni.java b/lib/src/main/java/im/tox/tox4j/impl/jni/ToxCryptoJni.java similarity index 100% rename from src/main/java/im/tox/tox4j/impl/jni/ToxCryptoJni.java rename to lib/src/main/java/im/tox/tox4j/impl/jni/ToxCryptoJni.java diff --git a/src/main/java/im/tox/tox4j/mkexceptions b/lib/src/main/java/im/tox/tox4j/mkexceptions similarity index 100% rename from src/main/java/im/tox/tox4j/mkexceptions rename to lib/src/main/java/im/tox/tox4j/mkexceptions diff --git a/src/main/protobuf/Av.proto b/lib/src/main/proto/Av.proto similarity index 100% rename from src/main/protobuf/Av.proto rename to lib/src/main/proto/Av.proto diff --git a/src/main/protobuf/Core.proto b/lib/src/main/proto/Core.proto similarity index 100% rename from src/main/protobuf/Core.proto rename to lib/src/main/proto/Core.proto diff --git a/src/main/protobuf/ProtoLog.proto b/lib/src/main/proto/ProtoLog.proto similarity index 100% rename from src/main/protobuf/ProtoLog.proto rename to lib/src/main/proto/ProtoLog.proto diff --git a/src/test/java/im/tox/tox4j/core/ToxCoreTest.kt b/lib/src/test/java/im/tox/tox4j/core/ToxCoreTest.kt similarity index 100% rename from src/test/java/im/tox/tox4j/core/ToxCoreTest.kt rename to lib/src/test/java/im/tox/tox4j/core/ToxCoreTest.kt diff --git a/scripts/build-host b/scripts/build-host index a53f9a5e3..e0b4f6533 100755 --- a/scripts/build-host +++ b/scripts/build-host @@ -13,9 +13,10 @@ export CC := $(shell which clang || which gcc) export CXX := $(shell which clang++ || which g++) export PKG_CONFIG_PATH := $(PREFIX)/lib/pkgconfig export TOX4J_PLATFORM := $(shell perl -e 'print $$^O')-$(shell uname -m) +export LD_LIBRARY_PATH := $(PREFIX)/lib build: $(PREFIX)/tox4j.stamp - sbt -Djava.library.path=$(PREFIX)/lib "publishLocal" "makeScripts" + ./gradlew build test: build $(MAKE) -C _build/$(TARGET)/tox4j test diff --git a/scripts/dependencies.mk b/scripts/dependencies.mk index 0f83d585d..509b45766 100644 --- a/scripts/dependencies.mk +++ b/scripts/dependencies.mk @@ -1,7 +1,7 @@ PRE_RULE = (echo "=== Building $@ ==="; ls -ld $@; true) && ls -ld $+ POST_RULE = ls -ld $@ -$(BUILDDIR)/tox4j/Makefile: $(CURDIR)/cpp/CMakeLists.txt $(TOOLCHAIN_FILE) $(foreach i,protobuf toxcore,$(PREFIX)/$i.stamp) +$(BUILDDIR)/tox4j/Makefile: $(CURDIR)/lib/src/main/cpp/CMakeLists.txt $(TOOLCHAIN_FILE) $(foreach i,protobuf toxcore,$(PREFIX)/$i.stamp) @$(PRE_RULE) mkdir -p $(@D) cd $(@D) && cmake $(