diff --git a/README.md b/README.md index a468955..11802c1 100644 --- a/README.md +++ b/README.md @@ -2,14 +2,12 @@ curl tool and libcurl static library prefab for android. -Supports SSL, powered by [BoringSSL](https://github.com/vvb2060/BoringSSL_Android). +Supports TLS, powered by [BoringSSL](https://github.com/vvb2060/BoringSSL_Android). Supports HTTP/2, powered by [nghttp2](https://github.com/nghttp2/nghttp2). Supports HTTP/3, powered by BoringSSL backend [ngtcp2](https://github.com/ngtcp2/ngtcp2) and [nghttp3](https://github.com/ngtcp2/nghttp3). -No other protocols supported. - By default, use system built-in CA certificate store, and use system built-in DNS. @@ -20,7 +18,7 @@ If you only want to use curl tool, unzip apk, extract `libcurl.so` and rename it Gradle: ```gradle -implementation 'io.github.vvb2060.ndk:curl:8.2.1' +implementation 'io.github.vvb2060.ndk:curl:8.3.0' ``` This library is [Prefab](https://google.github.io/prefab/), so you will need to enable it in your project (Android Gradle Plugin 4.1+): @@ -73,6 +71,12 @@ target_link_libraries(app curl::curl_static) ## Version +### 8.3.0 +- curl 8.3.0 +- nghttp2 1.56.0 +- nghttp3 0.15.0 +- ngtcp2 0.19.1 + ### 8.2.1 - curl 8.2.1 - nghttp2 1.55.1 diff --git a/curl/build.gradle b/curl/build.gradle index e227416..f630ab3 100644 --- a/curl/build.gradle +++ b/curl/build.gradle @@ -7,10 +7,10 @@ plugins { android { compileSdk = 34 buildToolsVersion = "34.0.0" - ndkVersion = "25.2.9519653" + ndkVersion = "26.0.10636728" namespace = "io.github.vvb2060.ndk.curl" defaultConfig { - minSdk = 19 + minSdk = 21 targetSdk = 34 externalNativeBuild { ndkBuild { @@ -74,7 +74,7 @@ publishing { mavenJava(MavenPublication) { group = "io.github.vvb2060.ndk" artifactId = "curl" - version = "8.2.1" + version = "8.3.0" afterEvaluate { from(components.release) } diff --git a/gradle.properties b/gradle.properties index 0b88863..1bc204c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ android.useAndroidX=true -android.nonTransitiveRClass=true +android.nonFinalResIds=false diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 033e24c..7f93135 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9f4197d..ac72c34 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index fcb6fca..0adc8e1 100755 --- a/gradlew +++ b/gradlew @@ -83,7 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# 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 diff --git a/settings.gradle b/settings.gradle index 2a72f57..b368b37 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,9 +5,9 @@ pluginManagement { mavenCentral() } plugins { - id("com.android.application") version "8.1.0" - id("com.android.library") version "8.1.0" - id("org.jetbrains.kotlin.android") version "1.9.0" + id("com.android.application") version "8.1.1" + id("com.android.library") version "8.1.1" + id("org.jetbrains.kotlin.android") version "1.9.10" } } dependencyResolutionManagement { diff --git a/tool/build.gradle b/tool/build.gradle index a706cc4..bfca38d 100644 --- a/tool/build.gradle +++ b/tool/build.gradle @@ -5,11 +5,11 @@ plugins { android { compileSdk = 34 buildToolsVersion = "34.0.0" - ndkVersion = "25.2.9519653" + ndkVersion = "26.0.10636728" namespace = "io.github.vvb2060.ndk.curl" defaultConfig { applicationId = "io.github.vvb2060.ndk.curl" - minSdk = 19 + minSdk = 21 targetSdk = 34 versionCode = 1 versionName = "1.0"