diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a95b8c5..19249373 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -192,6 +192,8 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Android") set(BUILD_HOST_SELFTEST FALSE) set(BUILD_EXAMPLES FALSE) set(ALLOW_INSTALL_TARGET FALSE) + set(LANG_WRAPPER_FILE ${LIBZT_SRC_DIR}/bindings/java/*.cxx) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DZTS_ENABLE_JAVA=1") endif() if(BUILD_MACOS_FRAMEWORK) diff --git a/pkg/android/app/build.gradle b/pkg/android/app/build.gradle index ca413359..f806add1 100644 --- a/pkg/android/app/build.gradle +++ b/pkg/android/app/build.gradle @@ -1,10 +1,10 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 28 + compileSdkVersion 31 defaultConfig { - minSdkVersion 14 - targetSdkVersion 23 + minSdkVersion 21 + targetSdkVersion 31 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/pkg/android/build.gradle b/pkg/android/build.gradle index 43c07085..fcafdd46 100644 --- a/pkg/android/build.gradle +++ b/pkg/android/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.3' + classpath 'com.android.tools.build:gradle:7.2.1' // NOTE: Do not place your application dependencies here; they belong diff --git a/pkg/android/gradle/wrapper/gradle-wrapper.properties b/pkg/android/gradle/wrapper/gradle-wrapper.properties index 9fe8d05d..567ad65a 100644 --- a/pkg/android/gradle/wrapper/gradle-wrapper.properties +++ b/pkg/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip diff --git a/src/README.md b/src/README.md index 244e119a..60e6f0a5 100644 --- a/src/README.md +++ b/src/README.md @@ -1,4 +1,4 @@ # C++ Source - - C API is exposed via [include/ZeroTierSockets.h](./../include/ZeroTierSocket.h) - - [bindings/](./bindings) Contains the source for wrappers in various languages. See [examples/](./../examples) for their usage. \ No newline at end of file + - C API is exposed via [include/ZeroTierSockets.h](../include/ZeroTierSockets.h) + - [bindings/](./bindings) Contains the source for wrappers in various languages. See [examples/](../examples/) for their usage. \ No newline at end of file