From 8ef424f09099c9fc65980a2c5c8b7980b8f114ac Mon Sep 17 00:00:00 2001 From: vvb2060 Date: Wed, 11 Oct 2023 23:06:25 +0800 Subject: [PATCH] Update AGP --- README.md | 8 +++++++- curl/build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 14 +++++++------- settings.gradle | 4 ++-- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 544eb4b..3e842e1 100644 --- a/README.md +++ b/README.md @@ -18,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.3.0' +implementation 'io.github.vvb2060.ndk:curl:8.4.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+): @@ -71,6 +71,12 @@ target_link_libraries(app curl::curl_static) ## Version +### 8.4.0 +- curl 8.4.0 +- nghttp2 1.57.0 +- nghttp3 0.15.0 +- ngtcp2 0.19.1 + ### 8.3.0 - curl 8.3.0 with [my patch](https://github.com/curl/curl/pull/11874) - nghttp2 1.56.0 diff --git a/curl/build.gradle b/curl/build.gradle index f630ab3..b3e3641 100644 --- a/curl/build.gradle +++ b/curl/build.gradle @@ -74,7 +74,7 @@ publishing { mavenJava(MavenPublication) { group = "io.github.vvb2060.ndk" artifactId = "curl" - version = "8.3.0" + version = "8.4.0" afterEvaluate { from(components.release) } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ac72c34..3fa8f86 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.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 0adc8e1..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -202,11 +202,11 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/settings.gradle b/settings.gradle index b368b37..8234677 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,8 +5,8 @@ pluginManagement { mavenCentral() } plugins { - id("com.android.application") version "8.1.1" - id("com.android.library") version "8.1.1" + id("com.android.application") version "8.1.2" + id("com.android.library") version "8.1.2" id("org.jetbrains.kotlin.android") version "1.9.10" } }