diff --git a/README.md b/README.md index 063a4f1..b0b82ff 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.6.0' +implementation 'io.github.vvb2060.ndk:curl:8.8.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.8.0 +- curl 8.8.0 +- nghttp2 1.62.1 +- nghttp3 1.3.0 +- ngtcp2 1.5.0 + ### 8.6.0 - curl 8.6.0 - nghttp2 1.59.0 diff --git a/curl/build.gradle b/curl/build.gradle index 5fcc0db..93c25d6 100644 --- a/curl/build.gradle +++ b/curl/build.gradle @@ -7,7 +7,7 @@ plugins { android { compileSdk = 34 buildToolsVersion = "34.0.0" - ndkVersion = "26.1.10909125" + ndkVersion = "27.0.11718014" namespace = "io.github.vvb2060.ndk.curl" defaultConfig { minSdk = 21 @@ -74,7 +74,7 @@ publishing { mavenJava(MavenPublication) { group = "io.github.vvb2060.ndk" artifactId = "curl" - version = "8.6.0" + version = "8.8.0" afterEvaluate { from(components.release) } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd49..e644113 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 a80b22c..b82aa23 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.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index cea4d17..4dd61c4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,9 +5,9 @@ pluginManagement { mavenCentral() } plugins { - id("com.android.application") version "8.2.0" - id("com.android.library") version "8.2.0" - id("org.jetbrains.kotlin.android") version "1.9.20" + id("com.android.application") version "8.4.1" + id("com.android.library") version "8.4.1" + id("org.jetbrains.kotlin.android") version "2.0.0" } } dependencyResolutionManagement { diff --git a/tool/build.gradle b/tool/build.gradle index 6cf4c4d..9b3fa1f 100644 --- a/tool/build.gradle +++ b/tool/build.gradle @@ -5,7 +5,7 @@ plugins { android { compileSdk = 34 buildToolsVersion = "34.0.0" - ndkVersion = "26.1.10909125" + ndkVersion = "27.0.11718014" namespace = "io.github.vvb2060.ndk.curl" defaultConfig { applicationId = "io.github.vvb2060.ndk.curl" @@ -24,6 +24,7 @@ android { release { minifyEnabled = true shrinkResources = true + vcsInfo.include = false signingConfig = signingConfigs.debug proguardFiles("proguard-rules.pro") } diff --git a/tool/src/main/java/io/github/vvb2060/ndk/curl/MainActivity.java b/tool/src/main/java/io/github/vvb2060/ndk/curl/MainActivity.java index ad32672..3a788d8 100644 --- a/tool/src/main/java/io/github/vvb2060/ndk/curl/MainActivity.java +++ b/tool/src/main/java/io/github/vvb2060/ndk/curl/MainActivity.java @@ -185,7 +185,7 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(buildView()); apkPath = getApplicationInfo().sourceDir; - editText.setText("--http3-only --curves X25519Kyber https://www.cloudflare.com/cdn-cgi/trace"); + editText.setText("--http3 --curves X25519Kyber --ech true --doh-url https://1.0.0.1/dns-query https://crypto.cloudflare.com/cdn-cgi/trace"); editText.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER)); }