Merge pull request #201 from tejas238/android-fixes-tejas

upgrade gradle versions and include .cxx bindings

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)

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"

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

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

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.
+ - 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.