diff options
| author | tejas238 <[email protected]> | 2022-11-23 21:32:55 +0530 |
|---|---|---|
| committer | tejas238 <[email protected]> | 2022-11-23 21:32:55 +0530 |
| commit | 038166f9f2a428daa32ad53d8f67758cb073f1d3 (patch) | |
| tree | 8b2012b1839d4c18bf7a3096e7918791245933be | |
| parent | 8d21a265cc23dd6e6e4d2c2ad068e978f110f8e3 (diff) | |
upgrade gradle versions and include .cxx bindings
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | pkg/android/app/build.gradle | 6 | ||||
| -rw-r--r-- | pkg/android/build.gradle | 2 | ||||
| -rw-r--r-- | pkg/android/gradle/wrapper/gradle-wrapper.properties | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a95b8c..1924937 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 ca41335..f806add 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 43c0708..fcafdd4 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 9fe8d05..567ad65 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 |