gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade gradle versions and include .cxx bindings

Browse Source
This commit is contained in:
tejas238
2022-11-23 21:32:55 +05:30
parent 8d21a265cc
commit 038166f9f2
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -192,6 +192,8 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Android")
set(BUILD_HOST_SELFTEST FALSE) set(BUILD_HOST_SELFTEST FALSE)
set(BUILD_EXAMPLES FALSE) set(BUILD_EXAMPLES FALSE)
set(ALLOW_INSTALL_TARGET 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() endif()
if(BUILD_MACOS_FRAMEWORK) if(BUILD_MACOS_FRAMEWORK)

6
pkg/android/app/build.gradle
View File

@@ -1,10 +1,10 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
android { android {
compileSdkVersion 28 compileSdkVersion 31
defaultConfig { defaultConfig {
minSdkVersion 14 minSdkVersion 21
targetSdkVersion 23 targetSdkVersion 31
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

2
pkg/android/build.gradle
View File

@@ -7,7 +7,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { 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 // NOTE: Do not place your application dependencies here; they belong

2
pkg/android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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